diff options
Diffstat (limited to 'www/mozilla/Makefile.common')
| -rw-r--r-- | www/mozilla/Makefile.common | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 9ad791583..ba29d9e22 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.36 2006/12/09 15:32:06 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.37 2006/12/09 16:33:11 ahze Exp $ # This file contains some reusable components for mozilla ports. It's of # use primarily to apps from the mozilla project itself (such as Firefox, @@ -87,19 +87,16 @@ GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in MOZCONFIG?= ${WRKSRC}/.mozconfig MOZILLA_PLIST_DIRS?= bin include lib share/idl - +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${.CURDIR}/../../www/mozilla +MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude .cvsignore \ - --exclude makefile.win \ - --exclude MANIFEST \ --exclude */nsprpub/* \ --exclude mozilla/modules/libimg/png \ --exclude mozilla/jpeg \ @@ -224,13 +221,6 @@ MOZ_OPTIONS+= --enable-logging MOZ_OPTIONS+= --disable-logging .endif -.if exists(${LOCALBASE}/include/freetype/freetype.h) -BROKEN= "You must upgrade your freetype port to 1.3.1_2 or higher before \ - installing ${PORTNAME}. If you have 1.3.1_2 installed, please remove \ - ${LOCALBASE}/include/freetype, then build ${PORTNAME}" -.endif - -# Makefile.common defines MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ -e 's|@CFLAGS@|${CFLAGS}|g' \ -e 's|@LDFLAGS@|${LDFLAGS}|g' \ |