- 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
This commit is contained in:
Pav Lucistnik 2005-06-10 18:28:12 +00:00
parent 7c99c2d57b
commit dc164a5399
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=137211
2 changed files with 22 additions and 22 deletions

View file

@ -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}

View file

@ -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}