- Convert to using USE_GECKO

- No longer install the startup script.

2 files changed, 5 insertions, 65 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index cab75a63fd37..7b7b4b3126a4 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.63 2005/10/09 00:42:45 marcus Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.70 2005/11/28 07:30:27 ahze Exp $
 #
 
 PORTNAME=	yelp
 PORTVERSION=	2.12.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -16,28 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-
-MOZILLA=	firefox
-HEADERS_SUFX=
-
-.if !defined(WITH_MOZILLA)
-MOZILLA=	firefox
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla"
-MOZILLA=	mozilla
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
-MOZILLA=	mozilla-devel
-HEADERS_SUFX=	-devel
-.else
-MOZILLA=	firefox
-HEADERS_SUFX=
-.endif
-.endif
-.endif
+USE_GECKO=	firefox mozilla seamonkey thunderbird
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -48,7 +28,7 @@ USE_AUTOTOOLS=	libtool:15
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-mozilla=${MOZILLA}
+CONFIGURE_ARGS=	--with-mozilla=${GECKO}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	yelp.schemas
@@ -57,12 +37,7 @@ OPTIONS=	MAN "Enable man page support" off \
 		INFO "Enable GNU info support" off
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-.if ${MOZILLA}=="mozilla-devel"
-USE_GCC=	3.4
-.endif
-.endif
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
 .if defined(WITH_MAN)
 CONFIGURE_ARGS+=--enable-man
@@ -72,37 +47,4 @@ CONFIGURE_ARGS+=--enable-man
 CONFIGURE_ARGS+=--enable-info
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default yelp uses www/firefox for html rendering, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} "  mozilla"
-	@${ECHO_MSG} ""
-
-post-patch:
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel"
-	@${REINPLACE_CMD} -e 's|xmozilla|xmozilla-devel|g; \
-		s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
-		s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
-		${WRKSRC}/configure
-.endif
-
-post-configure:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/yelp.sh \
-		> ${WRKDIR}/yelp.sh
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/gnome-help.sh \
-		> ${WRKDIR}/gnome-help.sh
-
-post-install:
-	${MV} -f ${PREFIX}/bin/yelp ${PREFIX}/bin/yelp-bin
-	${MV} -f ${PREFIX}/bin/gnome-help ${PREFIX}/bin/gnome-help-bin
-	${INSTALL_SCRIPT} ${WRKDIR}/yelp.sh ${PREFIX}/bin/yelp
-	${INSTALL_SCRIPT} ${WRKDIR}/gnome-help.sh ${PREFIX}/bin/gnome-help
-
 .include <bsd.port.post.mk>
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index b51798ea50fa..df1c3025c35e 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,7 +1,5 @@
 bin/gnome-help
-bin/gnome-help-bin
 bin/yelp
-bin/yelp-bin
 libdata/bonobo/servers/GNOME_Yelp.server
 share/gnome/applications/yelp.desktop
 share/gnome/yelp/default.css