diff options
author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-01-22 18:35:43 +0000 |
---|---|---|
committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-01-22 18:35:43 +0000 |
commit | 96ede01302cbc2d90a697b0696a8c592082cd96d (patch) | |
tree | ee32456bd61c4acc6e1d7ba8b53ae9b4ffe33185 /net | |
parent | - Update to 4.85 (diff) |
- Utilize @dirrmtry in auto generated PLIST
PR: ports/92161
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=154174
Diffstat (limited to 'net')
-rw-r--r-- | net/phpldapadmin/Makefile | 7 | ||||
-rw-r--r-- | net/phpldapadmin098/Makefile | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index aa9c794c5e6f..546ff0e6f4a7 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -51,9 +51,6 @@ SUB_FILES+= pkg-message PLIST= ${WRKDIR}/plist PLIST_SUB+= PLADIR=${PLADIR} PLAGRP=${PLAGRP} -sedSTART= @unexec ${RMDIR} %D/%%PLADIR%% -sedEND= 2>/dev/null || true - .SILENT: pre-everything:: @@ -70,8 +67,8 @@ post-patch: ${SORT} | ${SED} -e "s!^\.!%%PLADIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e 's!^\./${CFGDIR}$$!${sedSTART}/${CFGDIR} ${sedEND}!' \ - -e 's!^\.$$!${sedSTART} ${sedEND}!' \ + -e 's!^\./${CFGDIR}$$!@dirrmtry %%PLADIR%%/${CFGDIR}!' \ + -e 's!^\.$$!@dirrmtry %%PLADIR%%!' \ -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} pre-install: diff --git a/net/phpldapadmin098/Makefile b/net/phpldapadmin098/Makefile index aa9c794c5e6f..546ff0e6f4a7 100644 --- a/net/phpldapadmin098/Makefile +++ b/net/phpldapadmin098/Makefile @@ -51,9 +51,6 @@ SUB_FILES+= pkg-message PLIST= ${WRKDIR}/plist PLIST_SUB+= PLADIR=${PLADIR} PLAGRP=${PLAGRP} -sedSTART= @unexec ${RMDIR} %D/%%PLADIR%% -sedEND= 2>/dev/null || true - .SILENT: pre-everything:: @@ -70,8 +67,8 @@ post-patch: ${SORT} | ${SED} -e "s!^\.!%%PLADIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e 's!^\./${CFGDIR}$$!${sedSTART}/${CFGDIR} ${sedEND}!' \ - -e 's!^\.$$!${sedSTART} ${sedEND}!' \ + -e 's!^\./${CFGDIR}$$!@dirrmtry %%PLADIR%%/${CFGDIR}!' \ + -e 's!^\.$$!@dirrmtry %%PLADIR%%!' \ -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} pre-install: |