summaryrefslogtreecommitdiffstats
path: root/sysutils/usermin
diff options
context:
space:
mode:
authorolgeni <olgeni@FreeBSD.org>2005-01-29 15:02:06 +0000
committerolgeni <olgeni@FreeBSD.org>2005-01-29 15:02:06 +0000
commit0ff22b5f15fa1789835b42a8adb7784709e0ae43 (patch)
tree80b33707acf3b90dd1fb1235a34d7e2f920724b2 /sysutils/usermin
parent985f72f1696dd5f6f95536b536593fdf1bfef80a (diff)
downloadFreeBSD-ports-0ff22b5f15fa1789835b42a8adb7784709e0ae43.zip
FreeBSD-ports-0ff22b5f15fa1789835b42a8adb7784709e0ae43.tar.gz
Merge code to support empty directories (from sysutils/webmin).
Diffstat (limited to 'sysutils/usermin')
-rw-r--r--sysutils/usermin/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index d0a65ba..db80894 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -48,10 +48,6 @@ post-patch:
| ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@"
@${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM}
@${FIND} ${WRKSRC} -name "*.bak" -print | ${XARGS} ${RM}
-# we may have 2 levels of empty directories which cause the plist generation
-# system to fail
- @${FIND} ${WRKSRC} -type d -empty -print | ${XARGS} ${RMDIR}
- @${FIND} ${WRKSRC} -type d -empty -print | ${XARGS} ${RMDIR}
do-install:
@${MKDIR} ${PREFIX}/lib/usermin
@@ -65,6 +61,9 @@ do-install:
post-install:
@cd ${WRKSRC} ; ${FIND} * -type f -o -type l | ${SORT} | ${AWK} \
'{ print "lib/usermin/" $$1 }' > ${WRKDIR}/PLIST.lib-usermin
+ @cd ${WRKSRC} ; ${FIND} * -type d -empty | ${SORT} -r | ${AWK} \
+ '{ print "lib/usermin/" $$1 }' | ${SED} -e 's#^#@exec mkdir -p %D/#g' \
+ >> ${WRKDIR}/PLIST.lib-usermin
@cd ${WRKSRC} ; ${FIND} * -type d | ${SORT} -r | ${AWK} \
'{ print "lib/usermin/" $$1 }' | ${SED} -e 's/^/@dirrm /g' \
>> ${WRKDIR}/PLIST.lib-usermin
OpenPOWER on IntegriCloud