Convert all core GNOME1 components and some of the most popular GNOME1

apps to bsd.gnomeng.mk. The goal is to make GNOME1 framework more modular,
which will allow to use GNOME1 apps with GNOME2 desktop as well as considerably
reduce langht of dependency chains for GNOME1 ports (for example after this
commit AbiWord's dependency chain was reduced by 7 ports from 57 to only
50, while Gnumeric's - from 60 to 53 and so on).

The most of the GNOME1 apps are still not converted, so that lot of work is
still ahead.

Please report any unusual problems to gnome@FreeBSD.org.

Discussed with:	marcus
Reviewed by:	marcus

3 files changed, 10 insertions, 34 deletions

diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 1aaf9dcc8d2d..1ec3cb30830a 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -16,8 +16,6 @@ DIST_SUBDIR=	gnome
 MAINTAINER?=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS+=	xml.5:${PORTSDIR}/textproc/libxml \
-		ORBit.2:${PORTSDIR}/devel/ORBit
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
@@ -25,16 +23,12 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_IMLIB=	yes
-USE_ESOUND=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack gnomeprefix esound gtk12 imlib libxml orbit
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--disable-test-gnome \
-		--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--disable-test-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
@@ -45,15 +39,10 @@ MAN1=		dns-helper.1 gconfigger.1 gnome-bug.1 gnome-config.1 \
 		libart-config.1 loadshlib.1 new-object.1
 MAN5=		gnome-mime.5
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
 post-patch:
-	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/gnome-config.in ${WRKSRC}/libgnome/gnome-util.c
 
 # need to make launched gnome-terminals appear in utmp/wtmp
diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi
index 1debdb2d3658..dd39ef04d88e 100644
--- a/x11/gnomelibs/files/patch-bi
+++ b/x11/gnomelibs/files/patch-bi
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- libart_lgpl/Makefile.in.orig	Mon Jan 14 12:04:21 2002
-+++ libart_lgpl/Makefile.in	Mon Jan 14 12:05:37 2002
+--- libart_lgpl/Makefile.in.orig	Sun Jun 23 11:41:23 2002
++++ libart_lgpl/Makefile.in	Sun Jun 23 11:42:23 2002
 @@ -145,7 +145,7 @@
  	libart-features.c
  
@@ -12,12 +12,8 @@ $FreeBSD$
  libart_lgpl_la_LIBADD = -lm
  
  libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
-@@ -204,10 +204,10 @@
- testuta_DEPENDENCIES = $(DEPS)
- testuta_LDADD = $(LDADDS) -lm
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
+@@ -207,7 +207,7 @@
+ m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libart.m4
  
 -confexecdir = $(libdir)
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index fc35a1e0891d..28f7952f4aa6 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -538,14 +538,9 @@ share/locale/vi/LC_MESSAGES/gnome-libs.mo
 share/locale/wa/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
-@exec mkdir -p %D/share/gnome/games
 @dirrm share/gnome/type-convert
-@dirrm share/gnome/mime-info
-@dirrm share/gnome/idl
 @dirrm share/gnome/help/gnome-dev-info/C
 @dirrm share/gnome/help/gnome-dev-info
-@dirrm share/gnome/help
-@dirrm share/gnome/games
 @dirrm share/gnome/doc
 @dirrm share/doc/libart
 @dirrm share/doc/gnomelibs/zvt
@@ -559,7 +554,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gnome-1.0/libgnome
 @dirrm include/gnome-1.0/libart_lgpl
 @dirrm include/gnome-1.0/gtk-xmhtml
-@dirrm include/gnome-1.0
-@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/sound/events 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/etc/sound 2>/dev/null || /usr/bin/true