Implement USE_GNOME, part 1.

15 files changed, 84 insertions, 128 deletions

diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 5901a5c78fc5..c3d6b751cfc5 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -12,17 +12,9 @@ MASTER_SITES=	http://www.linuxstart.com/~arjan/diacanvas/download/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/graphics/diacanvas/files/patch-ac b/graphics/diacanvas/files/patch-ac
new file mode 100644
index 000000000000..01c47d384a78
--- /dev/null
+++ b/graphics/diacanvas/files/patch-ac
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Feb 27 15:26:48 2000
++++ Makefile.in	Sun Feb 27 15:27:02 2000
+@@ -101,7 +101,7 @@
+ EXTRA_DIST =  	diacanvas.m4		TODO 	BUGS
+ 
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
+ m4data_DATA = diacanvas.m4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/diacanvas/pkg-plist b/graphics/diacanvas/pkg-plist
index 7279605a1ba7..5dc17d7de293 100644
--- a/graphics/diacanvas/pkg-plist
+++ b/graphics/diacanvas/pkg-plist
@@ -31,8 +31,7 @@ include/diacanvas/diarenderergdk.h
 include/diacanvas/diatool.h
 include/diacanvas/geometry.h
 lib/libdiacanvas.a
-lib/libdiacanvas.la
 lib/libdiacanvas.so
 lib/libdiacanvas.so.1
-share/gnome/aclocal/diacanvas.m4
+share/aclocal/diacanvas.m4
 @dirrm include/diacanvas
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index b26c411e41ae..46b83229e5af 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -14,17 +14,11 @@ DISTNAME=	ee-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 54f62f2fcf4c..32df7cad810a 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -14,16 +14,14 @@ MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 54f62f2fcf4c..32df7cad810a 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -14,16 +14,14 @@ MASTER_SITE_SUBDIR=	unstable/sources/eog
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		bonobo.2:${PORTSDIR}/devel/bonobo \
 		gconf-1.1:${PORTSDIR}/devel/gconf
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 90bfdbd3b736..9b8da6463eba 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -13,18 +13,17 @@ MASTER_SITE_SUBDIR=	unstable/sources/gdk-pixbuf
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOMELIBS=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+pre-patch:
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g'
+
 .include <bsd.port.mk>
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index eac708432de8..5f4cee332a2a 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -91,18 +91,18 @@
 -@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
 -@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule
 -@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
-+@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
++@INSIDE_GNOME_LIBS_TRUE@test_gdk_pixbuf_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
  @INSIDE_GNOME_LIBS_TRUE@testpixbuf_drawable_LDADD = $(LDADDS)
  @INSIDE_GNOME_LIBS_FALSE@testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
  @INSIDE_GNOME_LIBS_TRUE@testpixbuf_scale_LDADD = $(LDADDS)
  @INSIDE_GNOME_LIBS_FALSE@testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
 -@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule
 -@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule12
-+@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
++@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
++@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
  
  GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
  
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index b05780cde348..df340c259227 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -13,15 +13,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
+USE_NEWGCC=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG} \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share
-USE_NEWGCC=	yes
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/gnofract4d/pkg-plist b/graphics/gnofract4d/pkg-plist
index 41da483b5d9c..0bbfde6f65de 100644
--- a/graphics/gnofract4d/pkg-plist
+++ b/graphics/gnofract4d/pkg-plist
@@ -86,6 +86,7 @@ share/gnome/pixmaps/gnofract4d/gnofract4d-logo.png
 share/locale/fr/LC_MESSAGES/gnofract4d.mo
 @dirrm share/gnome/pixmaps/gnofract4d
 @dirrm share/gnome/maps/gnofract4d
+@dirrm share/gnome/maps
 @dirrm share/gnome/help/gnofract4d/C/images
 @dirrm share/gnome/help/gnofract4d/C
 @dirrm share/gnome/help/gnofract4d
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index f6a3ffa91402..f64dfc8187b4 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -12,25 +12,16 @@ MASTER_SITES=	http://wine.sexcity.pl/morpheus/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		morph.0:${PORTSDIR}/graphics/libmorph \
+LIB_DEPENDS=	morph.0:${PORTSDIR}/graphics/libmorph \
 		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_MESA=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
-CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index 11856fe2b7a6..3a9a7cd8272a 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -13,21 +13,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		glade.4:${PORTSDIR}/devel/libglade \
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade \
 		gnomeprint.12:${PORTSDIR}/print/gnomeprint \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		bonobo.2:${PORTSDIR}/devel/bonobo
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile
index cb70ed2e4d13..44902316fb02 100644
--- a/graphics/xmps/Makefile
+++ b/graphics/xmps/Makefile
@@ -12,22 +12,26 @@ MASTER_SITES=	http://www-eleves.enst-bretagne.fr/~chavarri/xmps/sources/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	smpeg.0:${PORTSDIR}/graphics/smpeg \
-		gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	smpeg.0:${PORTSDIR}/graphics/smpeg
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
- 		GLIB_CONFIG="${GLIB_CONFIG}" \
+USE_X_PREFIX=	yes
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-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'
 
 .include <bsd.port.mk>
diff --git a/graphics/xmps/files/patch-aa b/graphics/xmps/files/patch-aa
index 7ae2c2967701..a7d89a3e518e 100644
--- a/graphics/xmps/files/patch-aa
+++ b/graphics/xmps/files/patch-aa
@@ -16,33 +16,6 @@
   cat >> confdefs.h <<\EOF
  #define AS_STRETCHER 1
  EOF
-@@ -2979,14 +2981,14 @@
- { echo "configure: error: *** POSIX thread support not installed ***" 1>&2; exit 1; }
- fi
- 
--echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:2984: checking for pthread_attr_init in -lpthread" >&5
-+echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:2984: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2992 "configure"
- #include "confdefs.h"
-@@ -3020,7 +3022,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="-pthread $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
 @@ -4060,16 +4062,16 @@
  { echo "configure: error: **** Cannot find stat.h ****" 1>&2; exit 1; }
  fi
diff --git a/graphics/xmps/pkg-plist b/graphics/xmps/pkg-plist
index a292fff4c220..836cb270fa9d 100644
--- a/graphics/xmps/pkg-plist
+++ b/graphics/xmps/pkg-plist
@@ -3,30 +3,30 @@ lib/xmps/Codecs/libsmpeg.so
 lib/xmps/Renderers/libSDL.so
 lib/xmps/Renderers/libX11.so
 share/gnome/apps/Multimedia/XMPS.desktop
+share/gnome/pixmaps/xmps.png
+share/gnome/xmps/skins/DarkDepth/buttons.xpm
+share/gnome/xmps/skins/DarkDepth/config
+share/gnome/xmps/skins/DarkDepth/controls.xpm
+share/gnome/xmps/skins/DarkDepth/digits.xpm
+share/gnome/xmps/skins/DarkDepth/main.xpm
+share/gnome/xmps/skins/DarkDepth/playlist.xpm
+share/gnome/xmps/skins/DarkDepth/titlebar.xpm
+share/gnome/xmps/skins/default/buttons.xpm
+share/gnome/xmps/skins/default/config
+share/gnome/xmps/skins/default/controls.xpm
+share/gnome/xmps/skins/default/digits.xpm
+share/gnome/xmps/skins/default/main.xpm
+share/gnome/xmps/skins/default/playlist.xpm
+share/gnome/xmps/skins/default/titlebar.xpm
+share/gnome/xmps/xmps_intro.xpm
 share/locale/fi/LC_MESSAGES/xmps.mo
 share/locale/fr/LC_MESSAGES/xmps.mo
 share/locale/pl/LC_MESSAGES/xmps.mo
 share/locale/sv/LC_MESSAGES/xmps.mo
-share/gnome/pixmaps/xmps.png
-share/xmps/skins/DarkDepth/buttons.xpm
-share/xmps/skins/DarkDepth/config
-share/xmps/skins/DarkDepth/controls.xpm
-share/xmps/skins/DarkDepth/digits.xpm
-share/xmps/skins/DarkDepth/main.xpm
-share/xmps/skins/DarkDepth/playlist.xpm
-share/xmps/skins/DarkDepth/titlebar.xpm
-share/xmps/skins/default/buttons.xpm
-share/xmps/skins/default/config
-share/xmps/skins/default/controls.xpm
-share/xmps/skins/default/digits.xpm
-share/xmps/skins/default/main.xpm
-share/xmps/skins/default/playlist.xpm
-share/xmps/skins/default/titlebar.xpm
-share/xmps/xmps_intro.xpm
-@dirrm share/xmps/skins/default
-@dirrm share/xmps/skins/DarkDepth
-@dirrm share/xmps/skins
-@dirrm share/xmps
+@dirrm share/gnome/xmps/skins/default
+@dirrm share/gnome/xmps/skins/DarkDepth
+@dirrm share/gnome/xmps/skins
+@dirrm share/gnome/xmps
 @dirrm lib/xmps/Renderers
 @dirrm lib/xmps/Codecs
 @dirrm lib/xmps