[pkgsrc/trunk]: pkgsrc/www/squid General improvements:

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f4ebe185d13
branches:  trunk
changeset: 395131:6f4ebe185d13
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Jul 07 15:01:12 2009 +0000

description:
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:

 www/squid/Makefile.squid |  20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diffs (38 lines):

diff -r ac61e9b61966 -r 6f4ebe185d13 www/squid/Makefile.squid
--- a/www/squid/Makefile.squid  Tue Jul 07 14:59:00 2009 +0000
+++ b/www/squid/Makefile.squid  Tue Jul 07 15:01:12 2009 +0000
@@ -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 @@
                        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 @@
        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}