diff options
| -rw-r--r-- | www/firefox/Makefile | 8 | ||||
| -rw-r--r-- | www/firefox10/Makefile | 8 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 11 |
3 files changed, 12 insertions, 15 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index d9a10095f..c93756982 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.16 2005/11/16 00:08:29 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.17 2005/11/17 07:00:00 marcus Exp $ # PORTNAME= firefox @@ -32,12 +32,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GCC= 3.4+ -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${FF} FIREFOX= ${MOZILLA} FF_SUFX= # -devel FF= ${FIREFOX}${FF_SUFX} FF_VER= 1.5 +MOZ_RPATH= ${FF} FIREFOX_ICON= ${FF}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${FF}/icons/default.xpm @@ -106,10 +106,6 @@ post-patch: ${WRKSRC}/${ii}/all.js .endfor -post-build: - @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${FF}\2|" \ - ${WRKSRC}/build/unix/*.pc - pre-install: @${RM} -rf ${FAKEDIR} ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index d9a10095f..c93756982 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,7 +3,7 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.16 2005/11/16 00:08:29 marcus Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.17 2005/11/17 07:00:00 marcus Exp $ # PORTNAME= firefox @@ -32,12 +32,12 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GCC= 3.4+ -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${FF} FIREFOX= ${MOZILLA} FF_SUFX= # -devel FF= ${FIREFOX}${FF_SUFX} FF_VER= 1.5 +MOZ_RPATH= ${FF} FIREFOX_ICON= ${FF}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${FF}/icons/default.xpm @@ -106,10 +106,6 @@ post-patch: ${WRKSRC}/${ii}/all.js .endfor -post-build: - @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${FF}\2|" \ - ${WRKSRC}/build/unix/*.pc - pre-install: @${RM} -rf ${FAKEDIR} ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 99e5a56ac..c93fabf85 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,5 +1,5 @@ # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.4 2005/11/14 04:12:09 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.5 2005/11/14 20:03:15 ahze Exp $ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ @@ -16,6 +16,7 @@ MAINTAINER?= gnome@FreeBSD.org MOZILLA?= ${PORTNAME} MOZILLA_VER?= ${PORTVERSION} +MOZ_RPATH?= ${MOZILLA} USE_GNOME+= gtk20 libidl desktopfileutils USE_ICONV= yes USE_PERL5_BUILD=yes @@ -61,7 +62,7 @@ PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib +LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} LIBS+= ${PTHREAD_LIBS} .if defined(WITH_SMB) @@ -112,7 +113,7 @@ MOZCONFIG_SED= ${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ -e 's|%%KRB5_HOME%%|${KRB5_HOME}|' \ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|' -pre-configure: +pre-configure: .if exists(${.CURDIR}/pkg-install.in) @${MOZCONFIG_SED} < ${.CURDIR}/pkg-install.in > ${PKGINSTALL} .endif @@ -141,3 +142,7 @@ pre-configure: ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi + +post-build: + @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \ + ${WRKSRC}/build/unix/*.pc |