Index: www/gecko-sharp10/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gecko-sharp10/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- www/gecko-sharp10/Makefile	10 Nov 2005 04:28:25 -0000	1.10
+++ www/gecko-sharp10/Makefile	4 Dec 2005 17:56:45 -0000
@@ -15,32 +15,16 @@
 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>
Index: www/gecko-sharp20/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gecko-sharp20/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- www/gecko-sharp20/Makefile	12 Nov 2005 18:33:14 -0000	1.6
+++ www/gecko-sharp20/Makefile	4 Dec 2005 17:57:52 -0000
@@ -19,19 +19,9 @@
 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 @@
 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>
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/mcatalog/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	15 Nov 2005 06:48:28 -0000	1.9
+++ Makefile	4 Dec 2005 22:09:53 -0000
@@ -23,16 +23,7 @@
 		${X11BASE}/libdata/pkgconfig/evolution-sharp.pc:${PORTSDIR}/mail/evolution-sharp \
 		${X11BASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
 
-.if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-.else
-.if ${WITH_MOZILLA}=="firefox"
-MOZILLA=	firefox
-.else
-MOZILLA=	mozilla
-.endif
-.endif
-
+USE_GECKO=	mozilla firefox
 USE_GNOME=	gnomeprefix gnomehack gconf2 intlhack
 USE_GMAKE=	yes
 USE_X_PREFIX=   yes
@@ -43,14 +34,6 @@
 DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO
 GCONF_SCHEMAS=	mcatalog.schemas
 
-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|/pixmaps/mcatalog|/pixmaps|g' \
 		${WRKSRC}/images/Makefile.in
@@ -68,4 +51,6 @@
 .endif
 
 .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>