4 files changed, 10 insertions, 95 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index e2198716bb1e..e3195ed1b433 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/galeon/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $
+#    $MCom: ports/www/galeon/Makefile,v 1.7 2005/11/28 17:45:54 ahze Exp $
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.3.21
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -17,32 +16,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
 
-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=
-MOZ_BUILD=	firefox
-
-.if !defined(WITH_MOZILLA)
-MOZILLA=	firefox
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla"
-MOZILLA=	mozilla
-MOZ_BUILD=	mozilla
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
-MOZILLA=	mozilla-devel
-HEADERS_SUFX=	-devel
-MOZ_BUILD=	mozilla
-.else
-MOZILLA=	firefox
-HEADERS_SUFX=
-.endif
-.endif
-.endif
-
+USE_GECKO=	firefox mozilla seamonkey
 WRKSRC=		${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//}
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -53,16 +27,15 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--enable-nautilus-view=no \
-		--with-mozilla=${MOZ_BUILD}
+		--with-mozilla=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		galeon.1
 GCONF_SCHEMAS=	galeon.schemas
 
-FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
-
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
 .if ${OSVERSION} > 500000
 # Galeon does not build correctly in -CURRENT if -Werror is passed
@@ -74,44 +47,14 @@ NO_WERROR=	yes
 CONFIGURE_ARGS+=	--disable-werror
 .endif
 
-.if ${OSVERSION} < 500000
-.if ${MOZILLA}=="mozilla-devel"
-USE_GCC=	3.4
-.endif
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default the port 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       "
-	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} ""
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
-		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 	@${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \
 		${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
-
-post-configure:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%MOZILLA%%|${MOZILLA}|g ; \
-		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' < ${FILESDIR}/galeon \
-		> ${WRKDIR}/galeon
-
-post-install:
-	@${MV} -f ${PREFIX}/bin/galeon ${PREFIX}/bin/galeon-bin
-	${INSTALL_SCRIPT} ${WRKDIR}/galeon ${PREFIX}/bin
+	@${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${X11BASE}/lib/browser_plugins:${X11BASE}/lib/browser_linux_plugins|' \
+		${WRKSRC}/mozilla/mozilla-embed-shell.cpp
 
 .include <bsd.port.post.mk>
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index a03714e3d68c..f025626ead1c 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,3 +1,3 @@
-MD5 (galeon-1.3.21.tar.bz2) = 5106e037bb52bdb234b3fc09c1e0a3f3
-SHA256 (galeon-1.3.21.tar.bz2) = 5806b0684878799cfab99aaa5310bdc78aa13deeca9c345c92605161df9891c3
-SIZE (galeon-1.3.21.tar.bz2) = 4080353
+MD5 (galeon-2.0.0.tar.bz2) = e1f1e46d40c9e2345c1ea5e9bc788244
+SHA256 (galeon-2.0.0.tar.bz2) = fa8c9706408c94f620cd93c462696467f73d59e21c87a4fa65afe39d2408d7a4
+SIZE (galeon-2.0.0.tar.bz2) = 2966515
diff --git a/www/galeon/files/galeon b/www/galeon/files/galeon
deleted file mode 100644
index 4b824adf0df6..000000000000
--- a/www/galeon/files/galeon
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-dist_bin=`dirname $0`
-
-MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-
-if [ -z "$MOZ_PLUGIN_PATH" ]; then
-    MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-    export MOZ_PLUGIN_PATH
-fi
-
-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
-
-if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then
-    LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1
-    export LD_PRELOAD
-fi
-
-exec "%%PREFIX%%/bin/galeon-bin" "$@"
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index b416bf8dabb0..1d66d0cd4add 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -1,5 +1,4 @@
 bin/galeon
-bin/galeon-bin
 bin/galeon-config-tool
 etc/sound/events/galeon.soundlist
 libdata/bonobo/servers/GNOME_Galeon_Automation.server