Clean up the Makefile some to remove the dead Mozilla bits.

2 files changed, 6 insertions, 44 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index c0460110849f..56e7ac2b46d8 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0.6
 PORTREVISION=	9
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/nautilus/1.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -18,62 +18,27 @@ 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
 
 .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so.0)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
-WITHOUT_MOZILLA=	"Doesn't work with Mozilla-0.9.9"
-
-.if !defined(WITHOUT_MOZILLA)
-.if !defined(WITH_FULL_MOZILLA)
-MOZILLA=	mozilla-embedded
-.else
-MOZILLA=	mozilla
-.endif
-BUILD_DEPENDS+=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-.endif
-
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomehack gnomeprefix gnomehier libpanel libghttp bonobo gnomevfs
+USE_GNOME=	gnomehack gnomeprefix gnomehier libpanel libghttp bonobo \
+		gnomevfs
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
-		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
+		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
 CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
-		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
-
-.if !defined(WITHOUT_MOZILLA)
-CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
-		 --with-mozilla-include-place=${X11BASE}/include/mozilla
-MOZILLA_LIBS=	"-L${X11BASE}/lib/${MOZILLA}"
-PLIST_SUB+=	MOZILLA:=""
-.else
-CONFIGURE_ARGS+= --disable-mozilla-component
-MOZILLA_LIBS=	""
-PLIST_SUB+=	MOZILLA:="@comment "
-.endif
+		--with-freetype2-include-place=${LOCALBASE}/include/freetype2 \
+		--disable-mozilla-component
 
 MAN1=		nautilus-xml-migrate.1
 
-.if !defined(WITHOUT_MOZILLA)
-pre-extract:
-.if !defined(WITH_FULL_MOZILLA)
-	@${ECHO_MSG}
-	@${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are"
-	@${ECHO_MSG} " planning to use both Mozilla and Nautilus you can instruct it to use mozilla by"
-	@${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"."
-	@${ECHO_MSG}
-.endif
-	@${ECHO_MSG} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA."
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index 4b5f6dd5ed54..5bfd76f9b9ed 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -13,7 +13,6 @@ bin/nautilus-hardware-view
 bin/nautilus-history-view
 bin/nautilus-image-view
 bin/nautilus-launcher-applet
-%%MOZILLA:%%bin/nautilus-mozilla-content-view
 bin/nautilus-music-view
 bin/nautilus-news
 bin/nautilus-notes
@@ -331,7 +330,6 @@ share/gnome/oaf/Nautilus_View_hardware.oaf
 share/gnome/oaf/Nautilus_View_help.oaf
 share/gnome/oaf/Nautilus_View_history.oaf
 share/gnome/oaf/Nautilus_View_image.oaf
-%%MOZILLA:%%share/gnome/oaf/Nautilus_View_mozilla.oaf
 share/gnome/oaf/Nautilus_View_music.oaf
 share/gnome/oaf/Nautilus_View_news.oaf
 share/gnome/oaf/Nautilus_View_notes.oaf
@@ -1059,7 +1057,6 @@ share/gnome/ui/nautilus-desktop-icon-view-ui.xml
 share/gnome/ui/nautilus-directory-view-ui.xml
 share/gnome/ui/nautilus-icon-view-ui.xml
 share/gnome/ui/nautilus-hyperbola-ui.xml
-%%MOZILLA:%%share/gnome/ui/nautilus-mozilla-ui.xml
 share/gnome/ui/nautilus-sample-content-view-ui.xml
 share/gnome/ui/nautilus-search-list-view-ui.xml
 share/gnome/ui/nautilus-shell-ui.xml