diff options
| author | tron <tron@pkgsrc.org> | 2009-07-07 15:01:12 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-07-07 15:01:12 +0000 |
| commit | 4da45fb02ccb60edf58615ab5b434dea23dfa053 (patch) | |
| tree | 36b023fd3cfa875cbcf4029ac7e609ede2548b3a /www/squid | |
| parent | a4126ef68727b611fdc60a1295cdad3d94327d0e (diff) | |
| download | pkgsrc-4da45fb02ccb60edf58615ab5b434dea23dfa053.tar.gz | |
General improvements:
1.) Allow individual "squid*" packages to register an extra target that
is run before the common "post-install" target.
2.) Use a much simpler logic to figure out what files get installed into
"share/squid/errors" and "share/squid/icons".
Tested with the "squid27" and the "squid31" package.
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile.squid | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/www/squid/Makefile.squid b/www/squid/Makefile.squid index 944d53698b0..7238663fb89 100644 --- a/www/squid/Makefile.squid +++ b/www/squid/Makefile.squid @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.squid,v 1.10 2009/07/01 02:17:11 taca Exp $ +# $NetBSD: Makefile.squid,v 1.11 2009/07/07 15:01:12 tron Exp $ # # used by www/squid26/Makefile # used by www/squid27/Makefile @@ -65,7 +65,9 @@ INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin \ share/squid share/squid/errors share/squid/icons \ ${DOCDIR} ${EGDIR} -post-install: +POST_INSTALL_EXTRA?= + +post-install: ${POST_INSTALL_EXTRA} for f in ${EGFILES}; do \ ${INSTALL_DATA} ${WRKSRC}/$$f \ ${DESTDIR}${PREFIX}/${EGDIR}/`basename $$f .default`; \ @@ -80,14 +82,6 @@ post-install: done ${CHMOD} -w ${PREFIX}/libexec/pinger ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - ( \ - cd ${WRKSRC}/errors; \ - for i in *; do \ - ${TEST} -d $$i && \ - (${LS} $$i/ERR_* | \ - ${SED} -e 's@^@share/squid/errors/@'); \ - done; \ - cd ${WRKSRC}/icons; \ - ${LS} anthony-*.gif | \ - ${SED} -e 's@^@share/squid/icons/@'; \ - ) >>${PLIST_SRC} + (${FIND} ${PREFIX}/share/squid/errors -type f -print; \ + ${FIND} ${PREFIX}/share/squid/icons -type f -print) | \ + ${SED} -e 's#^${PREFIX}/##' | ${SORT} >>${PLIST_SRC} |