Update pgaccess to 0.98.7. Changes from version 0.98.6 include:

     * Fixed table creation when all columns are inherited and no new columns
       are added
     * Geometry improvements in diagram definition

4 files changed, 20 insertions, 25 deletions

diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 8ff5685b51c..07a8e6232a7 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 14:17:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/22 04:23:50 jlam Exp $
 #
 
-DISTNAME=	pgaccess-0.98.6
+DISTNAME=	pgaccess-0.98.7
 WRKSRC=		${WRKDIR}/pgaccess
 CATEGORIES=	databases
-MASTER_SITES=	ftp://speedy.flex.ro/pub/pgaccess/ \
-		ftp://ftp.flex.ro/pub/pgaccess/ \
-		ftp://ftp.sai.msu.su/pub/unix/database/pgsql.app/ \
-		ftp://crydee.sai.msu.ru/zeus/unix/database/pgsql.app/
+MASTER_SITES=	http://www.flex.ro/pgaccess/download/
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.flex.ro/pgaccess/
@@ -15,30 +12,26 @@ COMMENT=	Free graphical database management tool for PostgreSQL
 
 DEPENDS+=	tk-postgresql>=6.5.3:../../databases/tk-postgresql
 
-NO_BUILD=	yes
+NO_BUILD=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-PGUSER?=	pgsql
-
 PGTKSH=		${PREFIX}/bin/pgtksh
 PGACCESS_HOME=	${PREFIX}/share/pgaccess
 HTMLDIR=	${PREFIX}/share/doc/html/pgaccess
 EGDIR=		${PREFIX}/share/examples/pgaccess
 
-pre-patch:
-	${MV} ${WRKSRC}/pgaccess ${WRKSRC}/pgaccess.in
+post-extract:
+	cd ${WRKSRC}; ${MV} -f pgaccess pgaccess.in
 
 do-configure:
-	${SED}	-e "s,@PGTKSH@,${PGTKSH},g" \
-		-e "s,@PGACCESS_HOME@,${PGACCESS_HOME},g" \
+	${SED}	-e "s|@PGTKSH@|${PGTKSH}|g"				\
+		-e "s|@PGACCESS_HOME@|${PGACCESS_HOME}|g"		\
 		${WRKSRC}/pgaccess.in > ${WRKSRC}/pgaccess
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pgaccess ${PREFIX}/bin/pgaccess
-	${INSTALL_DATA_DIR} ${PGACCESS_HOME}
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${PGACCESS_HOME} ${HTMLDIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/main.tcl ${PGACCESS_HOME}
 	${CP} -R ${WRKSRC}/lib ${PGACCESS_HOME}
 	${CP} -R ${WRKSRC}/images ${PGACCESS_HOME}
diff --git a/databases/pgaccess/distinfo b/databases/pgaccess/distinfo
index 932fd629809..6418ca1ea3a 100644
--- a/databases/pgaccess/distinfo
+++ b/databases/pgaccess/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/22 04:23:50 jlam Exp $
 
-SHA1 (pgaccess-0.98.6.tar.gz) = c0695353657074cb1b7030f5bb67ce5aadf7ace3
-Size (pgaccess-0.98.6.tar.gz) = 555173 bytes
+SHA1 (pgaccess-0.98.7.tar.gz) = 072b4889f6813f9836e5b2777ab88a3a6b133fa4
+Size (pgaccess-0.98.7.tar.gz) = 630171 bytes
 SHA1 (patch-aa) = 0158b655cc3156b2ecc22879ee1673b21f111b12
 SHA1 (patch-ab) = 575ac1333356b0dbbf04a5b5d925d9bd38abb398
diff --git a/databases/pgaccess/pkg/DESCR b/databases/pgaccess/pkg/DESCR
index cddcdfda0d6..d14ded3b693 100644
--- a/databases/pgaccess/pkg/DESCR
+++ b/databases/pgaccess/pkg/DESCR
@@ -1,4 +1,4 @@
-PgAcess is a free graphical database management tool for PostgreSQL.  It
+PgAccess is a free graphical database management tool for PostgreSQL.  It
 supports table operations, queries, sequence manipulation, function
 definitions for PL/PgSQL and PgTCL, form and report design, and scripting
 -- all within a Tcl/Tk GUI.
diff --git a/databases/pgaccess/pkg/PLIST b/databases/pgaccess/pkg/PLIST
index ec2f9d62e24..019f0205c67 100644
--- a/databases/pgaccess/pkg/PLIST
+++ b/databases/pgaccess/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/02/10 23:13:46 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/22 04:23:51 jlam Exp $
 bin/pgaccess
 share/doc/html/pgaccess/a_right.gif
 share/doc/html/pgaccess/addindex.gif
@@ -161,17 +161,19 @@ share/pgaccess/lib/help/view_table_structure.hlp
 share/pgaccess/lib/help/views.hlp
 share/pgaccess/lib/help/visual_designer.hlp
 share/pgaccess/lib/help/y2k.hlp
+share/pgaccess/lib/languages/czech
+share/pgaccess/lib/languages/deutsch
+share/pgaccess/lib/languages/euskara
 share/pgaccess/lib/languages/francais
 share/pgaccess/lib/languages/italiano
+share/pgaccess/lib/languages/japanese
 share/pgaccess/lib/languages/magyar
+share/pgaccess/lib/languages/nederlands
+share/pgaccess/lib/languages/portugues
 share/pgaccess/lib/languages/romana
-share/pgaccess/lib/languages/czech
-share/pgaccess/lib/languages/deutsch
 share/pgaccess/lib/languages/russian.koi8r
 share/pgaccess/lib/languages/russian_win
 share/pgaccess/lib/languages/spanish
-share/pgaccess/lib/languages/portugues
-share/pgaccess/lib/languages/nederlands
 share/pgaccess/lib/mainlib.tcl
 share/pgaccess/lib/preferences.tcl
 share/pgaccess/lib/qed