diff options
| -rw-r--r-- | Mk/bsd.gecko.mk | 9 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 2 | ||||
| -rw-r--r-- | www/mozilla/bsd.gecko.mk | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index c78eccf1a..8c88bbc65 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -5,7 +5,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/Mk/bsd.gecko.mk,v 1.1 2008/04/03 16:59:09 ahze Exp $ # # 4 column tabs prevent hair loss and tooth decay! @@ -17,7 +17,7 @@ .if defined(USE_GECKO) && ${USE_GECKO}!="gecko" -.if defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) +.if !defined(Gecko_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 ;). Gecko_Include_MAINTAINER= gnome@FreeBSD.org @@ -258,7 +258,6 @@ PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude mozilla/dbm \ --exclude mozilla/gc/boehm JPI_LIST?=\ @@ -292,12 +291,14 @@ _${option}= ${TRUE} .endfor # Standard depends -_ALL_DEPENDS= cairo jpeg nspr nss png xft zip +_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip cairo_LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo +dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm + jpeg_LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 345837e12..57ef5ba1a 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,3 +1,3 @@ -.warning This file has now been moved to ${PORTSDIR}/Mk/bsd.gecko.mk please use USE_GECKO=gecko USE_GECKO=gecko .include "${PORTSDIR}/Mk/bsd.gecko.mk" +.warning This file has now been moved to ${PORTSDIR}/Mk/bsd.gecko.mk please use USE_GECKO=gecko diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index 2701b006d..2e793dc3e 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -1 +1,3 @@ -.warning This file has now been moved to ${PORTSDIR}/Mk/bsd.gecko.mk please update ${PORTNAME} +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.warning This file has now been moved to ${PORTSDIR}/Mk/bsd.gecko.mk please update ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} + |