From 894e5a9bf94cf3845089b222f3db7a900e5a8bbc Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 11 Jan 2003 23:04:11 +0000 Subject: Updated databases/pgaccess to 0.98.8. Major changes from version 0.98.7 include: * Completely redesigned interface, brighter and full of helpful icons and better widgets. * Connect to multiple databases on different hosts in one instance of the program. Forms, Reports, Queries, Scripts, and Diagrams can be copied between clusters. * Syntax highlighting. * Forms took a leap, with a snappy grid, more widgets, more fonts, more colors, simpler data source connection, tab order modification, and a removal of the 8k barrier. * The PgMonitor program was pulled under the umbrella, and can be run as a plugin from the main window menu. --- databases/pgaccess/Makefile | 39 ++++++------ databases/pgaccess/PLIST | 119 +++++++++++++++++++++++++++++++++--- databases/pgaccess/distinfo | 10 +-- databases/pgaccess/patches/patch-aa | 24 +++++--- databases/pgaccess/patches/patch-ab | 74 ++++++++++++++++++---- doc/CHANGES | 3 +- 6 files changed, 216 insertions(+), 53 deletions(-) diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile index 07a8e6232a7..ab1956627f3 100644 --- a/databases/pgaccess/Makefile +++ b/databases/pgaccess/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.9 2001/05/22 04:23:50 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2003/01/11 23:04:11 jlam Exp $ # -DISTNAME= pgaccess-0.98.7 -WRKSRC= ${WRKDIR}/pgaccess +DISTNAME= pgaccess-0.98.8 CATEGORIES= databases -MASTER_SITES= http://www.flex.ro/pgaccess/download/ +MASTER_SITES= http://www.pgaccess.org/download/ MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.flex.ro/pgaccess/ -COMMENT= Free graphical database management tool for PostgreSQL +HOMEPAGE= http://www.pgaccess.org/ +COMMENT= graphical database management tool for PostgreSQL -DEPENDS+= tk-postgresql>=6.5.3:../../databases/tk-postgresql +DEPENDS+= tk-postgresql>=7.2.1:../../databases/tk-postgresql NO_BUILD= # defined @@ -21,22 +20,26 @@ PGACCESS_HOME= ${PREFIX}/share/pgaccess HTMLDIR= ${PREFIX}/share/doc/html/pgaccess EGDIR= ${PREFIX}/share/examples/pgaccess -post-extract: - cd ${WRKSRC}; ${MV} -f pgaccess pgaccess.in - do-configure: - ${SED} -e "s|@PGTKSH@|${PGTKSH}|g" \ - -e "s|@PGACCESS_HOME@|${PGACCESS_HOME}|g" \ - ${WRKSRC}/pgaccess.in > ${WRKSRC}/pgaccess + for file in ${WRKSRC}/pgaccess.tcl; do \ + ${SED} -e "s|@PGTKSH@|${PGTKSH}|g" \ + -e "s|@PGACCESS_HOME@|${PGACCESS_HOME}|g" \ + $$file > $$file.new; \ + ${MV} -f $$file.new $$file; \ + done do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/pgaccess ${PREFIX}/bin/pgaccess - ${INSTALL_DATA_DIR} ${PGACCESS_HOME} ${HTMLDIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/main.tcl ${PGACCESS_HOME} - ${CP} -R ${WRKSRC}/lib ${PGACCESS_HOME} + ${INSTALL_DATA_DIR} ${PGACCESS_HOME} + ${INSTALL_SCRIPT} ${WRKSRC}/pgaccess.tcl ${PGACCESS_HOME} + ${LN} -sf ${PGACCESS_HOME}/pgaccess.tcl ${PREFIX}/bin/pgaccess ${CP} -R ${WRKSRC}/images ${PGACCESS_HOME} + ${CP} -R ${WRKSRC}/lib ${PGACCESS_HOME} + ${INSTALL_DATA_DIR} ${HTMLDIR} ${CP} -R ${WRKSRC}/doc/html/* ${HTMLDIR} - ${INSTALL_DATA} ${WRKSRC}/demo/formdemo.sql ${EGDIR} + ${INSTALL_DATA_DIR} ${EGDIR} + for file in ${WRKSRC}/demo/*; do \ + ${INSTALL_DATA} $$file ${EGDIR}; \ + done ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PGACCESS_HOME} ${HTMLDIR} ${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/databases/pgaccess/PLIST b/databases/pgaccess/PLIST index 2b19f3a12fa..bb2709de72f 100644 --- a/databases/pgaccess/PLIST +++ b/databases/pgaccess/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:23 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/11 23:04:11 jlam Exp $ bin/pgaccess share/doc/html/pgaccess/a_right.gif share/doc/html/pgaccess/addindex.gif @@ -54,19 +54,26 @@ share/doc/html/pgaccess/tutorial/tut_user.html share/doc/html/pgaccess/vdesigner.gif share/doc/html/pgaccess/whatsnew.html share/doc/html/pgaccess/win32.html -share/examples/pgaccess/formdemo.sql +share/examples/pgaccess/README.demo +share/examples/pgaccess/formdemo72.sql +share/examples/pgaccess/formdemo73.sql share/pgaccess/images/icon_button.gif share/pgaccess/images/icon_checkbutton.gif +share/pgaccess/images/icon_combobox.gif share/pgaccess/images/icon_entry.gif share/pgaccess/images/icon_frame.gif share/pgaccess/images/icon_label.gif share/pgaccess/images/icon_listbox.gif share/pgaccess/images/icon_query.gif share/pgaccess/images/icon_radiobutton.gif +share/pgaccess/images/icon_spinbox.gif share/pgaccess/images/icon_text.gif +share/pgaccess/lib/connections.tcl share/pgaccess/lib/database.tcl +share/pgaccess/lib/diagrams.tcl share/pgaccess/lib/forms.tcl share/pgaccess/lib/functions.tcl +share/pgaccess/lib/graphs.tcl share/pgaccess/lib/help.tcl share/pgaccess/lib/help/abort.hlp share/pgaccess/lib/help/add_records.hlp @@ -97,6 +104,7 @@ share/pgaccess/lib/help/data_types.hlp share/pgaccess/lib/help/datefunc.hlp share/pgaccess/lib/help/declare.hlp share/pgaccess/lib/help/delete.hlp +share/pgaccess/lib/help/diagrams.hlp share/pgaccess/lib/help/drop_aggregate.hlp share/pgaccess/lib/help/drop_database.hlp share/pgaccess/lib/help/drop_function.hlp @@ -117,6 +125,7 @@ share/pgaccess/lib/help/forms.hlp share/pgaccess/lib/help/functions.hlp share/pgaccess/lib/help/geomfunc.hlp share/pgaccess/lib/help/grant.hlp +share/pgaccess/lib/help/graphs.hlp share/pgaccess/lib/help/history.hlp share/pgaccess/lib/help/index.hlp share/pgaccess/lib/help/inheritance.hlp @@ -132,7 +141,9 @@ share/pgaccess/lib/help/move.hlp share/pgaccess/lib/help/mvcc.hlp share/pgaccess/lib/help/new_query.hlp share/pgaccess/lib/help/new_table.hlp +share/pgaccess/lib/help/newteam.hlp share/pgaccess/lib/help/notify.hlp +share/pgaccess/lib/help/open_database.hlp share/pgaccess/lib/help/open_query.hlp share/pgaccess/lib/help/open_table.hlp share/pgaccess/lib/help/pgfunctions.hlp @@ -142,7 +153,6 @@ share/pgaccess/lib/help/reports.hlp share/pgaccess/lib/help/reset.hlp share/pgaccess/lib/help/revoke.hlp share/pgaccess/lib/help/rollback.hlp -share/pgaccess/lib/help/schema.hlp share/pgaccess/lib/help/scripts.hlp share/pgaccess/lib/help/select.hlp share/pgaccess/lib/help/select_into.hlp @@ -161,6 +171,9 @@ 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/importexport.tcl +share/pgaccess/lib/languages/chinese_big5 +share/pgaccess/lib/languages/chinese_gb share/pgaccess/lib/languages/czech share/pgaccess/lib/languages/deutsch share/pgaccess/lib/languages/euskara @@ -175,23 +188,113 @@ share/pgaccess/lib/languages/russian.koi8r share/pgaccess/lib/languages/russian_win share/pgaccess/lib/languages/spanish share/pgaccess/lib/mainlib.tcl +share/pgaccess/lib/plugins/pgmonitor.tcl share/pgaccess/lib/preferences.tcl -share/pgaccess/lib/qed +share/pgaccess/lib/printer.tcl share/pgaccess/lib/queries.tcl share/pgaccess/lib/reports.tcl -share/pgaccess/lib/schema.tcl share/pgaccess/lib/scripts.tcl share/pgaccess/lib/sequences.tcl +share/pgaccess/lib/stack.tcl +share/pgaccess/lib/syntax.tcl share/pgaccess/lib/tables.tcl share/pgaccess/lib/users.tcl share/pgaccess/lib/views.tcl share/pgaccess/lib/visualqb.tcl -share/pgaccess/main.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/arrow.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/bitmap.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/button.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/buttonbox.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/color.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/combobox.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/dialog.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/dragsite.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/dropsite.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/dynhelp.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/entry.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/font.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/images/bold.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/copy.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/cut.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/dragfile.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/dragicon.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/error.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/file.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/folder.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/hourglass.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/info.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/italic.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/minus.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/new.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/opcopy.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/open.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/openfold.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/oplink.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/opmove.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/overstrike.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/palette.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/passwd.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/paste.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/plus.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/print.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/question.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/redo.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/save.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/target.xbm +share/pgaccess/lib/widgets/BWidget-1.4.1/images/underline.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/undo.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/images/warning.gif +share/pgaccess/lib/widgets/BWidget-1.4.1/init.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/label.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/labelentry.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/labelframe.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/lang/de.rc +share/pgaccess/lib/widgets/BWidget-1.4.1/lang/en.rc +share/pgaccess/lib/widgets/BWidget-1.4.1/lang/es.rc +share/pgaccess/lib/widgets/BWidget-1.4.1/lang/fr.rc +share/pgaccess/lib/widgets/BWidget-1.4.1/listbox.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/mainframe.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/messagedlg.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/notebook.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/pagesmgr.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/panedw.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/passwddlg.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/pkgIndex.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/progressbar.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/progressdlg.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/scrollframe.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/scrollview.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/scrollw.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/separator.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/spinbox.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/titleframe.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/tree.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/utils.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/widget.tcl +share/pgaccess/lib/widgets/BWidget-1.4.1/xpm2image.tcl +share/pgaccess/lib/widgets/icons1.0/LICENSE +share/pgaccess/lib/widgets/icons1.0/icons.tcl +share/pgaccess/lib/widgets/icons1.0/pkgIndex.tcl +share/pgaccess/lib/widgets/icons1.0/tkIcons +share/pgaccess/lib/widgets/icons1.0/tkIcons-sample.slick +share/pgaccess/lib/widgets/tablelist2.7/pkgIndex.tcl +share/pgaccess/lib/widgets/tablelist2.7/scripts/mwutil.tcl +share/pgaccess/lib/widgets/tablelist2.7/scripts/tablelistSortByColumn.tcl +share/pgaccess/lib/widgets/tablelist2.7/scripts/tablelistWidget.tcl +share/pgaccess/lib/widgets/tablelist2.7/scripts/tclIndex +share/pgaccess/lib/widgets/tablelist2.7/tablelist.tcl +share/pgaccess/pgaccess.tcl +@dirrm share/pgaccess/lib/widgets/tablelist2.7/scripts +@dirrm share/pgaccess/lib/widgets/tablelist2.7 +@dirrm share/pgaccess/lib/widgets/icons1.0 +@dirrm share/pgaccess/lib/widgets/BWidget-1.4.1/lang +@dirrm share/pgaccess/lib/widgets/BWidget-1.4.1/images +@dirrm share/pgaccess/lib/widgets/BWidget-1.4.1 +@dirrm share/pgaccess/lib/widgets +@dirrm share/pgaccess/lib/plugins @dirrm share/pgaccess/lib/languages @dirrm share/pgaccess/lib/help @dirrm share/pgaccess/lib -@dirrm share/pgaccess/images -@dirrm share/pgaccess @dirrm share/examples/pgaccess @dirrm share/doc/html/pgaccess/tutorial @dirrm share/doc/html/pgaccess diff --git a/databases/pgaccess/distinfo b/databases/pgaccess/distinfo index 6418ca1ea3a..d4e43bb60e3 100644 --- a/databases/pgaccess/distinfo +++ b/databases/pgaccess/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/05/22 04:23:50 jlam Exp $ +$NetBSD: distinfo,v 1.4 2003/01/11 23:04:11 jlam Exp $ -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 +SHA1 (pgaccess-0.98.8.tar.gz) = c02d6b0f014931101b864c6f2d2da2b2552aa6be +Size (pgaccess-0.98.8.tar.gz) = 862387 bytes +SHA1 (patch-aa) = 0a24cb462d7dd9816b657df4483c46a4eba27b79 +SHA1 (patch-ab) = 007d1c407f418f087871e686568c6fdfacc5ca1d diff --git a/databases/pgaccess/patches/patch-aa b/databases/pgaccess/patches/patch-aa index 5444313bfe8..712543e911b 100644 --- a/databases/pgaccess/patches/patch-aa +++ b/databases/pgaccess/patches/patch-aa @@ -1,12 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/09/21 19:12:52 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2003/01/11 23:04:12 jlam Exp $ ---- ./main.tcl.orig Mon Sep 6 09:29:18 1999 -+++ ./main.tcl Tue Sep 21 15:00:02 1999 -@@ -166,7 +166,6 @@ +--- Makefile.orig Wed Aug 28 09:11:22 2002 ++++ Makefile +@@ -7,9 +7,8 @@ + # + #------------------------------------------------------------------------- - proc {main} {argc argv} { - global PgAcVar CurrentDB tcl_platform -- load libpgtcl[info sharedlibextension] - catch {Mainlib::draw_tabs} - set PgAcVar(opendb,username) {} - set PgAcVar(opendb,password) {} +-bindir = /usr/bin/X11 +-libdir = /usr/lib/pgaccess +-wish = /usr/bin/wish ++bindir = ${PREFIX}/bin ++libdir = ${PREFIX}/lib/pgaccess + + pgaccess: + chmod a+x pgaccess.tcl diff --git a/databases/pgaccess/patches/patch-ab b/databases/pgaccess/patches/patch-ab index 02e7ae21d30..565840ed076 100644 --- a/databases/pgaccess/patches/patch-ab +++ b/databases/pgaccess/patches/patch-ab @@ -1,14 +1,66 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/09/21 19:12:52 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/11 23:04:12 jlam Exp $ ---- ./pgaccess.in.orig Wed Aug 25 10:10:36 1999 -+++ ./pgaccess.in Tue Sep 21 15:00:49 1999 -@@ -1,7 +1,7 @@ - #!/bin/sh +--- pgaccess.tcl.orig Sun Dec 1 19:57:56 2002 ++++ pgaccess.tcl +@@ -12,5 +12,5 @@ fi --PATH_TO_WISH=/usr/bin/wish --PGACCESS_HOME=/usr/local/pgaccess -+PATH_TO_WISH=@PGTKSH@ -+PGACCESS_HOME=@PGACCESS_HOME@ + # the next line restarts using wish \ +-exec wish "$0" "$@" ++exec @PGTKSH@ "$0" "$@" - export PATH_TO_WISH - export PGACCESS_HOME + #------------------------------------------------------------ +@@ -34,19 +34,12 @@ switch $tcl_platform(platform) { + puts $fid "" + +- puts $fid "# path to libpgtcl" +- if {![info exists env(PGLIB)]} { +- set env(PGLIB) "/usr/lib" +- } +- puts $fid "PGLIB=$env(PGLIB)" +- puts $fid "" +- + puts $fid "# pgaccess home directory" + if {![info exists env(PGACCESS_HOME)]} { +- set env(PGACCESS_HOME) "/usr/lib/pgaccess" ++ set env(PGACCESS_HOME) "@PGACCESS_HOME@" + } + puts $fid "PGACCESS_HOME=$env(PGACCESS_HOME)" + puts $fid "" + +- puts $fid "export PGLIB PGACCESS_HOME" ++ puts $fid "export PGACCESS_HOME" + close $fid + puts "done" +@@ -299,32 +292,4 @@ global PgAcVar CurrentDB + proc {main} {argc argv} { + global PgAcVar CurrentDB tcl_platform env +- if {[info exists env(PGLIB)]} { +- set libpgtclpath [file join $env(PGLIB) libpgtcl] +- } else { +- puts "PGLIB enviroment variable is not set, setting it to 'libpgtcl'." +- set libpgtclpath {libpgtcl} +- } +- +- set shlib ${libpgtclpath}[info sharedlibextension] +- +- if {![file exists $shlib]} { +- puts "\nError: Shared library file: '$shlib' does not exist. \n\ +- Check this file, or check PGLIB variable (in pgaccessrc)\n" +- +- exit +- } +- +- if {[catch {load $shlib} err]} { +- puts "Error: can not load $shlib shared library." +- puts "You need to make sure that the library exists and" +- puts "the environment variable PGLIB points to the directory" +- puts "where it is located.\n" +- puts "If you use Windows, be sure that the needed libpgtcl.dll" +- puts "and libpq.dll files are copied in the Windows/System" +- puts "directory" +- puts "\nERROR MESSAGE: $err\n" +- exit +- } +- + set tdb "" + set thost "" diff --git a/doc/CHANGES b/doc/CHANGES index bbef2f49a23..b415a628690 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.1098 2003/01/11 22:37:40 jschauma Exp $ +$NetBSD: CHANGES,v 1.1099 2003/01/11 23:04:43 jlam Exp $ Changes to the packages collection and infrastructure in 2003: @@ -234,3 +234,4 @@ Changes to the packages collection and infrastructure in 2003: Updated iso8879 to 1986nb1 [jmmv 2003-01-11] Updated sp to 1.3.4nb1 [jmmv 2003-01-11] Updated bbweather to 0.6 [jschauma 2003-01-11] + Updated pgaccess to 0.98.8 [jlam 2003-01-11] -- cgit v1.2.3