From 7a4b49e132efc3b93d404fc82eeab2c0c624b61e Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 12 Feb 2004 09:06:57 +0000 Subject: * Add ${LOCALBASE} to the list of include and lib search paths so we can properly detect libiconv support [1] * Take care of a few more pthread substitutions * Bump PORTREVISION Reported by: Andrew Muhametshin --- www/firefox/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'www/firefox') diff --git a/www/firefox/Makefile b/www/firefox/Makefile index c62839d5aa0..2f66b52b179 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} @@ -75,9 +75,9 @@ CONFIGURE_ENV+= WITHOUT_XFT=yes LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .endif # !defined(WITHOUT_XFT) -CPPFLAGS+= -I${X11BASE}/include +CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib +LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib LIBS+= ${PTHREAD_LIBS} EXTRA_SCRIPTS= ${PORTNAME}.rb @@ -107,8 +107,10 @@ post-extract:: post-patch: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh - @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure + @${PERL} -pi -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/nsprpub/configure @${PERL} -pi -e 's|-pthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ -- cgit