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)

5 files changed, 32 insertions, 6 deletions

diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index 8f7e699b949c..3a3d3fff835d 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gwget
 PORTVERSION=	0.98.1
+PORTREVISION=	1
 CATEGORIES=	ftp www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -25,7 +26,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui libbonobo gconf2
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBBONOBO_IDL="-I${LOCALBASE}/idl/bonobo-2.0" \
@@ -36,7 +37,7 @@ EPHY_VER?=	2.14
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/epiphany) && !defined(WITHOUT_EPIPHANY)
+.if exists(${LOCALBASE}/bin/epiphany) && !defined(WITHOUT_EPIPHANY)
 WITH_EPIPHANY=	yes
 .endif
 
diff --git a/ftp/gwget/pkg-plist b/ftp/gwget/pkg-plist
index 9acae1f95472..3c4ef20f365a 100644
--- a/ftp/gwget/pkg-plist
+++ b/ftp/gwget/pkg-plist
@@ -64,3 +64,29 @@ share/locale/zh_TW/LC_MESSAGES/gwget.mo
 %%EPIPHANY%%@dirrmtry lib/epiphany/%%VERSION%%
 %%EPIPHANY%%@dirrmtry lib/epiphany
 @dirrm share/gnome/gwget
+@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/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 44c929c870f4..086d5179b008 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pureadmin
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	purify
diff --git a/ftp/pureadmin/pkg-plist b/ftp/pureadmin/pkg-plist
index 6ec54249712d..d3a00979ede1 100644
--- a/ftp/pureadmin/pkg-plist
+++ b/ftp/pureadmin/pkg-plist
@@ -30,5 +30,3 @@ share/locale/it/LC_MESSAGES/pureadmin.mo
 share/locale/sv/LC_MESSAGES/pureadmin.mo
 @dirrm share/gnome/pureadmin/docs
 @dirrm share/gnome/pureadmin
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 68513599df1e..77d7750c8c42 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wzdftpd
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -99,7 +99,7 @@ PLIST_SUB+=	ZEROCONF="@comment "
 .endif
 
 .if defined(WITH_AVAHI) && !defined(WITH_HOWL)
-LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus \
 		avahi-core.4:${PORTSDIR}/net/avahi
 CONFIGURE_ARGS+=	--with-zeroconf --enable-avahi
 .endif