Implement WANT_GNOME.

9 files changed, 106 insertions, 90 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 5d841c6e80b0..60fb9dce3397 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -13,41 +13,44 @@ MASTER_SITE_SUBDIR=	sawmill
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib \
-		rep.10:${PORTSDIR}/lang/librep
-.if !defined(WITHOUT_GNOME)
-LIB_DEPENDS+=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
-.endif
+LIB_DEPENDS=	rep.10:${PORTSDIR}/lang/librep
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
-		--datadir=${PREFIX}/share --with-readline
-.if !defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--enable-capplet
+CONFIGURE_ARGS=	--with-readline
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-capplet
 PLIST_SUB+=	GNOME:=""
 .else
-CONFIGURE_ARGS+=	--disable-capplet \
-			--disable-gnome-widgets \
-			--without-gdk-pixbuf
+CONFIGURE_ARGS+=--disable-capplet \
+		--disable-gnome-widgets \
+		--without-gdk-pixbuf
 PLIST_SUB+=	GNOME:="@comment "
 .endif
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
 pre-patch:
-	find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \
+	@${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \
 		xargs ${GREP} -l "../locale" | \
 		xargs ${PERL} -pi -e "s|\.\./locale|../../../locale|g"
 
@@ -56,4 +59,4 @@ post-install:
 	--entry="* sawfish: (sawfish).           sawfish programming manual" \
 	${PREFIX}/info/sawfish.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/sawfish/files/patch-ac b/x11-wm/sawfish/files/patch-ac
index b2d9d3adef51..438809a9f989 100644
--- a/x11-wm/sawfish/files/patch-ac
+++ b/x11-wm/sawfish/files/patch-ac
@@ -5,7 +5,7 @@
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
 -localedir='${sawfishdir}/${version}/locale'
-+localedir='${datadir}/locale'
++localedir='${prefix}/share/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  dnl Checks for programs.
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 5d841c6e80b0..60fb9dce3397 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -13,41 +13,44 @@ MASTER_SITE_SUBDIR=	sawmill
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib \
-		rep.10:${PORTSDIR}/lang/librep
-.if !defined(WITHOUT_GNOME)
-LIB_DEPENDS+=	capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter
-.endif
+LIB_DEPENDS=	rep.10:${PORTSDIR}/lang/librep
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${ARCH}--freebsd${OSREL}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
-		--datadir=${PREFIX}/share --with-readline
-.if !defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--enable-capplet
+CONFIGURE_ARGS=	--with-readline
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-capplet
 PLIST_SUB+=	GNOME:=""
 .else
-CONFIGURE_ARGS+=	--disable-capplet \
-			--disable-gnome-widgets \
-			--without-gdk-pixbuf
+CONFIGURE_ARGS+=--disable-capplet \
+		--disable-gnome-widgets \
+		--without-gdk-pixbuf
 PLIST_SUB+=	GNOME:="@comment "
 .endif
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
 pre-patch:
-	find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \
+	@${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} \( -name "*.jl" -or -name "*.jl.in" \) | \
 		xargs ${GREP} -l "../locale" | \
 		xargs ${PERL} -pi -e "s|\.\./locale|../../../locale|g"
 
@@ -56,4 +59,4 @@ post-install:
 	--entry="* sawfish: (sawfish).           sawfish programming manual" \
 	${PREFIX}/info/sawfish.info ${PREFIX}/info/dir
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/sawfish2/files/patch-ac b/x11-wm/sawfish2/files/patch-ac
index b2d9d3adef51..438809a9f989 100644
--- a/x11-wm/sawfish2/files/patch-ac
+++ b/x11-wm/sawfish2/files/patch-ac
@@ -5,7 +5,7 @@
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
 -localedir='${sawfishdir}/${version}/locale'
-+localedir='${datadir}/locale'
++localedir='${prefix}/share/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  dnl Checks for programs.
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 404233d2de4b..07ec1f74de9a 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -27,6 +27,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
@@ -49,25 +50,24 @@ MASTER_SITES+=	ftp://muse.brain.riken.go.jp/pub/ja.po/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${JA_CATALOGFILE}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITH_GNOME)
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
+
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde
-.endif
-
+.else
 .SILENT:
-.if !defined(WITH_KDE) && !defined(WITH_GNOME)
 pre-extract:
-	${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE"
+	@${ECHO} "You can add hooks for KDE by defining WITH_KDE"
 .endif
 
 post-extract:
 	@cd ${WRKSRC} && \
 	${TAR} xfz libwmfun-0.0.3.tar.gz
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index ee77eee9a08a..b343b31d1116 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -23,14 +23,16 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 USE_BZIP2=	yes
+USE_PERL5=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+WANT_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
 		CPPFLAGS=-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-	--with-nlsdir=${LOCALBASE}/lib/locale \
+	--with-nlsdir=${PREFIX}/share/locale \
 	--with-libs-from="-L${LOCALBASE}/lib" \
 	--with-incs-from="-I${LOCALBASE}/include" \
 	--with-appspath="${PREFIX}/GNUstep/Apps" \
@@ -41,25 +43,24 @@ MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 
 DATAFILES=	WindowMaker-extra-0.1.tar.bz2
 
-.if defined(WITH_GNOME)
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde
+.else
+.SILENT:
+pre-extract:
+	@${ECHO} "You can add hooks for KDE by defining WITH_KDE"
 .endif
 
 .if defined(WITH_SINGLE_ICON)
 CONFIGURE_ARGS+=	--enable-single-icon
 .endif
 
-.SILENT:
-
-.if !defined(WITH_KDE) && !defined(WITH_GNOME)
-pre-extract:
-	${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE"
-.endif
-
 post-extract:
 	@cd ${WRKSRC} && \
 	${TAR} xfz libwmfun-0.0.3.tar.gz
@@ -77,4 +78,4 @@ post-install:
 		${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 123ad2e48f0f..a7b920b5d896 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -12,34 +12,33 @@ MASTER_SITES=	http://ulli.linuxave.net/wmakerconf/
 
 MAINTAINER=	dr@domix.de
 
-RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker \
-		rpm:${PORTSDIR}/misc/rpm \
-		bunzip2:${PORTSDIR}/archivers/bzip2 \
-		wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib \
-		PropList.2:${PORTSDIR}/devel/libPropList \
+RUN_DEPENDS=	rpm:${PORTSDIR}/misc/rpm \
+		bunzip2:${PORTSDIR}/archivers/bzip2
+LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		png.4:${PORTSDIR}/graphics/png \
 		wraster.3:${PORTSDIR}/x11-wm/windowmaker \
 		wmfun.0:${PORTSDIR}/x11-wm/windowmaker
-BUILD_DEPENDS=	bunzip2:${PORTSDIR}/archivers/bzip2 \
-		wget:${PORTSDIR}/ftp/wget
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
+USE_PERL5=	yes
+USE_GMAKE=	yes
 USE_XPM=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+USE_IMLIB=	yes
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-wmakerdir="${X11BASE}/share/WindowMaker"
+
+.include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/gnome-config)
-RUN_DEPENDS+=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+.if defined(HAVE_GNOME)
+BUILD_DEPENDS+=	gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker
+RUN_DEPENDS+=	gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker
 PLIST_SUB+=	GNOME:=""
 .else
 PLIST_SUB+=	GNOME:="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/wmakerconf/files/patch-aa b/x11-wm/wmakerconf/files/patch-aa
new file mode 100644
index 000000000000..0c4a504e26da
--- /dev/null
+++ b/x11-wm/wmakerconf/files/patch-aa
@@ -0,0 +1,10 @@
+--- scripts/wget.pl.orig	Thu Mar 16 09:11:14 2000
++++ scripts/wget.pl	Fri Apr  7 22:06:14 2000
+@@ -1,6 +1,6 @@
+ #! /usr/bin/perl
+ quit ("Wget not installed") if $wwwget eq "";
+ 
+-$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'");
++$rc = system ("$wwwget --q -o $tmpfile '$url'");
+ 
+ quit ("HTTP response error.") if $rc;
diff --git a/x11-wm/wmakerconf/files/patch-ab b/x11-wm/wmakerconf/files/patch-ab
index 8698e267b2fc..54de78f5e6dc 100644
--- a/x11-wm/wmakerconf/files/patch-ab
+++ b/x11-wm/wmakerconf/files/patch-ab
@@ -1,11 +1,11 @@
---- configure.orig	Thu Jun 29 10:44:12 2000
-+++ configure	Thu Jun 29 10:44:16 2000
-@@ -964,7 +964,7 @@
- 	echo $ac_n "checking for GNOME apps directory""... $ac_c" 1>&6
- echo "configure:966: checking for GNOME apps directory" >&5
- 	GNOMEAPPS=`$gnomecfg --datadir`
--	GNOMEAPPS="$GNOMEAPPS/gnome/apps/Settings"
-+	GNOMEAPPS="$GNOMEAPPS/apps/Settings"
- 	GNOMEAPP="wmakerconf.desktop"
-         echo "$ac_t""$GNOMEAPPS" 1>&6
- fi
+--- configure.orig	Sun Jan 23 06:43:09 2000
++++ configure	Mon Jan 31 01:07:06 2000
+@@ -2807,7 +2807,7 @@
+                 www_support="yes"
+         else
+                 echo "$ac_t"""no"" 1>&6
+-                for ac_prog in lynx wget
++                for ac_prog in lynx fetch
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2