Set {WANT,USE}_GNOME correctly to make these ports compatible with the new

bsd.port.mk.

Submitted by:	kris

16 files changed, 32 insertions, 11 deletions

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index c22e5c4467a0..a81ab325992d 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -41,6 +41,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FIXPREFIX=	Docs/man/gnokiid.8 Docs/DataCalls-QuickStart Docs/README \
 		common/cfgreader.c po/et.po po/sl.po
 
+WANT_GNOME=	yes
+
 .include <bsd.port.pre.mk>
 
 # If smsd is enabled check if MySQL or PostgreSQL are installed and
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index 6415a5e03672..9a23433734e2 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -20,6 +20,8 @@ COMMENT=	xBase and Clipper language compatible compiler
 
 USE_GETTEXT=	yes
 
+WANT_GNOME=	yes
+
 .include <bsd.port.pre.mk>
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 1b20a20450a8..7467a396149d 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -36,6 +36,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?= /usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
@@ -129,7 +131,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 0aec5125e62e..b7c327036459 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -34,6 +34,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?=	/usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 BUILD_NR=		645
@@ -125,7 +127,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 0aec5125e62e..b7c327036459 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -34,6 +34,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?=	/usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 BUILD_NR=		645
@@ -125,7 +127,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 1b20a20450a8..7467a396149d 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -36,6 +36,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?= /usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
@@ -129,7 +131,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 0aec5125e62e..b7c327036459 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -34,6 +34,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?=	/usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 BUILD_NR=		645
@@ -125,7 +127,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 0aec5125e62e..b7c327036459 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -34,6 +34,8 @@ ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
 PASTE?=	/usr/bin/paste
 
+USE_GNOME=	orbit gtk12
+
 .include <bsd.port.pre.mk>
 
 BUILD_NR=		645
@@ -125,7 +127,6 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	orbit gtk12
 
 EXTRACT_BEFORE_ARGS_R= -dc
 EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 7f113b173514..5c401a787b39 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -54,6 +54,8 @@ MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1  \
 		eview.1 gvimdiff.1
 .endif
 
+WANT_GNOME=	yes
+
 .include <bsd.port.pre.mk>
 
 .if !defined(LITE)
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index d27f31440bc1..3e47453d26dd 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -17,6 +17,8 @@ COMMENT?=	A modular IRC client with many features
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
+WANT_GNOME=	yes
+
 MAN1=		irssi.1
 
 .include <bsd.port.pre.mk>
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index d27f31440bc1..3e47453d26dd 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -17,6 +17,8 @@ COMMENT?=	A modular IRC client with many features
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
+WANT_GNOME=	yes
+
 MAN1=		irssi.1
 
 .include <bsd.port.pre.mk>
diff --git a/korean/gdick/Makefile b/korean/gdick/Makefile
index f8cdaaca0cf5..168b536379ce 100644
--- a/korean/gdick/Makefile
+++ b/korean/gdick/Makefile
@@ -25,10 +25,10 @@ USE_REINPLACE=	yes
 USE_BZIP2=	yes
 PLIST_SUB=	${OPTPLIST_SUB}
 
-.include <bsd.port.pre.mk>
-
 USE_GNOME=	gnomehier
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/share/gdick/gdick.glade,${PREFIX}/share/gdick/gdick.glade,g' \
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 336c1d8b59ba..8b26e107188b 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Midnight Commander, a free Norton Commander Clone
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-.include <bsd.port.pre.mk>
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_SAMBA)
 CONFIGURE_ARGS+=--with-samba --with-configdir=${LOCALBASE}/etc \
 		--with-codepagedir=${LOCALBASE}/etc/codepages
diff --git a/net/nocatsplash/Makefile b/net/nocatsplash/Makefile
index cc77bd4b74f7..8e87dc42e762 100644
--- a/net/nocatsplash/Makefile
+++ b/net/nocatsplash/Makefile
@@ -21,6 +21,8 @@ BUILD_DEPENDS= \
 RUN_DEPENDS= \
 	${LOCALBASE}/sbin/pfctl:${PORTSDIR}/security/pf
 
+USE_GNOME=	glib12
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
@@ -31,7 +33,6 @@ CONFLICTS=	nocatauth-server-*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib12
 
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 CONFIGURE_ARGS+=	--disable-glibtest
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 6793ac48bd1e..c062f34c572a 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -46,6 +46,8 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk
 
+WANT_GNOME=	yes
+
 .if ${WXGTK_FLAVOR} != "gtk-common"
 RUN_DEPENDS=	${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common
 .endif
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 6793ac48bd1e..c062f34c572a 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -46,6 +46,8 @@ PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk
 
+WANT_GNOME=	yes
+
 .if ${WXGTK_FLAVOR} != "gtk-common"
 RUN_DEPENDS=	${X11BASE}/include/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk-common
 .endif