Date: Fri, 10 Jun 2005 16:03:55 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82122: [maintainer] net/phpldapadmin fix PORTEPOCH breakage Message-ID: <200506101503.j5AF3tka053307@lack-of-gravitas.thebunker.net> Resent-Message-ID: <200506101510.j5AFAFJd035651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82122 >Category: ports >Synopsis: [maintainer] net/phpldapadmin fix PORTEPOCH breakage >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jun 10 15:10:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Matthew Seaman >Release: FreeBSD 5.4-STABLE i386 >Organization: Infracaninophile >Environment: System: FreeBSD lack-of-gravitas.thebunker.net 5.4-STABLE FreeBSD 5.4-STABLE #3: Fri May 13 20:48:43 BST 2005 root@lack-of-gravitas.thebunker.net:/usr/obj/usr/src/sys/LACK-OF-GRAVITAS i386 >Description: Make this port installable again, fixing problems introduced by pointless insertion of PORTEPOCH into Makefile >How-To-Repeat: >Fix: --- phpldapadmin.diff begins here --- diff -Nur /usr/ports/net/phpldapadmin/Makefile phpldapadmin/Makefile --- /usr/ports/net/phpldapadmin/Makefile Tue Jun 7 09:00:11 2005 +++ phpldapadmin/Makefile Fri Jun 10 15:58:27 2005 @@ -6,11 +6,12 @@ # PORTNAME= phpldapadmin -DISTVERSION= 0.9.6c +PORTVERSION= 0.9.6c PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= phpldapadmin +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= m.seaman@infracaninophile.co.uk COMMENT= A set of PHP-scripts to administer LDAP servers over the web @@ -30,10 +31,10 @@ 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 +67,14 @@ ${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} --- phpldapadmin.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506101503.j5AF3tka053307>