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)

18 files changed, 86 insertions, 53 deletions

diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index 837d108c081b..b33a9645676d 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -3,10 +3,12 @@
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
+#    $MCom: ports/net/crescendo/Makefile,v 1.2 2006/10/07 16:29:01 mezz Exp $
+#
 
 PORTNAME=	crescendo
 PORTVERSION=	1.1.7
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	net gnome
 # Master Site broken
 #MASTER_SITES=	http://crescendo.lyrical.net/files/
@@ -18,7 +20,6 @@ COMMENT=	A gnome frontend for tinyfuge
 
 RUN_DEPENDS=	tf:${PORTSDIR}/net/tinyfugue
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-compile-warnings=yes
@@ -28,7 +29,7 @@ CFLAGS+=	-g
 PLIST_SUB=	DOCDIR=share/doc/${PORTNAME}
 MODIFY=		Makefile.in data/Makefile.in
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomelibs
 
 post-patch:
diff --git a/net/diradmin/Makefile b/net/diradmin/Makefile
index c157095d9aef..bd738bb268d7 100644
--- a/net/diradmin/Makefile
+++ b/net/diradmin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	diradmin
 PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://diradmin.open-it.org/releases/ \
 		http://diradmin.open-it.org/releases/old/
@@ -19,7 +19,6 @@ COMMENT=	A smart LDAP directory management tool
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
 USE_OPENLDAP=	yes
 USE_OPENSSL=	yes
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index e0730fa846d9..4f9a2fcf290b 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liferea
 PORTVERSION=	1.0.23
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	liferea
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Simple RSS/RDF feed reader
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GECKO=	mozilla firefox
 USE_GNOME=	gnomeprefix gnomehack libgtkhtml
 USE_GMAKE=	yes
@@ -62,7 +63,7 @@ PLIST_SUB+=	XUL="@comment "
 .ifdef WITHOUT_DBUS
 CONFIGURE_ARGS+=--disable-dbus
 .else
-LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .endif
 
 post-patch:
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 9f2f0a3c96e2..94c9fe82d478 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -114,3 +114,21 @@ share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm lib/liferea
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
 %%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/penguintv/Makefile b/net/penguintv/Makefile
index 7728bb7e9853..45e640f1ba6b 100644
--- a/net/penguintv/Makefile
+++ b/net/penguintv/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	PenguinTV
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	net audio multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	penguintv
@@ -24,9 +25,11 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	MOZILLA	"Use Mozilla rendered (experimental)" OFF
 
-USE_GNOME=	pygnomeextras pygnome2
+USE_GNOME=	gnomehier pygnomeextras pygnome2
 USE_PYTHON=	yes
 
+GCONF_SCHEMAS=	penguintv.schema
+
 CONFLICTS=	PenguinTV-devel-[0-9]*
 
 .include <bsd.port.pre.mk>
@@ -51,4 +54,9 @@ do-build:
 do-install:
 	cd ${WRKSRC} && ${PYTHON_CMD} setup.py install
 
+post-install:
+	@${MKDIR} ${LOCALBASE}/etc/gconf/schemas
+	@${INSTALL_DATA} ${WRKSRC}/share/penguintv.schema \
+		${LOCALBASE}/etc/gconf/schemas/
+
 .include <bsd.port.post.mk>
diff --git a/net/penguintv/pkg-plist b/net/penguintv/pkg-plist
index da8ae4f09c41..5f6ffd532031 100644
--- a/net/penguintv/pkg-plist
+++ b/net/penguintv/pkg-plist
@@ -120,14 +120,11 @@ share/penguintv/defaultsubs.opml
 share/penguintv/penguintv.glade
 share/penguintv/penguintvicon.png
 share/pixmaps/penguintvicon.png
-
 @dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrm share/penguintv
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv/ptvbittorrent
 %%WITH_MOZILLA%%@dirrm %%PYTHON_SITELIBDIR%%/penguintv/democracy_moz
 @dirrm %%PYTHON_SITELIBDIR%%/penguintv
