diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-16 02:29:16 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-08-16 02:29:16 +0800 |
| commit | a987b758f9619c40b16effce5d02fe4b0f85f94a (patch) | |
| tree | b08a0a0bcdb3b0e975458697ba69210b249fedf4 /www | |
| parent | c31c6777e7927b3d70c1e5d618b2de583834fd13 (diff) | |
| download | marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar.gz marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar.bz2 marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar.lz marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar.xz marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.tar.zst marcuscom-ports-a987b758f9619c40b16effce5d02fe4b0f85f94a.zip | |
Get rid of some X11BASE and some X11BASE -> LOCALBASE.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9420 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla/Makefile.common | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 31c09bf6f..35c331b6b 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.47 2007/07/05 17:01:49 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.48 2007/07/30 20:44:28 mezz Exp $ # # This file contains some reusable components for mozilla ports. It's of @@ -142,8 +142,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 @@ -224,7 +224,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|@X11BASE@|${LOCALBASE}|g' \ -e 's|@LOCALBASE@|${LOCALBASE}|g' \ -e 's|@FAKEDIR@|${FAKEDIR}|g' \ -e 's|@PERL@|${PERL5}|g' \ @@ -234,7 +234,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|%%X11BASE%%|${LOCALBASE}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ -e 's|%%PERL%%|${PERL5}|g' \ @@ -288,7 +288,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 \ @@ -299,7 +299,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 |