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-10 07:42:33 +00:00
parent eed12faea4
commit 0909c35992
20 changed files with 381 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devel/giggle/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.4 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Oct 24 15:04:42 2011
+++ configure Mon Sep 10 08:55:10 2012
@@ -13623,6 +13623,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
devel/glade/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.10 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Sun May 6 21:40:49 2012
+++ configure Mon Sep 10 09:11:26 2012
@@ -12698,6 +12698,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
devel/libpeas/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Wed Mar 28 13:10:21 2012
+++ configure Mon Sep 10 09:03:33 2012
@@ -12278,6 +12278,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/at-spi2-core/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 22:33:46 2012
+++ configure Mon Sep 10 08:55:46 2012
@@ -12031,6 +12031,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/baobab/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Thu Apr 5 12:47:18 2012
+++ configure Mon Sep 10 08:48:39 2012
@@ -4304,6 +4304,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

9
x11/gnome/devhelp/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.62 2012/06/15 08:30:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.63 2012/09/10 07:42:33 ajacoutot Exp $
COMMENT= API documentation browser for GNOME
GNOME_PROJECT= devhelp
GNOME_VERSION= 3.4.1
REVISION= 0
REVISION= 1
SHARED_LIBS += devhelp-3 0.0 # 0.0
@ -27,7 +27,7 @@ WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0
WANTLIB += gtk-3 icudata icui18n icuuc jpeg m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += soup-2.4 sqlite3 stdc++ webkitgtk-3.0 xcb xcb-render
WANTLIB += dbus-1 dbus-glib-1 ffi orc-0.4
WANTLIB += dbus-1 dbus-glib-1 ffi orc-0.4 geoclue gstaudio-0.10 gstfft-0.10
WANTLIB += xcb-shm xml2 xslt z javascriptcoregtk-3.0
MODULES= devel/gettext \
@ -36,7 +36,8 @@ MODULES= devel/gettext \
devel/gconf2
BUILD_DEPENDS= x11/gnome/doc-utils
LIB_DEPENDS= www/webkit,gtk3>=1.6.1v0
LIB_DEPENDS= multimedia/gstreamer-0.10/plugins-base \
www/webkit,gtk3
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes

16
x11/gnome/devhelp/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Apr 16 13:55:28 2012
+++ configure Mon Sep 10 09:09:39 2012
@@ -12943,6 +12943,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/dictionary/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 26 13:24:29 2012
+++ configure Mon Sep 10 08:56:23 2012
@@ -4541,6 +4541,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/font-viewer/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Mar 26 15:55:51 2012
+++ configure Mon Sep 10 08:48:02 2012
@@ -4512,6 +4512,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

5
x11/gnome/gdl/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.33 2012/04/23 07:22:34 jasper Exp $
# $OpenBSD: Makefile,v 1.34 2012/09/10 07:42:33 ajacoutot Exp $
COMMENT= GNOME Docking Library
GNOME_PROJECT= gdl
GNOME_VERSION= 3.4.2
REVISION= 0
SHARED_LIBS += gdl-3 2.0 # 3.0
@ -19,7 +20,7 @@ WANTLIB += drm expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-shm xml2
WANTLIB += z stdc++
WANTLIB += z stdc++ pthread
MODULES= devel/gettext \
x11/gnome

16
x11/gnome/gdl/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Sun Apr 22 22:09:10 2012
+++ configure Mon Sep 10 09:13:04 2012
@@ -17241,6 +17241,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/ghex/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 15:33:54 2012
+++ configure Mon Sep 10 08:51:42 2012
@@ -12708,6 +12708,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/gitg/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Thu Sep 1 20:50:26 2011
+++ configure Mon Sep 10 08:51:02 2012
@@ -12030,6 +12030,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/screenshot/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Apr 16 20:27:00 2012
+++ configure Mon Sep 10 08:43:07 2012
@@ -4510,6 +4510,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/search-tool/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Tue Mar 27 05:35:31 2012
+++ configure Mon Sep 10 08:49:39 2012
@@ -4657,6 +4657,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/system-log/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Apr 16 17:34:49 2012
+++ configure Mon Sep 10 08:53:39 2012
@@ -4554,6 +4554,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

102
x11/gnome/tweak-tool/patches/patch-configure Normal file
View File

@ -0,0 +1,102 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 17:18:42 2012
+++ configure Mon Sep 10 08:44:42 2012
@@ -5053,49 +5053,13 @@ 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
-
-
GETTEXT_MACRO_VERSION=0.18
@@ -5466,6 +5430,45 @@ 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" = xyes; 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
# Check whether --with-gnu-ld was given.

16
x11/gnome/vinagre/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 21:16:51 2012
+++ configure Mon Sep 10 08:52:51 2012
@@ -5807,6 +5807,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

16
x11/gnome/vino/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon May 14 21:02:06 2012
+++ configure Mon Sep 10 08:52:16 2012
@@ -13722,6 +13722,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

18
x11/gnome/yelp/patches/patch-configure
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-configure,v 1.6 2012/03/29 06:41:05 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.7 2012/09/10 07:42:33 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=627126
--- configure.orig Mon Mar 19 21:11:55 2012
+++ configure Fri Mar 23 22:06:09 2012
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
--- configure.orig Mon Sep 10 09:10:25 2012
+++ configure Mon Sep 10 09:10:26 2012
@@ -11372,22 +11372,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
@ -29,3 +31,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=627126
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
@@ -12302,6 +12290,9 @@ else
DATADIRNAME=lib
fi
+ ;;
+ *-*-openbsd*)
+ DATADIRNAME=share
;;
*)
DATADIRNAME=lib