diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /www/mozilla/Makefile.common | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz | |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Diffstat (limited to 'www/mozilla/Makefile.common')
| -rw-r--r-- | www/mozilla/Makefile.common | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 9c9cce8..16b845c5 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -56,8 +56,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ nspr4:${PORTSDIR}/devel/nspr \ - nss3:${PORTSDIR}/security/nss \ - Xft.2:${PORTSDIR}/x11-fonts/libXft + nss3:${PORTSDIR}/security/nss MAINTAINER?= gnome@FreeBSD.org @@ -68,7 +67,8 @@ MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes USE_PERL5_BUILD=yes -USE_XLIB= yes +USE_XORG= printproto sm xt xi xext x11 xinerama \ + ice xproto MOZILLA_SUFX?= none WRKSRC?= ${WRKDIR}/mozilla @@ -141,8 +141,8 @@ MOZ_OPTIONS+= --enable-crypto \ --enable-xft \ --with-pthreads # Configure options for install -MOZ_OPTIONS+= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib +MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib .if !defined(MOZ_EXTENSIONS) MOZ_OPTIONS+= --enable-extensions=default .else @@ -223,8 +223,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ -e 's|@CFLAGS@|${CFLAGS}|g' \ -e 's|@LDFLAGS@|${LDFLAGS}|g' \ -e 's|@LIBS@|${LIBS}|g' \ - -e 's|@X11BASE@|${X11BASE}|g' \ - -e 's|@LOCALBASE@|${LOCALBASE}|g' \ + -e 's|@LOCALBASE@|${LOCALBASE}|g' \ -e 's|@FAKEDIR@|${FAKEDIR}|g' \ -e 's|@PERL@|${PERL5}|g' \ -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ @@ -233,8 +232,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ -e 's|%%CFLAGS%%|${CFLAGS}|g' \ -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ -e 's|%%LIBS%%|${LIBS}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ -e 's|%%PERL%%|${PERL5}|g' \ -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ @@ -292,7 +290,7 @@ gecko-post-patch: @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${WRKSRC}/config/autoconf.mk.in @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; s|/usr/X11R6|${X11BASE}|g' \ + s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @if [ -d ${WRKSRC}/directory/c-sdk ]; then \ @@ -303,7 +301,7 @@ gecko-post-patch: @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${X11BASE}|g' \ + s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh |
