Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

10 files changed, 62 insertions, 49 deletions

diff --git a/net-p2p/amule1/Makefile b/net-p2p/amule1/Makefile
index b4b718d010a..46da7dd5fb8 100644
--- a/net-p2p/amule1/Makefile
+++ b/net-p2p/amule1/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Ganael LAPLANCHE <ganael.laplanche@martymac.com>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net-p2p/amule1/Makefile,v 1.1 2006/10/04 23:22:32 ahze Exp $
 
 PORTNAME=	aMule
 PORTVERSION=	1.2.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 #MASTER_SITES=	http://download.berlios.de/amule/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +25,6 @@ LATEST_LINK=	aMule1
 CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist
index 69e7a99512d..2f21e5ba0db 100644
--- a/net-p2p/amule1/pkg-plist
+++ b/net-p2p/amule1/pkg-plist
@@ -75,7 +75,11 @@ share/locale/pt_BR/LC_MESSAGES/amule.mo
 share/locale/ru/LC_MESSAGES/amule.mo
 @dirrm share/gnome/doc/aMule-1.2.8
 @dirrmtry share/gnome/doc
-@dirrmtry share/locale/ee/LC_MESSAGES
-@dirrmtry share/locale/ee
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile
index 182f3391ea8..9441d712ca2 100644
--- a/net-p2p/dctc-gui/Makefile
+++ b/net-p2p/dctc-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dctc
 PORTVERSION=	0.66
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p gnome
 MASTER_SITES=	http://unixpages.org/distfiles/
 PKGNAMESUFFIX=	-gui
@@ -20,12 +20,12 @@ BUILD_DEPENDS=	dctc:${PORTSDIR}/net-p2p/dctc
 LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-gnome=${X11BASE} \
+CONFIGURE_ARGS=	--with-gnome=${LOCALBASE} \
 		--with-gtk-prefix=${LOCALBASE} \
 		--enable-manual-db-detect \
 		--with-libiconv-prefix=${LOCALBASE}
diff --git a/net-p2p/edonkey-gui-gtk/Makefile b/net-p2p/edonkey-gui-gtk/Makefile
index b6dd22a6655..eb60ea1bbdb 100644
--- a/net-p2p/edonkey-gui-gtk/Makefile
+++ b/net-p2p/edonkey-gui-gtk/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/net-p2p/edonkey-gui-gtk/Makefile,v 1.2 2006/10/05 05:04:46 mezz Exp $
 #
 
 PORTNAME=	edonkey
 PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ed2k-gtk-gui
@@ -20,9 +21,10 @@ COMMENT=	GTK GUI to eDonkey2000 'core' command line client
 LIB_DEPENDS=	gnet-2.0:${PORTSDIR}/net/gnet2
 RUN_DEPENDS=	donkey:${PORTSDIR}/net-p2p/linux-edonkey-core
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnometarget gtk20
+USE_XLIB=	yes
+USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -35,8 +37,6 @@ CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app|g' \
-		 ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^SUBDIRS =.*$$|SUBDIRS =|g' \
 		 ${WRKSRC}/docs/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wall -g||g ; \
diff --git a/net-p2p/edonkey-gui-gtk/pkg-plist b/net-p2p/edonkey-gui-gtk/pkg-plist
index f415e1a22ed..83756e75f3c 100644
--- a/net-p2p/edonkey-gui-gtk/pkg-plist
+++ b/net-p2p/edonkey-gui-gtk/pkg-plist
@@ -449,7 +449,7 @@ bin/edonkey-gui-gtk
 %%DATADIR%%/icons/orbit/toolbar-overnet-logo.png
 %%DATADIR%%/icons/orbit/toolbar-server.png
 %%DATADIR%%/ui/ui-connect-dialog.glade
-share/gnome/applications/ed2k_gui.desktop
+share/applications/ed2k_gui.desktop
 share/locale/ca/LC_MESSAGES/ed2k_gui.mo
 share/locale/de/LC_MESSAGES/ed2k_gui.mo
 share/locale/es/LC_MESSAGES/ed2k_gui.mo
@@ -472,3 +472,10 @@ share/locale/sk/LC_MESSAGES/ed2k_gui.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/espanol
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/deutsch
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-p2p/giftui/Makefile b/net-p2p/giftui/Makefile
index 448fce5f5f1..c63ffa54ede 100644
--- a/net-p2p/giftui/Makefile
+++ b/net-p2p/giftui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	giFTui
 PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	giftui
