cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup the port

Browse Source 
Help and ok ajacoutot@
This commit is contained in:
giovanni 2013-04-17 13:00:26 +00:00
parent 563e93d80d
commit 412dcf0926
4 changed files with 126 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multimedia/imagination/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
# $OpenBSD: Makefile,v 1.2 2013/04/17 13:00:26 giovanni Exp $
SHARED_ONLY = Yes
COMMENT = lightweight and simple DVD slide show maker
DISTNAME = imagination-3.0
REVISION = 0
CATEGORIES = multimedia
@ -28,7 +29,8 @@ WANTLIB += cairo graphite2 icudata icule pango-1.0 pangoft2-1.0
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=imagination/}
CONFIGURE_STYLE = gnu
MODULES = converters/libiconv
CONFIGURE_ARGS = --localedir=${PREFIX}/share/locale
MODULES = devel/gettext
USE_LIBTOOL = Yes
LIBTOOL_FLAGS = --tag=disable-static
USE_GMAKE = Yes
@ -39,7 +41,7 @@ LIB_DEPENDS = devel/pango \
textproc/icu4c \
x11/gtk+2
BUILD_DEPENDS = audio/sox
RUN_DEPENDS = ${BUILD_DEPENDS} \
RUN_DEPENDS = audio/sox \
devel/desktop-file-utils \
x11/gtk+2,-guic

110
multimedia/imagination/patches/patch-configure Normal file
View File

@ -0,0 +1,110 @@
$OpenBSD: patch-configure,v 1.1 2013/04/17 13:00:26 giovanni Exp $
--- configure.orig Sun Mar 6 21:06:44 2011
+++ configure Wed Apr 17 09:43:28 2013
@@ -6222,48 +6222,10 @@ fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
-else
- case $host in
- *-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- DATADIRNAME=share
-else
- DATADIRNAME=lib
-fi
- ;;
- *)
- DATADIRNAME=lib
- ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
# for plugins
# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then :
@@ -6391,7 +6353,46 @@ host_os=$*
IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ DATADIRNAME=share
+else
+ case $host in
+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ DATADIRNAME=share
+else
+ DATADIRNAME=lib
+fi
+
+ ;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
+ *)
+ DATADIRNAME=lib
+ ;;
+ esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if test "${ac_cv_path_SED+set}" = set; then :
@@ -13567,6 +13568,10 @@ else
DATADIRNAME=lib
fi
+ ;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
;;
*)
CATOBJEXT=.mo

9
multimedia/imagination/patches/patch-src_callbacks_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_callbacks_c,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
$OpenBSD: patch-src_callbacks_c,v 1.2 2013/04/17 13:00:26 giovanni Exp $
--- src/callbacks.c.orig Mon Apr 15 16:00:51 2013
+++ src/callbacks.c Mon Apr 15 16:01:08 2013
@@ -19,6 +19,7 @@
@ -9,10 +9,3 @@ $OpenBSD: patch-src_callbacks_c,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
#include "callbacks.h"
#include "export.h"
#include <math.h>
@@ -2780,4 +2781,4 @@ img_notebook_switch_page (GtkNotebook *notebook,
gtk_label_set_attributes(GTK_LABEL(img->message_label), pango_list);
pango_attr_list_unref (pango_list);
}
-}
\ No newline at end of file
+}

39
multimedia/imagination/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/04/16 16:18:03 giovanni Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/04/17 13:00:26 giovanni Exp $
@bin bin/imagination
lib/imagination/
lib/imagination/bar_wipe.so
@ -16,34 +16,6 @@ lib/imagination/misc_shape_wipe.so
lib/imagination/push_wipe.so
lib/imagination/rochade.so
lib/imagination/wave.so
lib/locale/
lib/locale/cs/
lib/locale/cs/LC_MESSAGES/
lib/locale/cs/LC_MESSAGES/imagination.mo
lib/locale/de/
lib/locale/de/LC_MESSAGES/
lib/locale/de/LC_MESSAGES/imagination.mo
lib/locale/en_GB/
lib/locale/en_GB/LC_MESSAGES/
lib/locale/en_GB/LC_MESSAGES/imagination.mo
lib/locale/fr/
lib/locale/fr/LC_MESSAGES/
lib/locale/fr/LC_MESSAGES/imagination.mo
lib/locale/it/
lib/locale/it/LC_MESSAGES/
lib/locale/it/LC_MESSAGES/imagination.mo
lib/locale/pt_BR/
lib/locale/pt_BR/LC_MESSAGES/
lib/locale/pt_BR/LC_MESSAGES/imagination.mo
lib/locale/sv/
lib/locale/sv/LC_MESSAGES/
lib/locale/sv/LC_MESSAGES/imagination.mo
lib/locale/zh_CN/
lib/locale/zh_CN/LC_MESSAGES/
lib/locale/zh_CN/LC_MESSAGES/imagination.mo
lib/locale/zh_TW/
lib/locale/zh_TW/LC_MESSAGES/
lib/locale/zh_TW/LC_MESSAGES/imagination.mo
share/applications/imagination.desktop
share/icons/hicolor/16x16/apps/imagination.png
share/icons/hicolor/24x24/apps/imagination.png
@ -202,6 +174,15 @@ share/imagination/pixmaps/imagination-pos-6.png
share/imagination/pixmaps/imagination-pos-7.png
share/imagination/pixmaps/imagination-pos-8.png
share/imagination/pixmaps/imagination-text.png
share/locale/cs/LC_MESSAGES/imagination.mo
share/locale/de/LC_MESSAGES/imagination.mo
share/locale/en_GB/LC_MESSAGES/imagination.mo
share/locale/fr/LC_MESSAGES/imagination.mo
share/locale/it/LC_MESSAGES/imagination.mo
share/locale/pt_BR/LC_MESSAGES/imagination.mo
share/locale/sv/LC_MESSAGES/imagination.mo
share/locale/zh_CN/LC_MESSAGES/imagination.mo
share/locale/zh_TW/LC_MESSAGES/imagination.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database