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

Explicitely patch for DATADIRNAME; the hack from the gnome MODULE will

Browse Source 
be removed soon.
This commit is contained in:
ajacoutot 2012-09-09 21:39:35 +00:00
parent fa32cb6ca0
commit 85f2bd06cc
2 changed files with 106 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/gnome/totem-pl-parser/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2012/07/12 08:08:46 jasper Exp $
# $OpenBSD: Makefile,v 1.48 2012/09/09 21:39:35 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= GObject-based parsing library
GNOME_PROJECT= totem-pl-parser
GNOME_VERSION= 3.4.2
REVISION= 0
REVISION= 1
SHARED_LIBS += totem-plparser 17.2 # 17.2
SHARED_LIBS += totem-plparser-mini 17.2 # 17.2
@ -23,8 +23,8 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += archive bz2 crypto curl dbus-1 expat ffi gcrypt gio-2.0
WANTLIB += glib-2.0 gmime-2.6 gmodule-2.0 gnome-keyring gobject-2.0
WANTLIB += gpg-error gthread-2.0 idn lua5.1 lzma m pcre quvi soup-2.4
WANTLIB += soup-gnome-2.4 sqlite3 ssl xml2 z
WANTLIB += gpg-error gthread-2.0 idn lua5.1 lzma m pcre pthread
WANTLIB += quvi soup-2.4 soup-gnome-2.4 sqlite3 ssl xml2 z
MODULES= devel/gettext \
x11/gnome

102
x11/gnome/totem-pl-parser/patches/patch-configure Normal file
View File

@ -0,0 +1,102 @@
$OpenBSD: patch-configure,v 1.1 2012/09/09 21:39:35 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4
(and move the check _after_ $host is actually set...)
--- configure.orig Tue May 15 16:12:17 2012
+++ configure Sun Sep 9 23:33:19 2012
@@ -5065,48 +5065,12 @@ 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" = xyes; 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
-
-
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5770,6 +5734,45 @@ $as_echo "print -r" >&6; } ;;
$as_echo "cat" >&6; } ;;
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" = xyes; then :
+ DATADIRNAME=share
+else
+ DATADIRNAME=lib
+fi
+
+ ;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
+ *)
+ DATADIRNAME=share
+ ;;
+ esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi