6 files changed, 25 insertions, 18 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index ff51086cf298..6672b81e01cc 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -16,8 +16,9 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
-WANT_ESOUND=	yes
+USE_GNOMENG=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -31,8 +32,9 @@ MAN1=		everybuddy.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_ESOUND)
-USE_ESOUND=	yes
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+PKGNAMESUFFIX=	-esound
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 916dc6132b4c..c2cb375c46c2 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -18,15 +18,16 @@ LIB_DEPENDS=	icq.0:${PORTSDIR}/net/libicq
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
 WANT_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+.if ${HAVE_GNOME:Mgtk12}!=""
+USE_GNOME+=	gtk12
+PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--without-gnome
 .endif
diff --git a/net-im/gtkyahoo/Makefile b/net-im/gtkyahoo/Makefile
index 8186a9c6d412..8f2f6dacc453 100644
--- a/net-im/gtkyahoo/Makefile
+++ b/net-im/gtkyahoo/Makefile
@@ -14,7 +14,8 @@ MASTER_SITE_SUBDIR=	gtkyahoo
 MAINTAINER=	anders@hack.org
 
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_BISON=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index dfb0386799f0..410eabe3971f 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -19,8 +19,9 @@ LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
 		icq2000.5:${PORTSDIR}/net/libicq2000
 
 USE_X_PREFIX=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 WANT_GNOME=	yes
-USE_GTK=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -35,9 +36,9 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME) || defined(WITH_GNOME)
-USE_GNOME=	yes
-
+.if ${HAVE_GNOME:Mlibcapplet}!="" || defined(WITH_GNOME)
+USE_GNOME+=	libcapplet
+PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	ICKLEDATADIR="share/gnome/" GNOME="" NOGNOME="@comment "
 .else
 CONFIGURE_ARGS+=	--with-gnome=no
@@ -54,7 +55,7 @@ PLIST_SUB+=	ICKLECONTROL="@comment "
 .endif
 
 pre-everything::
-.if !defined(HAVE_GNOME) && !defined(WITH_GNOME)
+.if ${HAVE_GNOME:Mlibcapplet}=="" && !defined(WITH_GNOME)
 	@${ECHO_MSG} "===> Define WITH_GNOME		to enable GNOME support"
 .endif
 .if !defined(WITH_ICKLE_CONTROL)
diff --git a/net-im/linpopup/Makefile b/net-im/linpopup/Makefile
index 26b212efcfd4..df223ca19bd4 100644
--- a/net-im/linpopup/Makefile
+++ b/net-im/linpopup/Makefile
@@ -19,7 +19,8 @@ WRKSRC=		${WRKDIR}/LinPopUp-${PORTVERSION}/src
 ALL_TARGET=
 MAN1=		linpopup.1 LinPopUp.1
 
-USE_GTK=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
 post-install:
diff --git a/net-im/ymessenger/Makefile b/net-im/ymessenger/Makefile
index b0f630918016..49ec02a79ce3 100644
--- a/net-im/ymessenger/Makefile
+++ b/net-im/ymessenger/Makefile
@@ -11,17 +11,18 @@ PORTVERSION=	0.99.19-1
 CATEGORIES=	net
 MASTER_SITES=	http://download.yahoo.com/dl/unix/fbsd45/
 EXTRACT_SUFX=	.tgz
-NO_WRKSUBDIR=	yes
 
 MAINTAINER=	sethk@meowfishies.com
 
-ONLY_FOR_ARCHS=	i386
-
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-USE_GTK=	yes
+ONLY_FOR_ARCHS=	i386
+
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bin/ymessenger ${PREFIX}/bin