From owner-svn-ports-head@freebsd.org  Thu Jan 14 05:23:34 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7BC1A827B7;
 Thu, 14 Jan 2016 05:23:34 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 611A81740;
 Thu, 14 Jan 2016 05:23:34 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0E5NX2n055000;
 Thu, 14 Jan 2016 05:23:33 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E5NXIH054998;
 Thu, 14 Jan 2016 05:23:33 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201601140523.u0E5NXIH054998@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 14 Jan 2016 05:23:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r406093 - head/databases/phppgadmin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 05:23:34 -0000

Author: dinoex
Date: Thu Jan 14 05:23:33 2016
New Revision: 406093
URL: https://svnweb.freebsd.org/changeset/ports/406093

Log:
  - use @sample
  - drop support for PGADMOLDDIR
  PR:		205243

Modified:
  head/databases/phppgadmin/Makefile
  head/databases/phppgadmin/pkg-plist

Modified: head/databases/phppgadmin/Makefile
==============================================================================
--- head/databases/phppgadmin/Makefile	Thu Jan 14 05:07:00 2016	(r406092)
+++ head/databases/phppgadmin/Makefile	Thu Jan 14 05:23:33 2016	(r406093)
@@ -24,8 +24,6 @@ CPE_VENDOR=	phppgadmin_project
 SHEBANG_FILES=	lang/synch
 PGADMDIR?=	www/phpPgAdmin
 PLIST_SUB+=	PGADMDIR=${PGADMDIR}
-PGADMOLDDIR?=	www/data-dist/phpPgAdmin
-PLIST_SUB+=	PGADMOLDDIR=${PGADMOLDDIR}
 
 pre-everything::
 	@${ECHO_CMD} "# you can customize the installation directory"
@@ -36,6 +34,8 @@ do-configure:
 		${WRKSRC}/conf/config.inc.php-dist
 	${RM} -f ${WRKSRC}/conf/config.inc.php \
 		${WRKSRC}/conf/config.inc.php-dist.bak
+	${MV} -i ${WRKSRC}/conf/config.inc.php-dist \
+		${WRKSRC}/conf/config.inc.php.sample
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PGADMDIR}

Modified: head/databases/phppgadmin/pkg-plist
==============================================================================
--- head/databases/phppgadmin/pkg-plist	Thu Jan 14 05:07:00 2016	(r406092)
+++ head/databases/phppgadmin/pkg-plist	Thu Jan 14 05:23:33 2016	(r406093)
@@ -30,10 +30,7 @@
 %%PGADMDIR%%/classes/database/Postgres90.php
 %%PGADMDIR%%/classes/database/Postgres91.php
 %%PGADMDIR%%/colproperties.php
-@unexec if cmp -s %D/%%PGADMDIR%%/conf/config.inc.php %D/%%PGADMDIR%%/conf/config.inc.php-dist; then rm -f %D/%%PGADMDIR%%/conf/config.inc.php; fi
-%%PGADMDIR%%/conf/config.inc.php-dist
-@exec cp -np %D/%%PGADMOLDDIR%%/conf/config.inc.php %B/config.inc.php
-@exec cp -np %B/%f %B/config.inc.php
+@sample %%PGADMDIR%%/conf/config.inc.php
 %%PGADMDIR%%/constraints.php
 %%PGADMDIR%%/conversions.php
 %%PGADMDIR%%/database.php