Implement USE_GNOME, part 1.

13 files changed, 49 insertions, 58 deletions

diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index 4f0a035ffcc5..dcbc2d6b282d 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -12,19 +12,15 @@ MASTER_SITES=	http://www.faradic.net/~jasta/files/
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		ungif.5:${PORTSDIR}/graphics/libungif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GNOME=	yes
 USE_XPM=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}"
+		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -14,15 +14,11 @@ DISTNAME=	gnome-audio-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 NO_BUILD=	yes
 
-INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
-
 post-extract:
 	@${RM} -fr ${WRKSRC}/sounds/sounds
 
diff --git a/audio/gnome-audio/files/patch-aa b/audio/gnome-audio/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnome-audio/files/patch-aa
+++ b/audio/gnome-audio/files/patch-aa
@@ -12,7 +12,7 @@
 -		install -d $(prefix)/share/sounds/`dirname $$I`; \
 -		install -m444 $$I $(prefix)/share/sounds/$$I; \
 +		mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++		${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
  	done
  
  install-default-links:
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -14,16 +14,13 @@ DISTNAME=	gnome-media-${PORTVERSION}
 
 MAINTAINER=	reg@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-ncurses \
-		--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--without-ncurses
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -14,15 +14,11 @@ DISTNAME=	gnome-audio-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 NO_BUILD=	yes
 
-INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
-
 post-extract:
 	@${RM} -fr ${WRKSRC}/sounds/sounds
 
diff --git a/audio/gnomeaudio/files/patch-aa b/audio/gnomeaudio/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnomeaudio/files/patch-aa
+++ b/audio/gnomeaudio/files/patch-aa
@@ -12,7 +12,7 @@
 -		install -d $(prefix)/share/sounds/`dirname $$I`; \
 -		install -m444 $$I $(prefix)/share/sounds/$$I; \
 +		mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++		${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
  	done
  
  install-default-links:
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 0232dfb10729..7997f994fdad 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -14,15 +14,11 @@ DISTNAME=	gnome-audio-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-BUILD_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnome-config:${PORTSDIR}/x11/gnomelibs
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOMELIBS=	yes
 NO_BUILD=	yes
 
-INSTALL_TARGET=	INSTALL_DATA="${INSTALL_DATA}" install
-
 post-extract:
 	@${RM} -fr ${WRKSRC}/sounds/sounds
 
diff --git a/audio/gnomeaudio2/files/patch-aa b/audio/gnomeaudio2/files/patch-aa
index 905fd58df364..13a86220f234 100644
--- a/audio/gnomeaudio2/files/patch-aa
+++ b/audio/gnomeaudio2/files/patch-aa
@@ -12,7 +12,7 @@
 -		install -d $(prefix)/share/sounds/`dirname $$I`; \
 -		install -m444 $$I $(prefix)/share/sounds/$$I; \
 +		mkdir -p $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		${INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
++		${BSD_INSTALL_DATA} $$I $(PREFIX)/share/gnome/sounds/$$I; \
  	done
  
  install-default-links:
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -14,16 +14,13 @@ DISTNAME=	gnome-media-${PORTVERSION}
 
 MAINTAINER=	reg@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-ncurses \
-		--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--without-ncurses
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index d669cae2653b..92f098633e89 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -14,16 +14,13 @@ DISTNAME=	gnome-media-${PORTVERSION}
 
 MAINTAINER=	reg@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-ncurses \
-		--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ARGS=	--without-ncurses
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index fc622c171a01..3b5b9c2f0472 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -14,15 +14,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dima@Chg.RU
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnome=${X11BASE}
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		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\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/audio/yamt/files/patch-aa b/audio/yamt/files/patch-aa
index 8ec874f181c6..702068db770a 100644
--- a/audio/yamt/files/patch-aa
+++ b/audio/yamt/files/patch-aa
@@ -1,11 +1,11 @@
---- pixmaps/Makefile.in.orig	Tue Feb 15 20:09:05 2000
-+++ pixmaps/Makefile.in	Thu Feb 17 11:57:57 2000
-@@ -113,7 +113,7 @@
- EXTRA_DIST =               yamt-logo.png
+--- configure.orig	Sat Jun  3 20:35:31 2000
++++ configure	Sat Jun  3 20:36:07 2000
+@@ -4366,7 +4366,7 @@
+ 
+ fi
+ 
+-PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/${PACKAGE}"
++PACKAGE_PIXMAPS_DIR="`gnome-config --datadir`/pixmaps"
  
  
--pixmapdir = $(datadir)/pixmaps/yamt
-+pixmapdir = $(datadir)/gnome/pixmaps
  
- pixmap_DATA = $(EXTRA_DIST)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/yamt/files/patch-ab b/audio/yamt/files/patch-ab
new file mode 100644
index 000000000000..b1fba12ec832
--- /dev/null
+++ b/audio/yamt/files/patch-ab
@@ -0,0 +1,11 @@
+--- pixmaps/Makefile.in.orig	Sat Jun  3 20:47:40 2000
++++ pixmaps/Makefile.in	Sat Jun  3 20:47:54 2000
+@@ -113,7 +113,7 @@
+ EXTRA_DIST =               yamt-logo.png 	     yamt-icon.png
+ 
+ 
+-pixmapdir = $(datadir)/pixmaps/yamt
++pixmapdir = $(datadir)/pixmaps
+ 
+ pixmap_DATA = $(EXTRA_DIST)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs