diff options
| author | marcus <marcus@FreeBSD.org> | 2004-10-21 11:35:25 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-10-21 11:35:25 +0800 |
| commit | 8859c750b4daac77a3ed78b6ddf52d6d1d1c85c7 (patch) | |
| tree | 917b8131953f28ddc1b87cda694c39e61f74f138 | |
| parent | 1ec2588cae215ac32844ee8a23ef53c1781dbf90 (diff) | |
| download | freebsd-ports-gnome-8859c750b4daac77a3ed78b6ddf52d6d1d1c85c7.tar.gz freebsd-ports-gnome-8859c750b4daac77a3ed78b6ddf52d6d1d1c85c7.tar.zst freebsd-ports-gnome-8859c750b4daac77a3ed78b6ddf52d6d1d1c85c7.zip | |
Don't add -gtk1 twice to the pkg-config files.
Spotted by: Michael Johnson <ahze@ahze.net>
| -rw-r--r-- | www/mozilla-gtk1/Makefile | 2 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/www/mozilla-gtk1/Makefile b/www/mozilla-gtk1/Makefile index 3c793c804679..af7707285b4f 100644 --- a/www/mozilla-gtk1/Makefile +++ b/www/mozilla-gtk1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mozilla -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 0 CATEGORIES= www diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 1f940cd1208e..770de69f7c11 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -250,8 +250,8 @@ post-patch: @${REINPLACE_CMD} -E -e 's|libfreetype\.so\.[0-9]+|${FREETYPE_LIB}|g' \ ${WRKSRC}/modules/libpref/src/init/all.js @for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \ - s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \ + ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \ + s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \ done @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' \ @@ -297,7 +297,7 @@ pre-install: ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ + ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \ done cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ @@ -335,7 +335,7 @@ do-install: ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ ${WRKSRC}/build/unix/$${pcfile}.pc; \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ + ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \ done -${RM} -fr ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/include/${MOZILLA} |