2 files changed, 15 insertions, 46 deletions

diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index f358efa881bc..9b0777a3f7f9 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.21 2005/09/10 22:27:05 marcus Exp $
+#    $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.26 2005/11/29 16:07:33 marcus Exp $
 #
 
 PORTNAME=	gnome
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -19,7 +20,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of Python bindings for GNOME 2
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
 		gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
 		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
@@ -27,37 +27,15 @@ LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
 		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 \
 		gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
-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
-.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
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack libgnomeprintui libgtkhtml gnomepanel \
 		gtksourceview libwnck nautiluscdburner pygnome2
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-gtkmozembed=${MOZ_BUILD}
+CONFIGURE_ARGS=	--with-gtkmozembed=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -70,19 +48,9 @@ DOCSDIR=	${WRKSRC}/share/doc/py-gnome-extras
 .endif
 
 .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"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|${MOZ_BUILD}-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|mozilla-xpcom|${MOZ_BUILD}-xpcom${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
-		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
-		${WRKSRC}/configure
 	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
 	@${REINPLACE_CMD} -e 's|-DHAVE_GNOMEPRINT28||g' \
@@ -95,13 +63,4 @@ post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${EG_DST_DIR}
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default py-gnome-extras 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} ""
-
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure
new file mode 100644
index 000000000000..2151fdea25de
--- /dev/null
+++ b/x11-toolkits/py-gnome-extras/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Fri Nov 11 21:36:37 2005
++++ configure	Fri Nov 11 21:36:55 2005
+@@ -21713,6 +21713,7 @@
+ case $mozpackage in
+      firefox) mozpackage_required_version=1.0 ;;
+      mozilla) mozpackage_required_version=1.2b ;;
++     seamonkey) mozpackage_required_version=1.2b ;;
+      *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&5
+ echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla' or 'firefox'" >&2;}
+    { (exit 1); exit 1; }; }