- Fix pkg-plist after Mono 1.1.12.1 update

- Convert to USE_GECKO [1]

Submitted by:	mezz [1]

4 files changed, 13 insertions, 49 deletions

diff --git a/www/gecko-sharp10/Makefile b/www/gecko-sharp10/Makefile
index 1cd43adcc53d..6d6e5110414f 100644
--- a/www/gecko-sharp10/Makefile
+++ b/www/gecko-sharp10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://go-mono.com/archive/1.0.3/
 
@@ -15,32 +15,16 @@ MAINTAINER=	bsd-sharp-list@forge.novell.com
 COMMENT=	Mono bindings for embeding mozilla
 
 BUILD_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp10
-RUN_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp10 \
-		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-
-.if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-.else
-.if ${WITH_MOZILLA}=="firefox"
-MOZILLA=	firefox
-.else
-MOZILLA=	mozilla
-.endif
-.endif
+RUN_DEPENDS=	gapi-parser:${PORTSDIR}/x11-toolkits/gtk-sharp10
 
+USE_GECKO=	mozilla firefox
 USE_GNOME=	gnomehack gnometarget
 LATEST_LINK=	gecko-sharp10
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default ${PORTNAME} uses www/mozilla for html rendering, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  firefox       "
-	@${ECHO_MSG} ""
-
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include <bsd.port.post.mk>
diff --git a/www/gecko-sharp10/pkg-plist b/www/gecko-sharp10/pkg-plist
index 39294fc04a68..95559f68a4bf 100644
--- a/www/gecko-sharp10/pkg-plist
+++ b/www/gecko-sharp10/pkg-plist
@@ -3,8 +3,6 @@ lib/gecko-sharp/WebThumbnailer.exe
 lib/mono/gac/gecko-sharp/1.0.0.0__ccf7d78a55e9f021/gecko-sharp.dll
 lib/mono/gac/gecko-sharp/1.0.0.0__ccf7d78a55e9f021/gecko-sharp.dll.config
 lib/mono/gecko-sharp/gecko-sharp.dll
-lib/mono/gecko-sharp/gecko-sharp.dll.config
-lib/mono/gecko-sharp/gecko-sharp.dll.mdb
 libdata/pkgconfig/gecko-sharp.pc
 @dirrm lib/mono/gecko-sharp
 @dirrm lib/mono/gac/gecko-sharp/1.0.0.0__ccf7d78a55e9f021
diff --git a/www/gecko-sharp20/Makefile b/www/gecko-sharp20/Makefile
index 787b85b8514a..662d1ff71035 100644
--- a/www/gecko-sharp20/Makefile
+++ b/www/gecko-sharp20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.10 2005/10/23 20:56:06 tmclau02 Exp $
+#   $Id: Makefile,v 1.13 2005/12/04 23:26:32 tmclau02 Exp $
 #
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://go-mono.com/sources/gecko-sharp-2.0/
 DISTNAME=	gecko-sharp-2.0-${PORTVERSION}
@@ -19,19 +19,9 @@ COMMENT=	Mono bindings for embeding mozilla
 BUILD_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
 		monodoc:${PORTSDIR}/devel/mono-tools
 RUN_DEPENDS=	gapi2-parser:${PORTSDIR}/x11-toolkits/gtk-sharp20 \
-		monodoc:${PORTSDIR}/devel/mono-tools \
-		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-
-.if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-.else
-.if ${WITH_MOZILLA}=="firefox"
-MOZILLA=	firefox
-.else
-MOZILLA=	mozilla
-.endif
-.endif
+		monodoc:${PORTSDIR}/devel/mono-tools
 
+USE_GECKO=	mozilla firefox
 USE_GNOME=	gnometarget
 LATEST_LINK=	gecko-sharp20
 USE_REINPLACE=	yes
@@ -39,16 +29,10 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default ${PORTNAME} uses www/mozilla for html rendering, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "  firefox       "
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include <bsd.port.post.mk>
diff --git a/www/gecko-sharp20/pkg-plist b/www/gecko-sharp20/pkg-plist
index 53ed5c76a1f0..d2751f889a3c 100644
--- a/www/gecko-sharp20/pkg-plist
+++ b/www/gecko-sharp20/pkg-plist
@@ -1,8 +1,6 @@
 lib/mono/gac/gecko-sharp/2.0.0.0__ccf7d78a55e9f021/gecko-sharp.dll
 lib/mono/gac/gecko-sharp/2.0.0.0__ccf7d78a55e9f021/gecko-sharp.dll.config
 lib/mono/gecko-sharp-2.0/gecko-sharp.dll
-lib/mono/gecko-sharp-2.0/gecko-sharp.dll.config
-lib/mono/gecko-sharp-2.0/gecko-sharp.dll.mdb
 lib/monodoc/sources/gecko-sharp-docs.source
 lib/monodoc/sources/gecko-sharp-docs.tree
 lib/monodoc/sources/gecko-sharp-docs.zip