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

Set DATADIRNAME in a consistent way now that glib-gettext.m4 has been

Browse Source 
fixed.
This commit is contained in:
ajacoutot 2011-10-03 06:42:45 +00:00
parent 158fbb6034
commit a5e3542d11
18 changed files with 157 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/libgdata/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2011/09/21 13:25:08 jasper Exp $
# $OpenBSD: Makefile,v 1.22 2011/10/03 06:42:45 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,6 +7,8 @@ COMMENT= Google Data API based Glib client library
GNOME_PROJECT= libgdata
GNOME_VERSION= 0.10.1
REVISION= 0
SHARED_LIBS += gdata 4.0 # .14.1
CATEGORIES= devel net
@ -33,8 +35,6 @@ MODULES= devel/gettext \
LIB_DEPENDS= devel/libsoup,-gnome \
net/liboauth
FAKE_FLAGS+= DATADIRNAME="share"
MODGNOME_TOOLS= goi
LIBTOOL_FLAGS+= --tag=disable-static

7
emulators/snes9x/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2011/09/16 09:48:09 espie Exp $
# $OpenBSD: Makefile,v 1.22 2011/10/03 06:42:46 ajacoutot Exp $
COMMENT = emulates the Super Nintendo Entertainment System
@ -6,7 +6,7 @@ DISTNAME = snes9x-1.52-src
PKGNAME = ${DISTNAME:S/-src//}
CATEGORIES = emulators games
REVISION = 2
REVISION = 3
HOMEPAGE = http://www.snes9x.com/
@ -52,8 +52,7 @@ CONFIGURE_ARGS = --without-portaudio \
--without-pulseaudio \
--without-opengl
CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
DATADIRNAME="share"
LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
NO_REGRESS = Yes

19
emulators/snes9x/patches/patch-gtk_configure
View File

@ -1,6 +1,9 @@
$OpenBSD: patch-gtk_configure,v 1.1 2010/05/13 23:31:56 jakemsr Exp $
--- gtk/configure.orig Sun Jan 10 17:28:11 2010
+++ gtk/configure Mon Apr 19 16:59:27 2010
$OpenBSD: patch-gtk_configure,v 1.2 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- gtk/configure.orig Sun Jan 10 18:28:11 2010
+++ gtk/configure Sun Oct 2 09:23:54 2011
@@ -2351,7 +2351,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@ -10,3 +13,13 @@ $OpenBSD: patch-gtk_configure,v 1.1 2010/05/13 23:31:56 jakemsr Exp $
CXXFLAGS="$CFLAGS"
ac_ext=c
@@ -5003,6 +5003,9 @@ else
DATADIRNAME=lib
fi
+ ;;
+ *-*-openbsd*)
+ DATADIRNAME=share
;;
*)
DATADIRNAME=lib

4
graphics/darktable/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2011/09/16 10:02:36 espie Exp $
# $OpenBSD: Makefile,v 1.11 2011/10/03 06:42:45 ajacoutot Exp $
COMMENT= virtual lighttable and darkroom for photographers
DISTNAME= darktable-0.6
REVISION= 4
REVISION= 5
SHARED_ONLY= Yes

21
graphics/darktable/patches/patch-configure
View File

@ -1,7 +1,20 @@
$OpenBSD: patch-configure,v 1.2 2010/09/18 09:32:25 sthen Exp $
--- configure.orig Thu Sep 16 21:49:49 2010
+++ configure Thu Sep 16 22:16:15 2010
@@ -18856,7 +18856,7 @@ if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}"
$OpenBSD: patch-configure,v 1.3 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sat Aug 28 21:42:08 2010
+++ configure Sun Oct 2 09:06:00 2011
@@ -5126,6 +5126,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;
@@ -18856,7 +18859,7 @@ if test "${ac_cv_lib_lcms_cmsOpenProfileFromFile+set}"
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS

12
graphics/darktable/patches/patch-po_Makefile_in_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1.1.1 2010/09/17 21:37:18 sthen Exp $
--- po/Makefile.in.in.orig Fri Sep 17 14:24:04 2010
+++ po/Makefile.in.in Fri Sep 17 14:24:06 2010
@@ -34,7 +34,7 @@ datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+itlocaledir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.

6
graphics/gtkam/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2011/09/16 10:02:37 espie Exp $
# $OpenBSD: Makefile,v 1.32 2011/10/03 06:42:45 ajacoutot Exp $
COMMENT= digital camera frontend
DISTNAME= gtkam-0.1.17
REVISION= 0
REVISION= 1
CATEGORIES= graphics
@ -49,6 +49,4 @@ CONFIGURE_ARGS +=--with-gnome=no \
--with-bonobo=no \
--disable-scrollkeeper
FAKE_FLAGS= itlocaledir=${PREFIX}/share/locale
.include <bsd.port.mk>

19
graphics/gtkam/patches/patch-configure
View File

@ -1,7 +1,20 @@
$OpenBSD: patch-configure,v 1.4 2011/04/06 13:56:52 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.5 2011/10/03 06:42:45 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sun Jan 31 17:14:41 2010
+++ configure Wed Apr 6 15:03:34 2011
@@ -26469,10 +26469,10 @@ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+++ configure Sun Oct 2 09:00:24 2011
@@ -21440,6 +21440,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;
@@ -26469,10 +26472,10 @@ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
USE_NLS!$USE_NLS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim

