summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.port.mk8
-rw-r--r--graphics/librsvg2/Makefile3
-rw-r--r--www/epiphany-extensions/Makefile3
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/galeon/Makefile3
-rw-r--r--www/mozilla/Makefile.common3
-rw-r--r--www/mozilla/bsd.gecko.mk (renamed from Mk/bsd.mozilla.mk)6
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile3
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile3
-rw-r--r--x11/yelp/Makefile3
10 files changed, 18 insertions, 20 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 414ce3e16..f227c8ce8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1355,10 +1355,6 @@ PERL= ${LOCALBASE}/bin/perl
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
-.if defined(WANT_GECKO) || defined(USE_GECKO)
-.include "${PORTSDIR}/Mk/bsd.mozilla.mk"
-.endif
-
.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER)
.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
.endif
@@ -1759,10 +1755,6 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
.include "${PORTSDIR}/Mk/bsd.gnome.mk"
.endif
-.if defined(WANT_GECKO) || defined(USE_GECKO)
-.include "${PORTSDIR}/Mk/bsd.mozilla.mk"
-.endif
-
.if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER)
.include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
.endif
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 7ea8fd9e8..d700cc7cb 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/librsvg2/Makefile,v 1.77 2005/11/24 03:12:18 ahze Exp $
+# $MCom: ports/graphics/librsvg2/Makefile,v 1.78 2005/11/26 04:56:55 ahze Exp $
#
PORTNAME= librsvg2
@@ -52,6 +52,7 @@ OPTIONS= MOZILLA_PLUGIN "Enable the SVG browser plug-in" no
.if defined(WITH_MOZILLA_PLUGIN)
USE_GECKO= firefox mozilla seamonkey thunderbird
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
CONFIGURE_ENV+= MOZILLA_CONFIG=no
CONFIGURE_ARGS+=--enable-mozilla-plugin=yes
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 73224a48b..d5b70c61c 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.57 2005/11/12 21:48:45 ahze Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.58 2005/11/24 03:00:51 ahze Exp $
#
PORTNAME= epiphany
@@ -40,6 +40,7 @@ WITH_OPENSP= yes
.endif
.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
.if defined(WITH_OPENSP) || exists(${LOCALBASE}/lib/libosp.so)
CONFIGURE_ARGS+= --enable-opensp=yes
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 1265904c7..d27a65036 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.88 2005/11/16 22:43:12 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.89 2005/11/24 03:00:50 ahze Exp $
#
PORTNAME= epiphany
@@ -42,6 +42,7 @@ PLIST_SUB+= EPHY_VERSION="${PORTVERSION:C/\.[0-9]+$//}"
MAN1= epiphany.1
.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
NO_WERROR= yes
# allow build with more warnings enabled
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index c79640934..8cd2ea289 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,7 +3,7 @@
# 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.5 2005/11/24 03:39:05 ahze Exp $
#
PORTNAME= galeon
@@ -36,6 +36,7 @@ MAN1= galeon.1
GCONF_SCHEMAS= galeon.schemas
.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
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 433bcc89f..6f8590903 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile.common,v 1.13 2005/11/23 04:54:58 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.14 2005/11/24 01:43:42 ahze Exp $
# Ports can use the following:
#
@@ -355,4 +355,3 @@ gecko-post-install:
fi
.endif
@-update-desktop-database
-
diff --git a/Mk/bsd.mozilla.mk b/www/mozilla/bsd.gecko.mk
index e672d45f4..c0f5fa018 100644
--- a/Mk/bsd.mozilla.mk
+++ b/www/mozilla/bsd.gecko.mk
@@ -2,11 +2,11 @@
# ex:ts=4
#
# $FreeBSD$
-# $MCom: ports/Mk/bsd.mozilla.mk,v 1.19 2005/11/24 06:56:21 ahze Exp $
+# $MCom: ports/Mk/bsd.mozilla.mk,v 1.20 2005/11/26 00:06:25 ahze Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
-.if defined(_POSTMKINCLUDED) && !defined(Mozilla_Pre_Include)
+#.if defined(_POSTMKINCLUDED) && !defined(Mozilla_Pre_Include)
# Please make sure all changes to this file are passed through the maintainer.
# Do not commit them yourself (unless of course you're the Port's Wraith ;).
@@ -109,5 +109,5 @@ _gecko-pre-everything::
@${ECHO_CMD} " ${gecko} "
.endfor
@${ECHO_CMD} ""
-.endif # end it all
+#.endif # end it all
# HERE THERE BE TACOS
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index b218a154e..0d4f05050 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.23 2005/11/12 02:38:27 ahze Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.24 2005/11/24 05:04:35 ahze Exp $
#
PORTNAME= gnome
@@ -48,6 +48,7 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras
.endif
.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
post-patch:
@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index b218a154e..0d4f05050 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.23 2005/11/12 02:38:27 ahze Exp $
+# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.24 2005/11/24 05:04:35 ahze Exp $
#
PORTNAME= gnome
@@ -48,6 +48,7 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras
.endif
.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
post-patch:
@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 18b41fa69..c6f9e2f38 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/yelp/Makefile,v 1.67 2005/11/24 00:00:39 ahze Exp $
+# $MCom: ports/x11/yelp/Makefile,v 1.68 2005/11/24 01:44:00 ahze Exp $
#
PORTNAME= yelp
@@ -37,6 +37,7 @@ OPTIONS= MAN "Enable man page support" off \
INFO "Enable GNU info support" off
.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
.if defined(WITH_MAN)
CONFIGURE_ARGS+=--enable-man
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 23:36:18 +0800