Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2006 03:18:30 -0800 (PST)
From:      infofarmer@gmail.com
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/94636: update databases/phppgadmin to 4.0.1
Message-ID:  <441bec86.4d060a45.5790.ffffe6d2@mx.gmail.com>
Resent-Message-ID: <200603181120.k2IBKGJm048543@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         94636
>Category:       ports
>Synopsis:       update databases/phppgadmin to 4.0.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 18 11:20:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #14: Sun Mar 5 15:57:19 MSK 2006 sat@sat64.net17:/usr/obj/usr/src/sys/SATCUR32 i386


	
>Description:
o Update to 4.0.1
o Install into www instead of www/data-dist
	
>How-To-Repeat:
	
>Fix:

	

--- phppgadmin.diff begins here ---
diff -urN /usr/ports/databases/phppgadmin/Makefile phppgadmin/Makefile
--- /usr/ports/databases/phppgadmin/Makefile	Sat Nov 19 17:24:19 2005
+++ phppgadmin/Makefile	Sat Mar 18 13:43:13 2006
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	phppgadmin
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	databases www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	phpPgAdmin-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
 
-USE_REINPLACE=	yes
 USE_BZIP2=	yes
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	pgsql pcre session
 .endif
 NO_BUILD=	YES
-PGADMDIR?=	www/data-dist/phpPgAdmin
+PGADMDIR?=	www/phpPgAdmin
 PLIST_SUB+=	PGADMDIR=${PGADMDIR}
 
-do-configure:
+post-extract:
 	${REINPLACE_CMD} -e "s|/usr/bin/pg|${LOCALBASE}/bin/pg|" \
 		${WRKSRC}/conf/config.inc.php-dist
 	${RM} -f ${WRKSRC}/conf/config.inc.php \
@@ -32,9 +31,8 @@
 
 do-install:
 	${MKDIR} ${PREFIX}/${PGADMDIR}
-	${CP} -R ${WRKSRC}/* ${PREFIX}/${PGADMDIR}
-	@[ -f ${PREFIX}/${PGADMDIR}/conf/config.inc.php ] || \
-		${CP} -p ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \
+	${CP} -R ${WRKSRC}/ ${PREFIX}/${PGADMDIR}/
+	${CP} -np ${PREFIX}/${PGADMDIR}/conf/config.inc.php-dist \
 		${PREFIX}/${PGADMDIR}/conf/config.inc.php
 
 .include <bsd.port.mk>
diff -urN /usr/ports/databases/phppgadmin/distinfo phppgadmin/distinfo
--- /usr/ports/databases/phppgadmin/distinfo	Sat Nov 19 17:24:19 2005
+++ phppgadmin/distinfo	Sat Mar 18 13:43:13 2006
@@ -1,3 +1,3 @@
-MD5 (phpPgAdmin-4.0.tar.bz2) = 9badba12100bd244e697c7448f57ab13
-SHA256 (phpPgAdmin-4.0.tar.bz2) = c4719e03b1434c281b953e7dbf79791eb97f558400dbbb081291ce8d2f8f93fa
-SIZE (phpPgAdmin-4.0.tar.bz2) = 510552
+MD5 (phpPgAdmin-4.0.1.tar.bz2) = 7e0c18a01538572d3c2b435725e68fe2
+SHA256 (phpPgAdmin-4.0.1.tar.bz2) = 8a1b94013e6a332affc3bd029542734d461b3214e33e083f4cdebfe6b2466ff1
+SIZE (phpPgAdmin-4.0.1.tar.bz2) = 509800
diff -urN /usr/ports/databases/phppgadmin/pkg-plist phppgadmin/pkg-plist
--- /usr/ports/databases/phppgadmin/pkg-plist	Sat Nov 19 17:24:19 2005
+++ phppgadmin/pkg-plist	Sat Mar 18 13:56:13 2006
@@ -27,9 +27,9 @@
 %%PGADMDIR%%/classes/database/Postgres82.php
 %%PGADMDIR%%/classes/plugins/Plugin.php
 %%PGADMDIR%%/classes/plugins/Slony.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
+@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 [ -f %B/config.inc.php ] || cp %B/%f %B/config.inc.php
+@exec	if [ ! -f %B/config.inc.php ] ; then cp -p %B/%f %B/config.inc.php
 %%PGADMDIR%%/constraints.php
 %%PGADMDIR%%/conversions.php
 %%PGADMDIR%%/database.php
@@ -57,13 +57,13 @@
 %%PGADMDIR%%/images/themes/default/Tminus.png
 %%PGADMDIR%%/images/themes/default/Tplus.png
 %%PGADMDIR%%/images/themes/default/blank.png
-%%PGADMDIR%%/images/themes/default/error.png
 %%PGADMDIR%%/images/themes/default/database.png
 %%PGADMDIR%%/images/themes/default/domains.png
+%%PGADMDIR%%/images/themes/default/error.png
 %%PGADMDIR%%/images/themes/default/file.png
-%%PGADMDIR%%/images/themes/default/functions.png
 %%PGADMDIR%%/images/themes/default/folder.png
 %%PGADMDIR%%/images/themes/default/folderOpen.png
+%%PGADMDIR%%/images/themes/default/functions.png
 %%PGADMDIR%%/images/themes/default/group.png
 %%PGADMDIR%%/images/themes/default/loading.gif
 %%PGADMDIR%%/images/themes/default/operators.png
--- phppgadmin.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?441bec86.4d060a45.5790.ffffe6d2>