-
-@comment @cwd %%X11BASE%%
-@comment etc/gconf/gconf.xml.defaults/schemas/apps/penguintv/%gconf.xml
-@comment etc/gconf/gconf.xml.defaults/apps/penguintv/%gconf.xml
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
diff --git a/net/service-discovery-applet/Makefile b/net/service-discovery-applet/Makefile
index 7614f7529b6b..c64157694c3f 100644
--- a/net/service-discovery-applet/Makefile
+++ b/net/service-discovery-applet/Makefile
@@ -3,21 +3,22 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/net/service-discovery-applet/Makefile,v 1.3 2006/10/11 05:53:39 marcus Exp $
 #
 
 PORTNAME=	service-discovery-applet
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net dns gnome
 MASTER_SITES=	http://0pointer.de/~sebest/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME applet that shows available network services using mDNS
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
-RUN_DEPENDS=	${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack pygnomedesktop
@@ -31,10 +32,10 @@ GCONF_SCHEMAS=	service-discovery-applet.schemas
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/plugins/gconfterminal.py.in
+	    	${WRKSRC}/plugins/gconfterminal.py.in
 
 post-install:
-	@${X11BASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
+	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
 		${PREFIX}/share/gnome/service-discovery-applet/icons
 
 .include <bsd.port.mk>
diff --git a/net/service-discovery-applet/files/patch-servers_Makefile.in b/net/service-discovery-applet/files/patch-servers_Makefile.in
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/service-discovery-applet/files/patch-servers_Makefile.in
+++ /dev/null
diff --git a/net/service-discovery-applet/pkg-plist b/net/service-discovery-applet/pkg-plist
index 9f426d622478..0f040570e11d 100644
--- a/net/service-discovery-applet/pkg-plist
+++ b/net/service-discovery-applet/pkg-plist
@@ -45,3 +45,5 @@ share/locale/fr/LC_MESSAGES/service-discovery-applet.mo
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/sdapplet
 @dirrmtry lib/%%PYTHON_VERSION%%/site-packages
 @dirrmtry lib/%%PYTHON_VERSION%%
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net/silky/Makefile b/net/silky/Makefile
index 4806b1c64d3d..f92b13814308 100644
--- a/net/silky/Makefile
+++ b/net/silky/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	silky
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
@@ -31,7 +31,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 USE_GNOME=	gtk20 libglade2 gnomelibs
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_X_PREFIX=	yes
 
 post-patch:
 	@${PERL} -pi -e 's/ include / /' ${WRKSRC}/Makefile.in
diff --git a/net/silky/pkg-plist b/net/silky/pkg-plist
index 160d5da0079e..571d6e23706a 100644
--- a/net/silky/pkg-plist
+++ b/net/silky/pkg-plist
@@ -33,3 +33,11 @@ share/locale/zh_CN/LC_MESSAGES/silky.mo
 share/gnome/apps/Applications/silky.desktop
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile
index 7508ee712ecf..a933c8721c3d 100644
--- a/net/skype-devel/Makefile
+++ b/net/skype-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.3.0.30
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 PKGNAMESUFFIX=	-devel
@@ -30,33 +31,25 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 RESTRICTED=	Redistribution not allowed yet.
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+=	GNOME=""
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
+	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
 #	${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
 	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | ${GREP} -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
 	${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
-	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
 	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist
index e2b5f3707078..54578dd55be3 100644
--- a/net/skype-devel/pkg-plist
+++ b/net/skype-devel/pkg-plist
@@ -39,5 +39,6 @@ bin/skype_bin
 @dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net/skype/Makefile b/net/skype/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net/skype/Makefile
+++ b/net/skype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skype
 PORTVERSION=	1.2.0.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.skype.com/linux/
 DISTNAME=	skype_staticQT-${PORTVERSION}
@@ -29,33 +29,25 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
 USE_BZIP2=	yes
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
 RESTRICTED=	Redistribution not allowed yet.
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomehier} != ""
-PLIST_SUB+=	GNOME=""
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/skype
 
 do-install:
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin
 #	${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/
 	${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype
 	${CHMOD} a+rx ${PREFIX}/bin/skype
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/
-	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png
-.endif
+	${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/pixmaps/skype.png
 	${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound
 	${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/
 	${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/
diff --git a/net/skype/pkg-plist b/net/skype/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net/skype/pkg-plist
+++ b/net/skype/pkg-plist
@@ -35,5 +35,6 @@ bin/skype_bin
 @dirrm %%DATADIR%%/sound
 %%DATADIR%%/LICENSE
 @dirrm %%DATADIR%%
-%%GNOME%%share/gnome/applications/skype.desktop
-%%GNOME%%share/gnome/pixmaps/skype.png
+share/applications/skype.desktop
+share/pixmaps/skype.png
+@dirrmtry share/applications
diff --git a/net/straw/Makefile b/net/straw/Makefile
index 45a0f1e8377c..5b1531ce87f9 100644
--- a/net/straw/Makefile
+++ b/net/straw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	straw
 PORTVERSION=	0.25.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GNOME 2 desktop weblog aggregator written in Python
 
+BROKEN=	Does not work with the newer GTK/GNOME python bindings
+
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	libglade2 pygnome2 pygnomeextras
+USE_XLIB=	yes
+USE_GNOME=	gnomehier libglade2 pygnome2 pygnomeextras
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
diff --git a/net/straw/pkg-plist b/net/straw/pkg-plist
index 930d800d13d9..21b0117293db 100644
--- a/net/straw/pkg-plist
+++ b/net/straw/pkg-plist
@@ -149,3 +149,13 @@ share/locale/sr/LC_MESSAGES/straw.mo
 share/locale/sr@Latn/LC_MESSAGES/straw.mo
 share/locale/sv/LC_MESSAGES/straw.mo
 @dirrm share/gnome/straw
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile
index cf6374306b4d..cfdb1e1f05cf 100644
--- a/net/tapidbus/Makefile
+++ b/net/tapidbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tapidbus
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tapioca-voip
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	tapioca-voip
 MAINTAINER=	babak@farrokhi.net
 COMMENT=	Abstraction layer for interprocess communication
 
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes