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

8 files changed, 52 insertions, 44 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index d22d8ded7998..7452cec1b423 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -32,16 +32,17 @@ WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 gnomehier
 WANT_GNOME=	yes
 AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 MAKEFILE=	GNUmakefile
-FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
-		    's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
-		     s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
+FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+		    's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		     s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_GNOME
@@ -51,9 +52,12 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf
+
+.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!=""
+USE_GNOME+=	gnomeprint gal gnomevfs
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gnome
 .endif
 
 post-patch:
@@ -68,11 +72,9 @@ pre-configure:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.if defined(HAVE_GNOME)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/AbiWord/pkg-plist b/editors/AbiWord/pkg-plist
index 0d6fc9c22a39..5be4b8a8019e 100644
--- a/editors/AbiWord/pkg-plist
+++ b/editors/AbiWord/pkg-plist
@@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
 %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm
 share/AbiSuite/templates/normal.awt
-%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
-%%GNOME:%%share/gnome/pixmaps/abiword_48.png
+share/gnome/apps/Applications/abiword.desktop
+share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index d22d8ded7998..7452cec1b423 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -32,16 +32,17 @@ WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 gnomehier
 WANT_GNOME=	yes
 AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 MAKEFILE=	GNUmakefile
-FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
-		    's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
-		     s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
+FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+		    's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		     s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_GNOME
@@ -51,9 +52,12 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf
+
+.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!=""
+USE_GNOME+=	gnomeprint gal gnomevfs
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gnome
 .endif
 
 post-patch:
@@ -68,11 +72,9 @@ pre-configure:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.if defined(HAVE_GNOME)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 0d6fc9c22a39..5be4b8a8019e 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
 %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm
 share/AbiSuite/templates/normal.awt
-%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
-%%GNOME:%%share/gnome/pixmaps/abiword_48.png
+share/gnome/apps/Applications/abiword.desktop
+share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index d22d8ded7998..7452cec1b423 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -32,16 +32,17 @@ WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 gnomehier
 WANT_GNOME=	yes
 AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 MAKEFILE=	GNUmakefile
-FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
-		    's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
-		     s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
+FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+		    's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		     s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_GNOME
@@ -51,9 +52,12 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf
+
+.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!=""
+USE_GNOME+=	gnomeprint gal gnomevfs
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gnome
 .endif
 
 post-patch:
@@ -68,11 +72,9 @@ pre-configure:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.if defined(HAVE_GNOME)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 0d6fc9c22a39..5be4b8a8019e 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
 %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm
 share/AbiSuite/templates/normal.awt
-%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
-%%GNOME:%%share/gnome/pixmaps/abiword_48.png
+share/gnome/apps/Applications/abiword.desktop
+share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index d22d8ded7998..7452cec1b423 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -32,16 +32,17 @@ WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 USE_X_PREFIX=	yes
 USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
+USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 gnomehier
 WANT_GNOME=	yes
 AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 MAKEFILE=	GNUmakefile
-FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
-		    's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
-		     s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
+FIXME=		find ${WRKSRC} -name GNUmakefile.in | xargs ${REINPLACE_CMD} -e \
+		    's|[(]libdir[)]/@PACKAGE@|(datadir)/@PACKAGE@|g ; \
+		     s|@DEFS@|-I${WRKSRC}/../libiconv/include @DEFS@|g' && ${TRUE}
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_GNOME
@@ -51,9 +52,12 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
+# bonobox bonobox_print gnomeui gal print vfs gdk_pixbuf
+
+.if ${HAVE_GNOME:Mgnomeprint}!="" && ${HAVE_GNOME:Mgal}!="" && ${HAVE_GNOME:Mgnomevfs}!=""
+USE_GNOME+=	gnomeprint gal gnomevfs
 CONFIGURE_ARGS+=--enable-gnome
+PKGNAMESUFFIX=	-gnome
 .endif
 
 post-patch:
@@ -68,11 +72,9 @@ pre-configure:
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-.if defined(HAVE_GNOME)
 	@${INSTALL_DATA} ${WRKSRC}/src/pkg/linux/rpm/data/abiword.desktop \
 		${PREFIX}/share/gnome/apps/Applications/abiword.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite/icons/abiword_48.png \
 		${PREFIX}/share/gnome/pixmaps/abiword_48.png
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 0d6fc9c22a39..5be4b8a8019e 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -300,8 +300,8 @@ share/AbiSuite/icons/abiword_48.tif
 share/AbiSuite/icons/abiword_48.xpm
 %%GNOME:%%share/AbiSuite/icons/abiword_logo.xpm
 share/AbiSuite/templates/normal.awt
-%%GNOME:%%share/gnome/apps/Applications/abiword.desktop
-%%GNOME:%%share/gnome/pixmaps/abiword_48.png
+share/gnome/apps/Applications/abiword.desktop
+share/gnome/pixmaps/abiword_48.png
 @dirrm share/AbiSuite/templates
 @dirrm share/AbiSuite/icons
 @dirrm share/AbiSuite/fonts