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

2 files changed, 5 insertions, 36 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index a69578f38cc1..4d5e7a70f439 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
-RUN_DEPENDS=	${X11BASE}/share/gnome/ui/nautilus-galeon-view-ui.xml:${PORTSDIR}/www/galeon
+#RUN_DEPENDS=	${X11BASE}/share/gnome/ui/nautilus-galeon-view-ui.xml:${PORTSDIR}/www/galeon
 
 .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so.0)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
@@ -39,7 +39,8 @@ RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZIL
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomehier gnomecore
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
@@ -73,11 +74,8 @@ pre-extract:
 	@${ECHO_MSG} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA."
 .endif
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -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'
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 7c27654f0a88..4b5f6dd5ed54 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -1102,35 +1102,11 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/html
 @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29/common
 @dirrm share/gnome/sgml/docbook/xsl-stylesheets-1.29
-@dirrm share/gnome/sgml/docbook/gnome-customization-0.1
-@dirrm share/gnome/sgml/docbook
-@dirrm share/gnome/sgml
-@dirrm share/gnome/pixmaps/nautilus/throbber
-@dirrm share/gnome/pixmaps/nautilus/tahoe
-@dirrm share/gnome/pixmaps/nautilus/sierra
-@dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/gnome/throbber
-@dirrm share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/gnome
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/throbber
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/crux_teal/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/crux_teal
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
-@dirrm share/gnome/pixmaps/nautilus/crux_eggplant
-@dirrm share/gnome/pixmaps/nautilus
 @dirrm share/gnome/omf/nautilus
-@dirrm share/gnome/nautilus/services/text
-@dirrm share/gnome/nautilus/services
-@dirrm share/gnome/nautilus/patterns
 @dirrm share/gnome/nautilus/linksets
-@dirrm share/gnome/nautilus/emblems
 @dirrm share/gnome/nautilus/components/hyperbola/maps
 @dirrm share/gnome/nautilus/components/hyperbola
 @dirrm share/gnome/nautilus/components
-@dirrm share/gnome/nautilus
 @dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images
 @dirrm share/gnome/help/nautilus-user-manual/ko/figures
 @dirrm share/gnome/help/nautilus-user-manual/ko
@@ -1164,8 +1140,3 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/help/gnugpl
 @dirrm share/gnome/help/gnufdl/C
 @dirrm share/gnome/help/gnufdl
-@dirrm include/libnautilus
-@dirrm etc/X11/sysconfig
-@dirrm etc/X11/starthere
-@dirrm etc/X11/serverconfig
-@dirrm etc/X11