@@ -19,8 +19,8 @@ COMMENT=	GTK2 client for giFT daemon
 LIB_DEPENDS=	gift.0:${PORTSDIR}/net-p2p/gift
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gconf2 gtk20
+USE_XLIB=	yes
+USE_GNOME=	gnomehack gnomeprefix gconf2 gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -31,10 +31,13 @@ PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=${DATADIR}|g' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^giftuidatadir=.*|giftuidatadir=$${datadir}/giftui|g ; \
+		s|^giftuiicondir=.*|giftuiicondir=$${datadir}/pixmaps|g' \
+			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^giftuidocdir =.*|giftuidocdir =${DOCSDIR}|g' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/share/pixmaps/||g' \
+		${WRKSRC}/data/giftui.desktop
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net-p2p/giftui/pkg-plist b/net-p2p/giftui/pkg-plist
index f28e3b13235..c52cc2709cd 100644
--- a/net-p2p/giftui/pkg-plist
+++ b/net-p2p/giftui/pkg-plist
@@ -1,22 +1,21 @@
 bin/giftui
-share/applications/giftui.desktop
-@dirrm share/applications
-%%DATADIR%%/icons/fasttrack-down.png
-%%DATADIR%%/icons/fasttrack-network.png
-%%DATADIR%%/icons/fasttrack-search.png
-%%DATADIR%%/icons/fasttrack-up.png
-%%DATADIR%%/icons/gnutella-down.png
-%%DATADIR%%/icons/gnutella-network.png
-%%DATADIR%%/icons/gnutella-search.png
-%%DATADIR%%/icons/gnutella-up.png
-%%DATADIR%%/icons/openft-down.png
-%%DATADIR%%/icons/openft-network.png
-%%DATADIR%%/icons/openft-search.png
-%%DATADIR%%/icons/openft-up.png
-%%DATADIR%%/icons/opennap-down.png
-%%DATADIR%%/icons/opennap-network.png
-%%DATADIR%%/icons/opennap-search.png
-%%DATADIR%%/icons/opennap-up.png
-share/pixmaps/giftui.png
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
+share/gnome/applications/giftui.desktop
+share/gnome/giftui/icons/fasttrack-down.png
+share/gnome/giftui/icons/fasttrack-network.png
+share/gnome/giftui/icons/fasttrack-search.png
+share/gnome/giftui/icons/fasttrack-up.png
+share/gnome/giftui/icons/gnutella-down.png
+share/gnome/giftui/icons/gnutella-network.png
+share/gnome/giftui/icons/gnutella-search.png
+share/gnome/giftui/icons/gnutella-up.png
+share/gnome/giftui/icons/openft-down.png
+share/gnome/giftui/icons/openft-network.png
+share/gnome/giftui/icons/openft-search.png
+share/gnome/giftui/icons/openft-up.png
+share/gnome/giftui/icons/opennap-down.png
+share/gnome/giftui/icons/opennap-network.png
+share/gnome/giftui/icons/opennap-search.png
+share/gnome/giftui/icons/opennap-up.png
+share/gnome/pixmaps/giftui.png
+@dirrm share/gnome/giftui/icons
+@dirrm share/gnome/giftui
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 3b156911b87..06b3d9ea895 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net-p2p/gtorrentviewer/Makefile,v 1.2 2006/09/30 01:22:35 ahze Exp $
 
 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,8 @@ COMMENT=	GTK+2 viewer and editor for BitTorrent meta files
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_GNOME=	gtk20 gnomehier intlhack
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GETOPT_LONG=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-p2p/xmule/Makefile b/net-p2p/xmule/Makefile
index 0b90f61d940..f9fd3e4f2c2 100644
--- a/net-p2p/xmule/Makefile
+++ b/net-p2p/xmule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmule
 PORTVERSION=	1.12.2
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 #MASTER_SITES=	http://download.berlios.de/%SUBDIR%/
@@ -22,7 +22,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehier \
 		gnomehack \
@@ -31,7 +31,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cryptopp-prefix=${LOCALBASE} \
-		--with-gtk-prefix=${X11BASE} \
+		--with-gtk-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
 		--enable-debug \
diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist
index d659dc5859a..adec38f91fa 100644
--- a/net-p2p/xmule/pkg-plist
+++ b/net-p2p/xmule/pkg-plist
@@ -11,7 +11,8 @@ share/locale/it/LC_MESSAGES/xmule.mo
 share/locale/ko/LC_MESSAGES/xmule.mo
 share/locale/pl/LC_MESSAGES/xmule.mo
 share/locale/tr/LC_MESSAGES/xmule.mo
-@dirrmtry share/locale/ee/LC_MESSAGES
-@dirrmtry share/locale/ee
-@dirrmtry share/locale
 @dirrmtry share/gnome/locale
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko