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)

24 files changed, 127 insertions, 95 deletions

diff --git a/net-im/gaim-assistant/Makefile b/net-im/gaim-assistant/Makefile
index 27091dc9e88a..89e7047095ba 100644
--- a/net-im/gaim-assistant/Makefile
+++ b/net-im/gaim-assistant/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gaim-assistant
 PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +14,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	MrL0Lz@gmail.com
 COMMENT=	Plugin that forwards messages to a different screen name
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_GCC=	3.4+
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index efeeadb58b84..1740b734838a 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bangexec
 PORTVERSION=	1.3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://thefnords.googlepages.com/
 PKGNAMEPREFIX=	gaim-
@@ -20,7 +20,6 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 DEPRECATED=	The author has taken down his site and has ceased developing this program
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net-im/gaim-extprefs/Makefile b/net-im/gaim-extprefs/Makefile
index 970cf21e5c81..1db0b358f2f1 100644
--- a/net-im/gaim-extprefs/Makefile
+++ b/net-im/gaim-extprefs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim-extprefs
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gaim-extprefs
@@ -15,10 +15,10 @@ MASTER_SITE_SUBDIR=	gaim-extprefs
 MAINTAINER=	semionov@mail.bg
 COMMENT=	A gaim plugin that provides additional preferences
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--enable-static=no
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 3ad48ac4aa42..72c418630e08 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +16,10 @@ PKGNAMEPREFIX=	gaim-
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Plugin to add msn style "toaster" popups to Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index ba932da38c86..bba7aa20af45 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ignorance
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://thefnords.googlepages.com/
 PKGNAMEPREFIX=	gaim-
@@ -20,7 +20,6 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 DEPRECATED=	The author has taken down his site and has ceased developing this program
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net-im/gaim-latex/Makefile b/net-im/gaim-latex/Makefile
index f01ff954655d..16c2a6ceb90d 100644
--- a/net-im/gaim-latex/Makefile
+++ b/net-im/gaim-latex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -17,13 +17,13 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Display LaTeX output in your IMs
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim \
 		latex:${PORTSDIR}/print/teTeX \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
 CFLAGS+=	"-fPIC"
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_BZIP2=	yes
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 6dfafb772f49..808b8e32f591 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openq
 PORTVERSION=	0.3.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,10 +20,10 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	liu_yinghong@yahoo.com.cn
 COMMENT=	A QQ-liked protocol plugin for Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist
index 9c1104fd2fef..4a67c5d0c8bc 100644
--- a/net-im/gaim-openq/pkg-plist
+++ b/net-im/gaim-openq/pkg-plist
@@ -531,3 +531,5 @@ share/locale/zh_CN/LC_MESSAGES/openq.mo
 @dirrm share/gnome/pixmaps/gaim/smileys/2003iii
 @dirrmtry share/gnome/doc
 @dirrmtry share/gnome/gaim
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/net-im/gaim-rss-reader/Makefile b/net-im/gaim-rss-reader/Makefile
index 1310f3b1e080..ecad2ca0876e 100644
--- a/net-im/gaim-rss-reader/Makefile
+++ b/net-im/gaim-rss-reader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rss-reader
 PORTVERSION=	0.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -17,18 +17,18 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mycroft@virgaria.org
 COMMENT=	Provides Rss support for Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 IGNORE=	Requires update to work with Gaim 0.82.1
 DEPRECATED=	${IGNORE}
 EXPIRATION_DATE=2006-12-01
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--with-gaim=${X11BASE}/include/gaim"
+CONFIGURE_ARGS=	"--with-gaim=${LOCALBASE}/include/gaim"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/gaim-slashexec/Makefile b/net-im/gaim-slashexec/Makefile
index 1ec0dde0b87b..4e69fc4d7007 100644
--- a/net-im/gaim-slashexec/Makefile
+++ b/net-im/gaim-slashexec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slashexec
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	guifications
@@ -19,7 +19,6 @@ COMMENT=	Execute commands inside gaim
 BUILD_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/gaim/se.la lib/gaim/se.so
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index eee05da08cdd..72ebf1f0d840 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	1.5.0
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,9 @@ COMMENT=	Multi-protocol instant messaging client
 
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
-CONFLICTS?=	ja-gaim-[0-9]*
+CONFLICTS?=	ja-gaim-[0-9]* gaim-devel-2*
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
@@ -81,6 +81,8 @@ CONFIGURE_ARGS+=	--disable-nss
 USE_PERL5=		yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=		PERL:=""
+MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3+=			Gaim.3
 .else
 CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=		PERL:="@comment "
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 3273a6cf9720..1e669c973126 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -164,6 +164,11 @@ lib/libgaim-remote.a
 lib/libgaim-remote.la
 lib/libgaim-remote.so
 lib/libgaim-remote.so.0
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
+%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
 libdata/pkgconfig/gaim.pc
 share/gnome/applications/gaim.desktop
 share/gnome/pixmaps/gaim.png
@@ -476,8 +481,6 @@ share/locale/vi/LC_MESSAGES/gaim.mo
 share/locale/xh/LC_MESSAGES/gaim.mo
 share/locale/zh_CN/LC_MESSAGES/gaim.mo
 share/locale/zh_TW/LC_MESSAGES/gaim.mo
-@unexec /bin/rmdir %D/share/locale/my_MM/LC_MESSAGES 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/share/locale/my_MM 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/sounds/gaim
 @dirrm share/gnome/pixmaps/gaim/status/default
 @dirrm share/gnome/pixmaps/gaim/status
@@ -488,13 +491,40 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrm share/gnome/pixmaps/gaim/dialogs
 @dirrm share/gnome/pixmaps/gaim/buttons
 @dirrm share/gnome/pixmaps/gaim
+%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
 @dirrm lib/gaim
 @dirrm include/gaim
-%%PERL:%%@cwd %%LOCALBASE%%
-%%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.so
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/Gaim.bs
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/.packlist
-%%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/Gaim.pm
-%%PERL:%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim
+@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/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@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/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/my_MM/LC_MESSAGES
+@dirrmtry share/locale/my_MM
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 51f22ada66ca..e68ed6852a48 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gossip
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,12 +18,12 @@ COMMENT=	GTK2 Jabber Instant Messaging client
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \
-		dbus-1.2:${PORTSDIR}/devel/dbus \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		aspell.16:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/net-im/gossip/pkg-plist b/net-im/gossip/pkg-plist
index 44939cf02435..0ae318dfdc1c 100644
--- a/net-im/gossip/pkg-plist
+++ b/net-im/gossip/pkg-plist
@@ -108,8 +108,6 @@ share/locale/vi/LC_MESSAGES/gossip.mo
 share/locale/zh_CN/LC_MESSAGES/gossip.mo
 share/locale/zh_HK/LC_MESSAGES/gossip.mo
 share/locale/zh_TW/LC_MESSAGES/gossip.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/gossip
 @dirrm share/gnome/help/gossip/sv/figures
 @dirrm share/gnome/help/gossip/sv
@@ -119,3 +117,25 @@ share/locale/zh_TW/LC_MESSAGES/gossip.mo
 @dirrm share/gnome/sounds/gossip
 @dirrm share/gnome/gossip/protocols
 @dirrm share/gnome/gossip
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@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/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@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/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index dba452ad9a93..26a82c322aa3 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -4,11 +4,11 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net-im/ickle/Makefile,v 1.1 2006/10/04 15:40:14 ahze Exp $
 
 PORTNAME=	ickle
 PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,7 +26,7 @@ USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
-		--with-gtkmm-prefix=${X11BASE}
+		--with-gtkmm-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`"
 
 post-patch:
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index 682545151c45..514d90ad7b1e 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,11 +17,11 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Provides Lotus Sametime support for Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 LIB_DEPENDS=	meanwhile.1:${PORTSDIR}/net-im/meanwhile
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 3ad48ac4aa42..72c418630e08 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,10 +16,10 @@ PKGNAMEPREFIX=	gaim-
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Plugin to add msn style "toaster" popups to Gaim
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile
index f01ff954655d..16c2a6ceb90d 100644
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -17,13 +17,13 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Display LaTeX output in your IMs
 
-BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
+BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim \
 		latex:${PORTSDIR}/print/teTeX \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
 CFLAGS+=	"-fPIC"
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 USE_BZIP2=	yes
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile
index 7508ee712ecf..a933c8721c3d 100644
--- a/net-im/skype-devel/Makefile
+++ b/net-im/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-im/skype-devel/pkg-plist b/net-im/skype-devel/pkg-plist
index e2b5f3707078..54578dd55be3 100644
--- a/net-im/skype-devel/pkg-plist
+++ b/net-im/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-im/skype/Makefile b/net-im/skype/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net-im/skype/Makefile
+++ b/net-im/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-im/skype/pkg-plist b/net-im/skype/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net-im/skype/pkg-plist
+++ b/net-im/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-im/skype20/Makefile b/net-im/skype20/Makefile
index 4ede7293a721..20c6dee50d74 100644
--- a/net-im/skype20/Makefile
+++ b/net-im/skype20/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-im/skype20/pkg-plist b/net-im/skype20/pkg-plist
index d1ddac4c78ab..b7763d3ec4ac 100644
--- a/net-im/skype20/pkg-plist
+++ b/net-im/skype20/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