From ead59374f3f5f18bc3c8073db0b741acd45acb71 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Sun, 14 Nov 2004 16:46:29 +0000 Subject: Fix pkg-config files by re-adding REINPLACE_CMD line Pointed out by: Pascal Hofstee Approved by: marcus (co mentor) --- www/firefox-devel/Makefile | 3 ++- www/firefox-esr/Makefile | 3 ++- www/firefox/Makefile | 3 ++- www/firefox10/Makefile | 3 ++- www/firefox15/Makefile | 3 ++- www/firefox3-devel/Makefile | 3 ++- www/firefox35/Makefile | 3 ++- www/firefox36/Makefile | 3 ++- www/flock/Makefile | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) (limited to 'www') diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done diff --git a/www/flock/Makefile b/www/flock/Makefile index 0bc08eb8e0a7..906070eefe9a 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -178,7 +178,8 @@ pre-install: ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g' \ + ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ + s|${FAKEDIR}|${PREFIX}|' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done -- cgit v1.2.3