pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/webmin Cleaned up complicated code for removi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b997eb5dc827
branches:  trunk
changeset: 355055:b997eb5dc827
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 20 01:11:40 2016 +0000

description:
Cleaned up complicated code for removing unnecessary modules and themes.

diffstat:

 sysutils/webmin/Makefile |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r df2cc7b954cb -r b997eb5dc827 sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Sun Nov 20 01:10:47 2016 +0000
+++ b/sysutils/webmin/Makefile  Sun Nov 20 01:11:40 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/07/09 06:39:03 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2016/11/20 01:11:40 rillig Exp $
 
 .include "version.mk"
 
@@ -75,15 +75,15 @@
 
 pre-configure:
        cd ${WRKSRC} &&                                                 \
-       ptn="@"`${ECHO} ${WEBMIN_MINIMAL_MODULES}|sed -e 's/ /@/g'`"@" &&       \
-       for m in `${ECHO} */module.info | sed -e 's/\/module.info//g'`; do \
-               case $${ptn} in                                         \
-               *@$${m}@*) ;;                                           \
-               *)      rm -rf $${m} ;;                                 \
+       for m in */module.info; do                                      \
+               moduledir=$${m%/module.info};                           \
+               case $${moduledir} in                                   \
+               ${WEBMIN_MINIMAL_MODULES:ts|}) ;;                       \
+               *)      rm -rf $${moduledir} ;;                         \
                esac;                                                   \
        done &&                                                         \
-       for t in `${ECHO} */theme.info | sed -e 's/\/theme.info//g'`; do\
-               rm -rf $${t};                                           \
+       for t in */theme.info; do                                       \
+               rm -rf $${t%/theme.info};                               \
        done &&                                                         \
        touch ${WRKSRC}/minimal-install
 



Home | Main Index | Thread Index | Old Index