- Use new USE_GECKO for testing to see if we really want to use bsd.mozilla.mk

- Don't install the yelp scripts to LD_PRELOAD mozilla libs since it isn't
  needed now.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5199 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 6 insertions, 93 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 21099e004..132934bcc 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -2,13 +2,13 @@
 # Date created:				18 May 2002
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
-# $FreeBSD: ports/x11/yelp/Makefile,v 1.40 2005/11/05 04:53:41 marcus Exp $
-#   $MCom: ports/x11/yelp/Makefile,v 1.63 2005/10/09 00:42:45 marcus Exp $
+# $FreeBSD$
+#   $MCom: ports/x11/yelp/Makefile,v 1.65 2005/11/11 23:00:24 ahze Exp $
 #
 
 PORTNAME=	yelp
 PORTVERSION=	2.12.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -17,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}=="seamonkey"
-MOZILLA=	seamonkey
-HEADERS_SUFX=
-.else
-MOZILLA=	firefox
-HEADERS_SUFX=
-.endif
-.endif
-.endif
+USE_GECKO=	firefox mozilla seamonkey
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -49,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
@@ -59,12 +38,6 @@ OPTIONS=	MAN "Enable man page support" off \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-.if ${MOZILLA}=="mozilla-devel"
-USE_GCC=	3.4
-.endif
-.endif
-
 .if defined(WITH_MAN)
 CONFIGURE_ARGS+=--enable-man
 .endif
@@ -76,34 +49,10 @@ CONFIGURE_ARGS+=--enable-info
 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} " change this by defining WITH_GECKO to one of the following values:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  mozilla "
 	@${ECHO_MSG} "  seamonkey "
 	@${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/files/gnome-help.sh b/x11/yelp/files/gnome-help.sh
deleted file mode 100644
index 0951d0096..000000000
--- a/x11/yelp/files/gnome-help.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-dist_bin=`dirname $0`
-
-MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-
-if [ -n "$LD_LIBRARY_PATH" ]; then
-  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZILLA_HOME
-fi
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
-
-exec "%%PREFIX%%/bin/gnome-help-bin" "$@"
diff --git a/x11/yelp/files/yelp.sh b/x11/yelp/files/yelp.sh
deleted file mode 100644
index 52a6643b7..000000000
--- a/x11/yelp/files/yelp.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-dist_bin=`dirname $0`
-
-MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-
-if [ -n "$LD_LIBRARY_PATH" ]; then
-  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
-else
-  LD_LIBRARY_PATH=$MOZILLA_HOME
-fi
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
-
-exec "%%PREFIX%%/bin/yelp-bin" "$@"
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index b51798ea5..df1c3025c 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