Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jan 2016 05:23:33 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406093 - head/databases/phppgadmin
Message-ID:  <201601140523.u0E5NXIH054998@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601140523.u0E5NXIH054998>