[pkgsrc/trunk]: pkgsrc/sysutils/webmin We need to generate the PLIST or else ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db0b4c1f7698
branches:  trunk
changeset: 478440:db0b4c1f7698
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jul 23 19:47:21 2004 +0000

description:
We need to generate the PLIST or else binary packages won't be created
properly.

diffstat:

 sysutils/webmin/DEINSTALL        |  10 +++++-----
 sysutils/webmin/Makefile         |  27 ++++++++++++---------------
 sysutils/webmin/distinfo         |   4 ++--
 sysutils/webmin/patches/patch-aa |  11 ++++++++++-
 4 files changed, 29 insertions(+), 23 deletions(-)

diffs (100 lines):

diff -r 8f580ca42494 -r db0b4c1f7698 sysutils/webmin/DEINSTALL
--- a/sysutils/webmin/DEINSTALL Fri Jul 23 19:33:16 2004 +0000
+++ b/sysutils/webmin/DEINSTALL Fri Jul 23 19:47:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2004/07/23 19:28:32 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2004/07/23 19:47:21 jlam Exp $
 
 WEBMIN_DIR="@WEBMIN_DIR@"
 WEBMIN_ETCDIR="@WEBMIN_ETCDIR@"
@@ -7,11 +7,11 @@
 DEINSTALL)
        uninstall="${WEBMIN_ETCDIR}/uninstall.sh"
        if [ -x ${uninstall} ]; then
-               ${ECHO} "Removing ${PKGNAME}..."
                ${ECHO} "y" | ${uninstall}
-       else
-               ${ECHO} "Removing ${WEBMIN_DIR}..."
-               ${RM} -rf ${WEBMIN_DIR}
        fi
        ;;
+
+POST-DEINSTALL)
+       ${RM} -rf ${WEBMIN_DIR}
+       ;;
 esac
diff -r 8f580ca42494 -r db0b4c1f7698 sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Fri Jul 23 19:33:16 2004 +0000
+++ b/sysutils/webmin/Makefile  Fri Jul 23 19:47:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/23 19:28:32 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2004/07/23 19:47:21 jlam Exp $
 
 DISTNAME=      webmin-1.150-minimal
 PKGNAME=       ${DISTNAME:S/-minimal$//}
@@ -32,21 +32,18 @@
 USE_PKGINSTALL=                yes
 DEINSTALL_EXTRA_TMPL=  ${.CURDIR}/DEINSTALL
 RCD_SCRIPTS=           webmin
-OWN_DIRS=              ${WEBMIN_ETCDIR} ${WEBMIN_LOGDIR} ${WEBMIN_DIR}
+OWN_DIRS=              ${WEBMIN_LOGDIR}
 
-## Don't register any of the files in ${WEBMIN_DIR}.  We'll use Webmin's
-## own uninstall script to remove itself.
-##
-## # Dynamically generate the Webmin PLIST from the installed files.
-## WEBMIN_PLIST_FILES= \
-##     ( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} \! -type d -print )    \
-##     | ${SORT} -u
-## WEBMIN_PLIST_DIRS= \
-##     ( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} -type d -print )       \
-##     | ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"                      \
-##              -e "s,$$, 2>/dev/null || ${TRUE},"                     \
-##     | ${SORT} -ur
-## GENERATE_PLIST+=    ${WEBMIN_PLIST_FILES}; ${WEBMIN_PLIST_DIRS};
+# Dynamically generate the Webmin PLIST from the installed files.
+WEBMIN_PLIST_FILES= \
+       ( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} \! -type d -print )    \
+       | ${SORT} -u
+WEBMIN_PLIST_DIRS= \
+       ( cd ${PREFIX}; ${FIND} ${WEBMIN_SUBDIR} -type d -print )       \
+       | ${SED} -e "s,^,@unexec ${RMDIR} -p %D/,"                      \
+                -e "s,$$, 2>/dev/null || ${TRUE},"                     \
+       | ${SORT} -ur
+GENERATE_PLIST+=       ${WEBMIN_PLIST_FILES}; ${WEBMIN_PLIST_DIRS};
 
 do-configure:
        for file in ${WRKSRC}/setup.sh; do                              \
diff -r 8f580ca42494 -r db0b4c1f7698 sysutils/webmin/distinfo
--- a/sysutils/webmin/distinfo  Fri Jul 23 19:33:16 2004 +0000
+++ b/sysutils/webmin/distinfo  Fri Jul 23 19:47:21 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/23 19:28:32 jlam Exp $
+$NetBSD: distinfo,v 1.2 2004/07/23 19:47:21 jlam Exp $
 
 SHA1 (webmin-1.150-minimal.tar.gz) = 2bcc9ae2c9dddce70117d0061d5db3faed349019
 Size (webmin-1.150-minimal.tar.gz) = 955826 bytes
-SHA1 (patch-aa) = 55dbbd25f3d5e3eddcabe86809da6f780703b617
+SHA1 (patch-aa) = ea7b6b7d3ce63b273a3ad09127631da51df13946
diff -r 8f580ca42494 -r db0b4c1f7698 sysutils/webmin/patches/patch-aa
--- a/sysutils/webmin/patches/patch-aa  Fri Jul 23 19:33:16 2004 +0000
+++ b/sysutils/webmin/patches/patch-aa  Fri Jul 23 19:47:21 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/23 19:28:32 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/23 19:47:21 jlam Exp $
 
 --- setup.sh.orig      Wed Jun  2 01:33:09 2004
 +++ setup.sh
@@ -18,3 +18,12 @@
  if [ "$noperlpath" = "" ]; then
        echo "Inserting path to perl into scripts.."
        (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl -
+@@ -661,8 +663,6 @@ if [ "\$answer" = "y" ]; then
+       $config_dir/stop
+       echo "Running uninstall scripts .."
+       (cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")
+-      echo "Deleting $wadir .."
+-      rm -rf "$wadir"
+       echo "Deleting $config_dir .."
+       rm -rf "$config_dir"
+       echo "Done!"