diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-23 09:30:15 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-23 09:30:15 +0800 |
| commit | 39896efd63dcdeb32097d0a73c609eb3d160ec11 (patch) | |
| tree | ea518832bbf66e166e5a764b0371b34164f89904 /www | |
| parent | f92a192fcded33a6a140c6220036eb03ba88dac3 (diff) | |
| download | marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar.gz marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar.bz2 marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar.lz marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar.xz marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.tar.zst marcuscom-ports-39896efd63dcdeb32097d0a73c609eb3d160ec11.zip | |
- Back out that last commit, it didn't work as I thought I tested it...
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5187 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
| -rw-r--r-- | www/mozilla/Makefile.common | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index dc95ffb3b..7f02746a5 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.9 2005/11/23 00:43:14 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.10 2005/11/23 01:06:14 ahze Exp $ # Ports can use the following: # @@ -91,8 +91,7 @@ JPI_LIST?=\ PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin -CPPFLAGS+= -I${WRKSRC}/directory/c-sdk/ldap/include \ - -I${X11BASE}/include -I${LOCALBASE}/include +CPPFLAGS+= -I${X11BASE}/include CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} LIBS+= ${PTHREAD_LIBS} @@ -230,6 +229,10 @@ gecko-post-patch: s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ ${WRKSRC}/build/unix/mozilla-config.in + @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ + ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${WRKSRC}/config/autoconf.mk.in @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ |