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

Regen WANTLIB, intl is not supposed end up there.

Browse Source 
Better patch for DATADIRNAME to follow what we do everywhere else in-tree.
Fix indentation.
Tighten LIB_DEPENDS.
This commit is contained in:
ajacoutot 2013-04-17 13:20:20 +00:00
parent 15246978df
commit bdb68d92e6
3 changed files with 48 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
multimedia/imagination/Makefile
View File

@ -1,49 +1,47 @@
# $OpenBSD: Makefile,v 1.2 2013/04/17 13:00:26 giovanni Exp $
# $OpenBSD: Makefile,v 1.3 2013/04/17 13:20:20 ajacoutot Exp $
SHARED_ONLY = Yes
SHARED_ONLY = Yes
COMMENT = lightweight and simple DVD slide show maker
DISTNAME = imagination-3.0
REVISION = 0
REVISION = 1
CATEGORIES = multimedia
CATEGORIES = multimedia
HOMEPAGE = http://imagination.sf.net
MAINTAINER = Giovanni Bechis <giovanni@openbsd.org>
MAINTAINER = Giovanni Bechis <giovanni@openbsd.org>
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender expat fontconfig freetype m pixman-1
WANTLIB += pthread pthread-stubs sndio xcb xcb-render xcb-shm
WANTLIB += FLAC gsm id3tag mad magic mp3lame ogg opencore-amrnb
WANTLIB += opencore-amrwb png sndfile sox twolame vorbis vorbisenc
WANTLIB += vorbisfile wavpack z
WANTLIB += ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gthread-2.0 intl pcre gdk-x11-2.0 gtk-x11-2.0
WANTLIB += pangocairo-1.0 atk-1.0 harfbuzz icuuc
WANTLIB += cairo graphite2 icudata icule pango-1.0 pangoft2-1.0
WANTLIB += FLAC X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 gtk-x11-2.0
WANTLIB += harfbuzz icudata icule icuuc id3tag m mad magic mp3lame
WANTLIB += ogg opencore-amrnb opencore-amrwb pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile
WANTLIB += wavpack xcb xcb-render xcb-shm z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=imagination/}
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.67
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS = --localedir=${PREFIX}/share/locale
MODULES = devel/gettext
USE_LIBTOOL = Yes
LIBTOOL_FLAGS = --tag=disable-static
USE_LIBTOOL = Yes
LIBTOOL_FLAGS = --tag=disable-static
USE_GMAKE = Yes
LIB_DEPENDS = devel/pango \
devel/harfbuzz \
devel/atk \
textproc/icu4c \
x11/gtk+2
LIB_DEPENDS = x11/gtk+2
BUILD_DEPENDS = audio/sox
RUN_DEPENDS = audio/sox \
devel/desktop-file-utils \
x11/gtk+2,-guic
devel/desktop-file-utils \
x11/gtk+2,-guic
post-install:
@rm -f ${PREFIX}/lib/imagination/*.la

25
multimedia/imagination/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2013/04/17 13:20:20 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- aclocal.m4.orig Sun Jan 9 16:00:28 2011
+++ aclocal.m4 Wed Apr 17 15:07:39 2013
@@ -565,6 +565,8 @@ fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
+AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
+
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -582,6 +584,9 @@ if test -z "$DATADIRNAME"; then
dnl in this case.
AC_CHECK_FUNC(bind_textdomain_codeset,
[DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *-*-openbsd*)
+ [DATADIRNAME=share]
;;
*)
[DATADIRNAME=lib]

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

@ -1,110 +0,0 @@
$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