diff options
| author | pav <pav@FreeBSD.org> | 2005-06-11 02:28:12 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2005-06-11 02:28:12 +0800 |
| commit | 7449dcdab9e6e626d3b28fd2df45d584738c5e81 (patch) | |
| tree | 9e5f28a3d020f8c43143e302cad316fb0c2ea82d | |
| parent | 647826c2601827c98503b5e0506ccdacc9e4f633 (diff) | |
| download | freebsd-ports-gnome-7449dcdab9e6e626d3b28fd2df45d584738c5e81.tar.gz freebsd-ports-gnome-7449dcdab9e6e626d3b28fd2df45d584738c5e81.tar.zst freebsd-ports-gnome-7449dcdab9e6e626d3b28fd2df45d584738c5e81.zip | |
- Revert errourneously used DISTVERSION
- Fix damage caused by PORTEPOCH (',' sign broke sed scripts)
PR: ports/82122
Submitted by: Matthew Seaman <m.seaman@infracaninophile.co.uk> (maintainer)
Pointy hat: novel
| -rw-r--r-- | net/phpldapadmin/Makefile | 22 | ||||
| -rw-r--r-- | net/phpldapadmin098/Makefile | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index c9e9780bdfbf..dff8ebadd8c9 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= phpldapadmin -DISTVERSION= 0.9.6c +PORTVERSION= 0.9.6c PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -30,10 +30,10 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX} PLAUSR?= pldapadm -SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' \ - -e 's,%%PLAUSR%%,${PLAUSR},g' \ - -e 's,%%PLAGRP%%,${PLAGRP},g' +SED_SCRIPT= -e 's!%%PREFIX%%!${PREFIX}!g' \ + -e 's!%%PLADIR%%!${PLADIR}!g' \ + -e 's!%%PLAUSR%%!${PLAUSR}!g' \ + -e 's!%%PLAGRP%%!${PLAGRP}!g' .else @@ -66,14 +66,14 @@ post-patch: ${RM} -f ${PLIST} cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore | \ - ${SORT} | ${SED} "s,^\.,%%PLADIR%%," >${PLIST} ; \ + ${SORT} | ${SED} "s!^\.!%%PLADIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e "s,^\.$$,@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true," \ - -e "s,^\.,@dirrm %%PLADIR%%," >>${PLIST} - ${SED} -e 's,%%PKGNAME%%,${PKGNAME},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' ${MSG_SKEL} > ${PKGMESSAGE} + -e 's!^\.$$!@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true!' \ + -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} + ${SED} -e 's!%%PKGNAME%%!${PKGNAME}!g' \ + -e 's!%%PREFIX%%!${PREFIX}!g' \ + -e 's!%%PLADIR%%!${PLADIR}!g' ${MSG_SKEL} > ${PKGMESSAGE} .if defined(WITH_SUPHP) ${SED} ${SED_SCRIPT} ${PKGINST_SKEL} > ${PKGINSTALL} ${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL} diff --git a/net/phpldapadmin098/Makefile b/net/phpldapadmin098/Makefile index c9e9780bdfbf..dff8ebadd8c9 100644 --- a/net/phpldapadmin098/Makefile +++ b/net/phpldapadmin098/Makefile @@ -6,7 +6,7 @@ # PORTNAME= phpldapadmin -DISTVERSION= 0.9.6c +PORTVERSION= 0.9.6c PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -30,10 +30,10 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX} PLAUSR?= pldapadm -SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' \ - -e 's,%%PLAUSR%%,${PLAUSR},g' \ - -e 's,%%PLAGRP%%,${PLAGRP},g' +SED_SCRIPT= -e 's!%%PREFIX%%!${PREFIX}!g' \ + -e 's!%%PLADIR%%!${PLADIR}!g' \ + -e 's!%%PLAUSR%%!${PLAUSR}!g' \ + -e 's!%%PLAGRP%%!${PLAGRP}!g' .else @@ -66,14 +66,14 @@ post-patch: ${RM} -f ${PLIST} cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore | \ - ${SORT} | ${SED} "s,^\.,%%PLADIR%%," >${PLIST} ; \ + ${SORT} | ${SED} "s!^\.!%%PLADIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e "s,^\.$$,@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true," \ - -e "s,^\.,@dirrm %%PLADIR%%," >>${PLIST} - ${SED} -e 's,%%PKGNAME%%,${PKGNAME},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' ${MSG_SKEL} > ${PKGMESSAGE} + -e 's!^\.$$!@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true!' \ + -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} + ${SED} -e 's!%%PKGNAME%%!${PKGNAME}!g' \ + -e 's!%%PREFIX%%!${PREFIX}!g' \ + -e 's!%%PLADIR%%!${PLADIR}!g' ${MSG_SKEL} > ${PKGMESSAGE} .if defined(WITH_SUPHP) ${SED} ${SED_SCRIPT} ${PKGINST_SKEL} > ${PKGINSTALL} ${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL} |