- fix WANTLIB after gtk+2 downgrade

- MODULES=devel/gettext where appropriate and sync PLIST
avsm · Jan 19, 2006 · fe75faa · fe75faa
1 parent 955a64c
commit fe75faa
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2005/11/16 09:37:00 wilfried Exp $
+# $OpenBSD: Makefile,v 1.6 2006/01/19 13:13:08 steven Exp $
 
 COMMENT=	"extremely lightweight and simple web browser for gnome"
 
 M=		1.4
 V=		1.4.8
 DISTNAME=	epiphany-${V}
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.gnome.org/projects/epiphany/
@@ -33,14 +33,16 @@ RUN_DEPENDS=	:gnome-desktop-*:x11/gnome/desktop \
 LIB_DEPENDS=	gnomeui-2::x11/gnome/libgnomeui \
 		${MOZDIR}/gtkembedmoz,${MOZDIR}/nspr4,${MOZDIR}/plc4,${MOZDIR}/plds4,${MOZDIR}/xpcom:mozilla->=1.7.11:www/mozilla
 
+MODULES=	devel/gettext
+
 WANTLIB=	ORBit-2 ORBitCosNaming-2 art_lgpl_2 atk-1.0.0.0 \
 		audiofile bonobo-2 bonobo-activation bonoboui-2 esd \
 		gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 \
-		glib-2.0.0.0 gmodule-2.0.0.0 gtk-x11-2.0.0.0 iconv \
-		intl jpeg gnome-2 gnome-keyring gnomecanvas-2 \
+		glib-2.0.0.0 gmodule-2.0.0.0 gtk-x11-2.0.0.0 \
+		jpeg gnome-2 gnome-keyring gnomecanvas-2 \
 		gnomevfs-2 gobject-2.0.0.0 gthread-2.0.0.0 pango-1.0.0.0 \
-		pangoft2-1.0.0.0 pangocairo-1.0.0.0 cairo glitz png \
-		popt xml2 ICE SM X11 Xext Xrender c crypto fontconfig \
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
+		popt xml2 ICE SM X11 Xext Xft Xrender c crypto fontconfig \
 		freetype m pthread ssl stdc++ z
 
 USE_GMAKE=	Yes

diff --git a/www/epiphany/pkg/PLIST b/www/epiphany/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/03/16 02:02:57 kurt Exp $
+@comment $OpenBSD: PLIST,v 1.4 2006/01/19 13:13:08 steven Exp $
 bin/epiphany
 bin/epiphany-bin
 include/epiphany-${M}/
@@ -34,7 +34,6 @@ lib/pkgconfig/epiphany-${M}.pc
 @man man/man1/epiphany-bin.1
 share/application-registry/
 share/application-registry/epiphany.applications
-share/applications/
 share/applications/bme.desktop
 share/applications/epiphany.desktop
 share/epiphany/
@@ -193,7 +192,6 @@ share/locale/vi/LC_MESSAGES/epiphany.mo
 share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-share/omf/
 share/omf/epiphany/
 share/omf/epiphany/epiphany-C.omf
 share/omf/epiphany/epiphany-es.omf

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2005/11/16 10:01:53 wilfried Exp $
+# $OpenBSD: Makefile,v 1.25 2006/01/19 13:13:07 steven Exp $
 
 COMMENT=	"GNOME web browser based on gecko"
 
 V=		1.3.21
 DISTNAME=	galeon-${V}
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 CATEGORIES=	www
 
 HOMEPAGE=	http://galeon.sourceforge.net/
@@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB= ORBit-2.0.0 ORBitCosNaming-2.0.0 art_lgpl_2.0.0 atk-1.0.0.0 audiofile \
-	 bonobo-2.0.0 bonobo-activation bonoboui-2.0.0 cairo esd gconf-2.0.0 \
-	 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 glitz \
+	 bonobo-2.0.0 bonobo-activation bonoboui-2.0.0 esd gconf-2.0.0 \
+	 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 \
 	 gmodule-2.0.0.0 gnome-2.0.0 gnome-keyring gnomecanvas-2.0.0 \
 	 gnomevfs-2.0.0 gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg \
-	 pango-1.0.0.0 pangoft2-1.0.0.0 pangocairo-1.0.0.0 png popt \
-	 startup-notification-1.0 xml2.0.0 ICE SM X11 Xext Xrender \
+	 pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 popt \
+	 startup-notification-1.0 xml2.0.0 ICE SM X11 Xext Xft Xrender \
 	 c crypto fontconfig freetype m pthread ssl stdc++ z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}

diff --git a/www/galeon/pkg/PLIST b/www/galeon/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2005/09/10 07:02:05 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.9 2006/01/19 13:13:08 steven Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
@@ -184,15 +184,11 @@ share/locale/am/LC_MESSAGES/galeon-2.0.mo
 share/locale/az/
 share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/galeon-2.0.mo
-share/locale/be/
-share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/galeon-2.0.mo
 share/locale/bg/LC_MESSAGES/galeon-2.0.mo
 share/locale/bs/
 share/locale/bs/LC_MESSAGES/
 share/locale/bs/LC_MESSAGES/galeon-2.0.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/galeon-2.0.mo
 share/locale/cs/LC_MESSAGES/galeon-2.0.mo
 share/locale/da/LC_MESSAGES/galeon-2.0.mo
@@ -211,8 +207,6 @@ share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/galeon-2.0.mo
 share/locale/fi/LC_MESSAGES/galeon-2.0.mo
 share/locale/fr/LC_MESSAGES/galeon-2.0.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/galeon-2.0.mo
 share/locale/gl/LC_MESSAGES/galeon-2.0.mo
 share/locale/hr/LC_MESSAGES/galeon-2.0.mo
@@ -248,13 +242,14 @@ share/locale/pt/LC_MESSAGES/galeon-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
 share/locale/ro/LC_MESSAGES/galeon-2.0.mo
 share/locale/ru/LC_MESSAGES/galeon-2.0.mo
+share/locale/rw/
+share/locale/rw/LC_MESSAGES/
+share/locale/rw/LC_MESSAGES/galeon-2.0.mo
 share/locale/sk/LC_MESSAGES/galeon-2.0.mo
 share/locale/sl/LC_MESSAGES/galeon-2.0.mo
 share/locale/sq/
 share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/galeon-2.0.mo
-share/locale/sr/
-share/locale/sr/LC_MESSAGES/
 share/locale/sr/LC_MESSAGES/galeon-2.0.mo
 share/locale/sr@Latn/
 share/locale/sr@Latn/LC_MESSAGES/
@@ -265,8 +260,6 @@ share/locale/ta/LC_MESSAGES/
 share/locale/ta/LC_MESSAGES/galeon-2.0.mo
 share/locale/tr/LC_MESSAGES/galeon-2.0.mo
 share/locale/uk/LC_MESSAGES/galeon-2.0.mo
-share/locale/vi/
-share/locale/vi/LC_MESSAGES/
 share/locale/vi/LC_MESSAGES/galeon-2.0.mo
 share/locale/wa/
 share/locale/wa/LC_MESSAGES/