From owner-svn-ports-head@FreeBSD.ORG Wed Aug 13 22:54:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C85EA358 for ; Wed, 13 Aug 2014 22:54:28 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42CDE2B39 for ; Wed, 13 Aug 2014 22:54:28 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DMsSsj018590 for ; Wed, 13 Aug 2014 22:54:28 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id s7DMsRVc018587 for svn-ports-head@freebsd.org; Wed, 13 Aug 2014 22:54:27 GMT (envelope-from bdrewery) Received: (qmail 13443 invoked from network); 13 Aug 2014 17:54:23 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 13 Aug 2014 17:54:23 -0500 Message-ID: <53EBEC98.3010202@FreeBSD.org> Date: Wed, 13 Aug 2014 17:54:16 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: John Marino , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r364819 - head/www/phpbb3 References: <201408132245.s7DMjkso088331@svn.freebsd.org> In-Reply-To: <201408132245.s7DMjkso088331@svn.freebsd.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="N5rGeEDu0iCKbAgaJbOVtIKTmLxuQOaXX" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Aug 2014 22:54:29 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --N5rGeEDu0iCKbAgaJbOVtIKTmLxuQOaXX Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 8/13/2014 5:45 PM, John Marino wrote: > Author: marino > Date: Wed Aug 13 22:45:45 2014 > New Revision: 364819 > URL: http://svnweb.freebsd.org/changeset/ports/364819 > QAT: https://qat.redports.org/buildarchive/r364819/ >=20 > Log: > www/phpbb3: Replace @sample keyword > =20 > The @sample keyword got used here but it didn't work because the > extension was php.sample instead of conf.sample. Fix it with @unexec= > and @exec tricks. > =20 > By the way, the previous commit to this port and the one that should > have provided this @sample fix is: > =20 > PR: 191456 >=20 > Modified: > head/www/phpbb3/Makefile > head/www/phpbb3/pkg-plist >=20 > Modified: head/www/phpbb3/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/phpbb3/Makefile Wed Aug 13 22:40:26 2014 (r364818) > +++ head/www/phpbb3/Makefile Wed Aug 13 22:45:45 2014 (r364819) > @@ -3,6 +3,7 @@ > =20 > PORTNAME=3D phpbb > PORTVERSION=3D 3.0.12 > +PORTREVISION=3D 1 > CATEGORIES=3D www > MASTER_SITES=3D https://www.phpbb.com/files/release/ > PKGNAMESUFFIX=3D 3 >=20 > Modified: head/www/phpbb3/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/phpbb3/pkg-plist Wed Aug 13 22:40:26 2014 (r364818) > +++ head/www/phpbb3/pkg-plist Wed Aug 13 22:45:45 2014 (r364819) > @@ -131,7 +131,9 @@ > %%PHPBBDIR%%/cache/.htaccess > %%PHPBBDIR%%/cache/index.htm > %%PHPBBDIR%%/common.php > -@sample %%PHPBBDIR%%/config.php.sample > +@unexec if cmp -s %D/%%PHPBBDIR%%/config.php.sample %D/%%PHPBBDIR%%/co= nfig.php; then rm -f %D/%%PHPBBDIR%%/config.php; fi > +%%PHPBBDIR%%/config.php.sample > +@exec if [ ! -f %D/%%PHPBBDIR%%/config.php ] ; then cp -p %D/%F %B/con= fig.php; fi > %%PHPBBDIR%%/cron.php > %%PHPBBDIR%%/docs/AUTHORS > %%PHPBBDIR%%/docs/CHANGELOG.html >=20 This change is wrong. @sample does not require conf.sample, it only requires .sample. It should be installing it as config.php. /me goes to look --=20 Regards, Bryan Drewery --N5rGeEDu0iCKbAgaJbOVtIKTmLxuQOaXX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJT6+yYAAoJEDXXcbtuRpfPrqcIANs+TIdOpwk5rfXVbTlGsL3V VW6omXmq8JH6fVW5jZQChvbIJDiIDrDW22x9I5ZTLQ/xFUYfezbvQ66LGdImNVYU d/q7lAMamtxG26ezTJuBED9mT6vGjupcd+69rJYYnoIYO+h6pdjft4iTadKgHHhH VUIGj/WjgdAz/YCXac3/82LuRVOHClk6qorfgjBog+aR9H9stCWs6deXq8Tha1it C6zeYDzL7LetU18LGIr9agB2pb2hFZQgPMdZlQEDOgvGRkaUfOCh+Guk2NHCWLEU 7T60sfg/FoEj6hHGDjCgJ135D+NKHAuKvpX3Fqt9sv03qXcepVRm2QKFnCErtYI= =kO3M -----END PGP SIGNATURE----- --N5rGeEDu0iCKbAgaJbOVtIKTmLxuQOaXX--