7
inputmethods/ibus-anthy/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2011/09/16 10:02:38 espie Exp $
# $OpenBSD: Makefile,v 1.9 2011/10/03 06:42:46 ajacoutot Exp $
COMMENT = japanese input engine for ibus
DISTNAME = ibus-anthy-1.2.6
REVISION= 0
REVISION= 1
CATEGORIES = inputmethods japanese
@ -32,7 +32,6 @@ USE_LIBTOOL = Yes
LIBTOOL_FLAGS = --tag=disable-static
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
DATADIRNAME="share"
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
.include <bsd.port.mk>

16
inputmethods/ibus-anthy/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sun Oct 2 10:04:58 2011
+++ configure Sun Oct 2 10:05:28 2011
@@ -16749,6 +16749,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

10
inputmethods/ibus-skk/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2011/09/25 13:34:57 fgsch Exp $
# $OpenBSD: Makefile,v 1.9 2011/10/03 06:42:46 ajacoutot Exp $
COMMENT = japanese skk input engine for ibus
DISTNAME = ibus-skk-1.3.9
REVISION = 0
CATEGORIES = inputmethods japanese
@ -19,12 +20,15 @@ MASTER_SITES = http://cloud.github.com/downloads/ueno/ibus-skk/
MODULES = lang/python \
textproc/intltool
RUN_DEPENDS = inputmethods/ibus
BUILD_DEPENDS = devel/gettext
RUN_DEPENDS = inputmethods/ibus \
devel/gettext
USE_GMAKE = Yes
USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = DATADIRNAME=share
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

16
inputmethods/ibus-skk/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sun Oct 2 11:15:54 2011
+++ configure Sun Oct 2 11:16:28 2011
@@ -6324,6 +6324,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

7
inputmethods/uim/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2011/09/16 10:02:38 espie Exp $
# $OpenBSD: Makefile,v 1.37 2011/10/03 06:42:46 ajacoutot Exp $
COMMENT-main= multilingual input method library
COMMENT-gtk= uim for GTK
@ -17,7 +17,7 @@ PKGNAME-gtk= uim-gtk-$V
PKGNAME-qt= uim-qt-$V
PKGNAME-kde= uim-kde-$V
REVISION-main= 6
REVISION-main= 7
REVISION-gtk= 9
REVISION-qt= 4
REVISION-kde= 4
@ -96,8 +96,7 @@ WANTLIB-gtk= ${Wcommon} ${Wx} gio-2.0 glib-2.0 gmodule-2.0 pangoft2-1.0 \
uim-custom
MAKE_FLAGS= moduledir='${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules' \
UIM_QT_LDFLAGS='-pthread -L${X11BASE}/lib -L${MODQT_LIBDIR} -lqt-mt -lXext -lX11' \
itlocaledir=${TRUEPREFIX}/share/locale
UIM_QT_LDFLAGS='-pthread -L${X11BASE}/lib -L${MODQT_LIBDIR} -lqt-mt -lXext -lX11'
CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
CONFIGURE_ENV+= LDFLAGS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -L${X11BASE}/lib'

16
inputmethods/uim/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- aclocal.m4.orig Sun Oct 2 09:53:33 2011
+++ aclocal.m4 Sun Oct 2 09:54:36 2011
@@ -141,6 +141,9 @@ if test -z "$DATADIRNAME"; then
AC_CHECK_FUNC(bind_textdomain_codeset,
[DATADIRNAME=share], [DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ [DATADIRNAME=share]
+ ;;
*)
[DATADIRNAME=lib]
;;

6
sysutils/upower/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2011/09/08 17:57:40 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2011/10/03 06:42:46 ajacoutot Exp $
ONLY_FOR_ARCHS =${APM_ARCHS}
@ -8,6 +8,7 @@ DISTNAME = upower-0.9.13
EXTRACT_SUFX = .tar.xz
CATEGORIES = sysutils
SHARED_LIBS += upower-glib 0.0 # 1.1
REVISION = 0
HOMEPAGE = http://upower.freedesktop.org/
MASTER_SITES = ${HOMEPAGE}/releases/
@ -30,8 +31,7 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/upower \
itlocaledir="${PREFIX}/share/locale/"
FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/upower
USE_GMAKE = Yes
USE_LIBTOOL = Yes

16
sysutils/upower/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.5 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sun Oct 2 09:38:59 2011
+++ configure Sun Oct 2 09:39:35 2011
@@ -13865,6 +13865,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;

6
x11/awn/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2011/09/28 06:44:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2011/10/03 06:42:46 ajacoutot Exp $
COMMENT= avant window navigator
V= 0.4.0
DISTNAME= avant-window-navigator-$V
REVISION= 0
REVISION= 1
SHARED_LIBS += awn 1.0 # .1.1
@ -66,6 +66,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
ac_python_version=${MODPY_VERSION} \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl -lm -pthread -lutil"
FAKE_FLAGS+= itlocaledir=${PREFIX}/share/locale/
.include <bsd.port.mk>

16
x11/awn/patches/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-configure,v 1.1 2011/10/03 06:42:46 ajacoutot Exp $
Fix DATADIRNAME: see LOCALBASE/share/aclocal/glib-gettext.m4.
--- configure.orig Sun Oct 2 09:47:20 2011
+++ configure Sun Oct 2 09:47:51 2011
@@ -13223,6 +13223,9 @@ else
fi
;;
+ *-*-openbsd*)
+ DATADIRNAME=share
+ ;;
*)
DATADIRNAME=lib
;;