Use the gettext MODULE.

avsm · Jul 6, 2011 · 5070c6e · 5070c6e
1 parent 821880d
commit 5070c6e
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 22 deletions.
diff --git a/devel/qt4-eventsview/Makefile b/devel/qt4-eventsview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/15 19:46:08 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2011/07/06 18:29:00 ajacoutot Exp $
 
 BROKEN=		does not work with Qt >= 4.6
 
@@ -19,11 +19,12 @@ DIST_SUBDIR=	qt4-eventsview-$V
 V=		0.1
 DISTNAME=	57337-eventsview
 PKGNAME=	qt4-eventsview-$V
-REVISION =	1
+REVISION =	2
 MASTER_SITES=	http://qt-apps.org/CONTENT/content-files/
 
 WRKDIST=	${WRKDIR}/eventsview
-MODULES=	x11/qt4
+MODULES=	x11/qt4 \
+		devel/gettext
 
 do-configure:
 	cd ${WRKDIST} && env -i ${CONFIGURE_ENV} qmake4
@@ -42,7 +43,7 @@ do-install:
 LIB_DEPENDS=	devel/glib2
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig
-WANTLIB += freetype iconv intl m png pthread pthread-stubs stdc++ xcb z
+WANTLIB += freetype m png pthread pthread-stubs stdc++ xcb z
 WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lib/qt4/QtGui
 
 SUBST_VARS=	SAMPLE

diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/15 23:22:07 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2011/07/06 18:29:00 ajacoutot Exp $
 
 COMMENT=	lightweight Gtk text editor with syntax highlighting
 
 DISTNAME=	beaver0_3_0_1
 PKGNAME=	beaver-0.3.0.1
 CATEGORIES=	editors	
 
-REVISION=	4
+REVISION=	5
 
 HOMEPAGE=	http://www.nongnu.org/beaver/
 # XXX should use ${MASTER_SITE_SAVANNAH:=beaver/} but % in the
@@ -22,10 +22,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
-		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv \
-		intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
+		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
+		m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
 		pthread-stubs xcb z gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
 
+MODULES=	devel/gettext
+
 LIB_DEPENDS=	x11/gtk+2
 
 RUN_DEPENDS=	devel/desktop-file-utils

diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2010/11/15 23:22:07 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2011/07/06 18:29:00 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	XML editor for KDE
 
 DISTNAME=	kxmleditor-1.1.3
-REVISION=	5
+REVISION=	6
 CATEGORIES=	editors x11 x11/kde
 
 SHARED_LIBS=	kxmleditorpart	2.0
@@ -21,15 +21,15 @@ PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
 WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c jpeg
-WANTLIB += m png fam intl rpcsvc pthread stdc++ util z iconv
+WANTLIB += m png fam rpcsvc pthread stdc++ util z
 WANTLIB += idn pthread-stubs xcb kdecore DCOP kdefx kdeprint
 WANTLIB += kdesu kdeui kio kparts kwalletclient
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kxmleditor/}
 
 LIB_DEPENDS=	x11/kde/libs3
 
-MODULES=	x11/kde
+MODULES=	x11/kde devel/gettext
 MODKDE_VERSION=	3.1
 
 PORTHOME=	${WRKDIR}

diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2011/07/02 15:22:39 robert Exp $
+# $OpenBSD: Makefile,v 1.39 2011/07/06 18:29:00 ajacoutot Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -16,6 +16,8 @@ PKGNAME-kde=	libreoffice-kde-${VERSION}
 PKGNAME-java=	libreoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 
+REVISION-main=	0
+
 EPOCH=		0
 
 MAINTAINER=	Robert Nagy <[email protected]>
@@ -132,7 +134,9 @@ BUILD_DEPENDS+=	archivers/zip \
 		textproc/textutils
 
 MODULES+=	lang/python \
-		devel/gconf2
+		devel/gconf2 \
+		devel/gettext
+
 MODGCONF2_LIBDEP=No
 LIB_DEPENDS-main=x11/gtk+2 \
 		${MODPY_LIB_DEPENDS} \
@@ -155,10 +159,10 @@ WANTLIB-main=	gdk-x11-2.0>=400.14 gtk-x11-2.0>=400.14 \
 WANTLIB-main+=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
 		Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
 		crypto expat fontconfig freetype gio-2.0 glib-2.0 \
-		gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl \
+		gmodule-2.0 gobject-2.0 gthread-2.0 \
 		jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
 		png pthread pthread-stubs ssl xcb xml2 z gdk_pixbuf-2.0 \
-		util ${MODGCONF2_WANTLIB}
+		util ${MODGCONF2_WANTLIB} ${MODGETTEXT_WANTLIB}
 WANTLIB-main+=	GL GLU Xxf86vm drm stdc++ xcb-render xcb-shm
 WANTLIB-main+=	hunspell-1.2 gdk_pixbuf_xlib-2.0
 WANTLIB-main+=	${MODPY_WANTLIB}

diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2011/01/15 11:13:49 robert Exp $
+# $OpenBSD: Makefile,v 1.75 2011/07/06 18:29:00 ajacoutot Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -18,6 +18,8 @@ PKGNAME-kde=	openoffice-kde-${VERSION}
 PKGNAME-java=	openoffice-java-${VERSION}
 CATEGORIES=	editors productivity
 
+REVISION-main=	0
+
 MAINTAINER=	Robert Nagy <[email protected]>
 
 HOMEPAGE=	http://www.openoffice.org/
@@ -154,10 +156,10 @@ WANTLIB-main=	gdk-x11-2.0>=400.14 gtk-x11-2.0>=400.14 \
 WANTLIB-main+=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
 		Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
 		crypto expat fontconfig freetype gio-2.0 glib-2.0 \
-		gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl \
+		gmodule-2.0 gobject-2.0 gthread-2.0 \
 		jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
 		png pthread pthread-stubs ssl util xcb xml2 z gdk_pixbuf-2.0 \
-		${MODGCONF2_WANTLIB}
+		${MODGCONF2_WANTLIB} ${MODGETTEXT_WANTLIB}
 WANTLIB-main+=	GL Xxf86vm drm python2.6 stdc++ xcb-render xcb-shm
 WANTLIB-main+=	${MODPY_WANTLIB}
 

diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/15 23:22:08 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2011/07/06 18:29:00 ajacoutot Exp $
 
 # Other archs have not been tested
 ONLY_FOR_ARCHS =	amd64 i386
@@ -8,7 +8,7 @@ COMMENT =		emulates game consoles and old home computers
 V =			0.132
 DISTNAME =		sdlmess${V:S/.//}
 PKGNAME =		sdlmess-${V}
-REVISION=		4
+REVISION=		5
 
 CATEGORIES =		emulators games
 
@@ -25,14 +25,16 @@ PERMIT_DISTFILES_FTP =		Yes
 WANTLIB +=	ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
 WANTLIB +=	Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
 WANTLIB +=	expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB +=	gobject-2.0 gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0
+WANTLIB +=	gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB +=	pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb z
 WANTLIB +=	xcb-render xcb-render-util gdk_pixbuf-2.0 SDL
 WANTLIB +=	gdk-x11-2.0 gtk-x11-2.0 gconf-2>=5
 
 MASTER_SITES =		http://rbelmont.mameworld.info/
 EXTRACT_SUFX =		.zip
 
+MODULES =		devel/gettext
+
 LIB_DEPENDS =		devel/sdl devel/gconf2 x11/gtk+2
 RUN_DEPENDS =		sdlmame-tools-${V}:emulators/sdlmame,-tools