diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-10-21 22:29:56 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-10-21 22:29:56 +0000 |
| commit | 975dcd0e214a5958e39939ba27730d3cdf1fd2b7 (patch) | |
| tree | c1bb2aa764c3a87282d78940cb0d8a6c5e7c9078 /sysutils/webmin | |
| parent | - Add knob for GHC, prefer lang/ghc6 (diff) | |
Fix a plist generation bug which included custom modules in the
file list, and then removed them at pkg_delete time.
Notes
Notes:
svn path=/head/; revision=91849
Diffstat (limited to 'sysutils/webmin')
| -rw-r--r-- | sysutils/webmin/Makefile | 20 | ||||
| -rw-r--r-- | sysutils/webmin/pkg-plist | 1 |
2 files changed, 8 insertions, 13 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 425bc99ac617..67c1466dc5e7 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -66,27 +66,21 @@ post-patch: usermin/config @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file} .endfor + @${FIND} ${WRKSRC} -name "*.orig" -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/webmin @${CP} -r ${WRKSRC}/* ${PREFIX}/lib/webmin - @cd ${PREFIX}/lib/webmin && ${FIND} . -name "*.orig" -print \ - | ${XARGS} ${RM} -# we may have 2 levels of empty directories which cause the plist generation -# system to fail - @cd ${PREFIX}/lib/webmin && ${FIND} . -type d -empty -print \ - | ${XARGS} ${RMDIR} - @cd ${PREFIX}/lib/webmin && ${FIND} . -type d -empty -print \ - | ${XARGS} ${RMDIR} @${CP} ${WRKDIR}/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh-dist @${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh-dist post-install: - @cd ${PREFIX} ; ${FIND} lib/webmin -type f -o -type l | sort \ - > ${WRKDIR}/PLIST.lib-webmin - @cd ${PREFIX} ; ${FIND} lib/webmin -type d | sort -r \ - | ${SED} -e 's/^/@dirrm /g' \ - >> ${WRKDIR}/PLIST.lib-webmin + @cd ${WRKSRC} ; ${FIND} * -type f -o -type l | sort | ${AWK} '{ print "lib/webmin/" $$1 }' > ${WRKDIR}/PLIST.lib-webmin + @cd ${WRKSRC} ; ${FIND} * -type d | sort -r | ${AWK} '{ print "lib/webmin/" $$1 }' | ${SED} -e 's/^/@dirrm /g' >> ${WRKDIR}/PLIST.lib-webmin @${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script @${ECHO_CMD} "/Insert PLIST.lib-webmin" >> ${WRKDIR}/ex.script diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index d0b63976f64c..49d7126eff34 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -4,6 +4,7 @@ etc/rc.d/webmin.sh-dist @comment Insert PLIST.lib-webmin here @comment -=[ begin PLIST.lib-webmin ]=- @comment -=[ end PLIST.lib-webmin ]=- +@dirrm lib/webmin @comment upgrade configuration if etc/webmin exists @exec [ ! -d %D/etc/webmin ] || echo | nostart=Y %D/lib/webmin/setup.sh @comment run interactive setup if not in BATCH mode and no configuration exists |