Attachment 146589 Details for Bug 193046 – Updated patch addressing most issues with the previous submission

[patch] Updated patch addressing most issues with the previous submission

pgaccess.diff.txt (text/plain), 5.43 KB, created by Thomas Zander on 2014-08-31 09:59:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2014-08-31 09:59:44 UTC

Size: 5.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366732)
>+++ Makefile	(working copy)
>@@ -2,24 +2,22 @@
> # $FreeBSD$
> 
> PORTNAME=	pgaccess
>-PORTVERSION=	0.99.0.20040219
>-PORTREVISION=	3
>+PORTVERSION=	1.00.20140827
>+PORTREVISION=	4
> CATEGORIES=	databases tcl tk
>-MASTER_SITES=	SF
>-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
>-EXTRACT_SUFX=	.tgz
>+MASTER_SITES=	http://bsdforge.com/projects/source/databases/pgaccess/
> 
>-MAINTAINER= ports@FreeBSD.org
>-COMMENT=	Powerful GUI PostgreSQL database administration tool and toolkit
>+MAINTAINER=	portmaster@bsdforge.com
>+COMMENT=	Powerful PostgreSQL database GUI administration tool and toolkit
> 
>-DEPRECATED=	not maintained upstreams for ten years
>-EXPIRATION_DATE=2014-08-31
>+LICENSE=	BSD4CLAUSE
> 
>-BUILD_DEPENDS+=	${RUN_DEPENDS}
> RUN_DEPENDS=	${LOCALBASE}/lib/pgtcl/pkgIndex.tcl:${PORTSDIR}/databases/pgtcl
> 
>-USE_PGSQL=	server:extract
>+USES=		pgsql tar:xz
> 
>+NO_ARCH=	yes
>+
> TCLVERSION?=	8.4
> DOCSDIR=	${PREFIX}/share/doc/postgresql/${PORTNAME}
> PGACCESSDIR=	${PREFIX}/share/postgresql/${PORTNAME}
>@@ -26,7 +24,8 @@
> 
> OPTIONS_DEFINE=	DOCS
> 
>-NO_STAGE=	yes
>+.include <bsd.port.options.mk>
>+
> post-patch:
> 	@${REINPLACE_CMD} -e "s,/usr/bin,${PREFIX}/bin,g ; " ${WRKSRC}/lib/mainlib.tcl
> 	@${RM} ${WRKSRC}/lib/mainlib.tcl.bak
>@@ -41,18 +40,16 @@
> .endfor
> 
> do-install:
>-	@${MKDIR} ${PGACCESSDIR} ; \
>-	 cd ${WRKSRC} ;\
>-	 ${TAR} cf - `${FIND} * ! $ -path win32\* -o -path doc\* $` | \
>-	 ( cd ${PGACCESSDIR}; ${TAR} xf - ) ; \
>-	 ${CHOWN} -R 0:0 ${PGACCESSDIR}
>+	@${MKDIR} ${STAGEDIR}${PGACCESSDIR} ; \
>+	cd ${WRKSRC} ;\
>+	${TAR} cf - `${FIND} * ! $ -path win32\* -o -path doc\* $` | \
>+	( cd ${STAGEDIR}${PGACCESSDIR}; ${TAR} xf - )
> .for targetfile in pgaccess pgmonitor
>-	${INSTALL_SCRIPT} ${WRKDIR}/${targetfile}.sh ${PREFIX}/bin/${targetfile}
>+	${INSTALL_SCRIPT} ${WRKDIR}/${targetfile}.sh ${STAGEDIR}${PREFIX}/bin/${targetfile}
> .endfor
>-	@${MKDIR} ${DOCSDIR} ; \
>-	 cd ${WRKSRC}/doc/html ;\
>-	 ${TAR} cf - * | \
>-	 ( cd ${DOCSDIR}; ${TAR} xf - ) ; \
>-	 ${CHOWN} -R 0:0 ${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ; \
>+	cd ${WRKSRC}/doc/html ;\
>+	${TAR} cf - * | \
>+	( cd ${STAGEDIR}${DOCSDIR}; ${TAR} xf - )
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 366732)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pgaccess-0_99_0_20040219.tgz) = 26eb9edd450b069f0b8a044f34fbacbbcb9dd135e7fc96701cd3d2520eded7a9
>-SIZE (pgaccess-0_99_0_20040219.tgz) = 1457184
>+SHA256 (pgaccess-1.00.20140827.tar.xz) = 0583505feb18655cd0fdd45efb4912faaf46f00583661d0791393ebd4f4aff30
>+SIZE (pgaccess-1.00.20140827.tar.xz) = 1094304
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 366732)
>+++ pkg-descr	(working copy)
>@@ -1,13 +1,13 @@
>-PgAccess is one of the prettiest GUIs (graphical user interfaces) for
>-the open source database PostgreSQL.
>+PgAccess is a pretty GUI (Grephical User Interface) for the open source
>+database PostgreSQL.
> 
> PgAccess is a cross-platform database management tool for PostgreSQL
> written in Tcl/Tk. There are active efforts to turn it into a tool for
>-writing applications that can work in a distributed client-server
>-model (a central PostgreSQL database and remote clients).
>+writing applications that can work in a distributed client-server model
>+(a central PostgreSQL database and remote clients).
> 
> PgAccess was originally written by Constantin Teodorescu using Visual
>-Tcl, "the best tool for developing Tcl/Tk applications I've ever
>-seen." It is currently managed by a growing team of developers.
>+Tcl, "the best tool for developing Tcl/Tk applications I've ever seen."
>+It is currently managed by hte developers at BSDforge.com.
> 
>-WWW: http://sourceforge.net/projects/pgaccess/
>+WWW: http://BSDforge.com/projects/databases/pgaccess/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 366732)
>+++ pkg-plist	(working copy)
>@@ -56,8 +56,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/win32.html
> share/postgresql/pgaccess/Makefile
> share/postgresql/pgaccess/README
>-share/postgresql/pgaccess/changelog
>-share/postgresql/pgaccess/copyright
>+share/postgresql/pgaccess/CHANGELOG
>+share/postgresql/pgaccess/LICENSE
> share/postgresql/pgaccess/demo/README.demo
> share/postgresql/pgaccess/demo/demo.pga
> share/postgresql/pgaccess/demo/formdemo72.sql
>@@ -88,7 +88,7 @@
> share/postgresql/pgaccess/images/icon_text.gif
> share/postgresql/pgaccess/images/icon_tree.gif
> share/postgresql/pgaccess/images/logo.gif
>-share/postgresql/pgaccess/known_bugs
>+share/postgresql/pgaccess/BUGS
> share/postgresql/pgaccess/lib/aggregates.tcl
> share/postgresql/pgaccess/lib/casts.tcl
> share/postgresql/pgaccess/lib/colors.tcl
>@@ -365,7 +365,7 @@
> share/postgresql/pgaccess/osx/dylib/libpgtcl.7.3.dylib.sit
> share/postgresql/pgaccess/pgaccess.tcl
> share/postgresql/pgaccess/pgmonitor
>-share/postgresql/pgaccess/todo
>+share/postgresql/pgaccess/TODO
> share/postgresql/pgaccess/utils/mkkit.tcl
> @dirrm share/postgresql/pgaccess/utils
> @dirrm share/postgresql/pgaccess/osx/dylib
>@@ -391,7 +391,5 @@
> @dirrm share/postgresql/pgaccess/extra
> @dirrm share/postgresql/pgaccess/demo
> @dirrm share/postgresql/pgaccess
>-@dirrmtry share/postgresql
>-%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess/tutorial
>-%%PORTDOCS%%@dirrm share/doc/postgresql/pgaccess
>-%%PORTDOCS%%@dirrmtry share/doc/postgresql
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 193046: 146355 | 146433 | 146459 | 146460 | 146589 | 146709 | 146710