Use different package names for PostgreSQL and PostgreSQL with TCL/Tk.

Fix PLIST for postgresql-tcl.
This commit is contained in:
form 1999-12-07 11:47:47 +00:00
parent 44bea2d1ec
commit 8bab5d075a
3 changed files with 271 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 1999/12/07 08:26:41 form Exp $
# $OpenBSD: Makefile,v 1.19 1999/12/07 11:47:47 form Exp $
# $FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp $
DISTNAME= postgresql-6.5.3
@ -61,6 +61,9 @@ TK_INCDIR= ${LOCALBASE}/include/tk8.0
MAKE_ENV= USE_TCL=true TCL_INCDIR=${TCL_INCDIR} TK_INCDIR=${TK_INCDIR}
LIB_DEPENDS= tcl80:${PORTSDIR}/lang/tcl80 tk80:${PORTSDIR}/x11/tk80
WITH_TCL= --with-tcl --with-tclconfig="${LOCALBASE}/lib/tcl8.0 ${LOCALBASE}/lib/tk8.0"
PKGNAME= ${DISTNAME}-tcl
.else
PKGNAME= ${DISTNAME}
.endif
USE_GMAKE= yes
@ -69,8 +72,8 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}/pgsql \
--enable-locale \
--with-template=`uname -s | ${TR} '[A-Z]' '[a-z]'` \
--with-includes="${PREFIX}/include ${TCL_INCDIR} ${TK_INCDIR}" ${WITH_TCL} \
--with-libraries=${PREFIX}/lib
--with-includes="${PREFIX}/include ${TCL_INCDIR} \
${TK_INCDIR}" ${WITH_TCL} --with-libraries=${PREFIX}/lib
WRKSRC= ${WRKDIR}/${DISTNAME}/src
@ -98,6 +101,15 @@ post-configure:
fi
.endif
.if defined(USE_TCL) || defined(USE_TK)
post-patch:
@${MV} ${WRKSRC}/bin/pgaccess/main.tcl \
${WRKSRC}/bin/pgaccess/main.tcl.orig
@${SED} -e "s=wish=${LOCALBASE}/bin/wish8.0=" \
${WRKSRC}/bin/pgaccess/main.tcl.orig \
> ${WRKSRC}/bin/pgaccess/main.tcl
.endif
pre-build:
@${MKDIR} ${WRKSRC}/pgwrap
@${CP} ${FILESDIR}/pgwrap.c ${FILESDIR}/pgwrap.h ${WRKSRC}/pgwrap

View File

@ -10,6 +10,7 @@ pgsql/bin/ecpg
pgsql/bin/initdb
pgsql/bin/initlocation
pgsql/bin/ipcclean
pgsql/bin/pgaccess
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
pgsql/bin/pg_id
@ -153,6 +154,128 @@ pgsql/man/manl/show.l
pgsql/man/manl/sql.l
pgsql/man/manl/update.l
pgsql/man/manl/vacuum.l
pgsql/pgaccess/main.tcl
pgsql/pgaccess/lib/database.tcl
pgsql/pgaccess/lib/forms.tcl
pgsql/pgaccess/lib/functions.tcl
pgsql/pgaccess/lib/help.tcl
pgsql/pgaccess/lib/mainlib.tcl
pgsql/pgaccess/lib/preferences.tcl
pgsql/pgaccess/lib/queries.tcl
pgsql/pgaccess/lib/reports.tcl
pgsql/pgaccess/lib/schema.tcl
pgsql/pgaccess/lib/scripts.tcl
pgsql/pgaccess/lib/sequences.tcl
pgsql/pgaccess/lib/tables.tcl
pgsql/pgaccess/lib/users.tcl
pgsql/pgaccess/lib/views.tcl
pgsql/pgaccess/lib/visualqb.tcl
pgsql/pgaccess/lib/help/abort.hlp
pgsql/pgaccess/lib/help/add_records.hlp
pgsql/pgaccess/lib/help/alter_table.hlp
pgsql/pgaccess/lib/help/alter_user.hlp
pgsql/pgaccess/lib/help/author.hlp
pgsql/pgaccess/lib/help/begin.hlp
pgsql/pgaccess/lib/help/close.hlp
pgsql/pgaccess/lib/help/cluster.hlp
pgsql/pgaccess/lib/help/commit.hlp
pgsql/pgaccess/lib/help/copy.hlp
pgsql/pgaccess/lib/help/copyrights.hlp
pgsql/pgaccess/lib/help/create_aggregate.hlp
pgsql/pgaccess/lib/help/create_database.hlp
pgsql/pgaccess/lib/help/create_function.hlp
pgsql/pgaccess/lib/help/create_index.hlp
pgsql/pgaccess/lib/help/create_language.hlp
pgsql/pgaccess/lib/help/create_operator.hlp
pgsql/pgaccess/lib/help/create_rule.hlp
pgsql/pgaccess/lib/help/create_sequence.hlp
pgsql/pgaccess/lib/help/create_table.hlp
pgsql/pgaccess/lib/help/create_table_as.hlp
pgsql/pgaccess/lib/help/create_trigger.hlp
pgsql/pgaccess/lib/help/create_type.hlp
pgsql/pgaccess/lib/help/create_user.hlp
pgsql/pgaccess/lib/help/create_view.hlp
pgsql/pgaccess/lib/help/data_types.hlp
pgsql/pgaccess/lib/help/datefunc.hlp
pgsql/pgaccess/lib/help/declare.hlp
pgsql/pgaccess/lib/help/delete.hlp
pgsql/pgaccess/lib/help/drop_aggregate.hlp
pgsql/pgaccess/lib/help/drop_database.hlp
pgsql/pgaccess/lib/help/drop_function.hlp
pgsql/pgaccess/lib/help/drop_index.hlp
pgsql/pgaccess/lib/help/drop_language.hlp
pgsql/pgaccess/lib/help/drop_operator.hlp
pgsql/pgaccess/lib/help/drop_rule.hlp
pgsql/pgaccess/lib/help/drop_sequence.hlp
pgsql/pgaccess/lib/help/drop_table.hlp
pgsql/pgaccess/lib/help/drop_trigger.hlp
pgsql/pgaccess/lib/help/drop_type.hlp
pgsql/pgaccess/lib/help/drop_user.hlp
pgsql/pgaccess/lib/help/drop_view.hlp
pgsql/pgaccess/lib/help/explain.hlp
pgsql/pgaccess/lib/help/fetch.hlp
pgsql/pgaccess/lib/help/form_design.hlp
pgsql/pgaccess/lib/help/forms.hlp
pgsql/pgaccess/lib/help/functions.hlp
pgsql/pgaccess/lib/help/geomfunc.hlp
pgsql/pgaccess/lib/help/grant.hlp
pgsql/pgaccess/lib/help/history.hlp
pgsql/pgaccess/lib/help/index.hlp
pgsql/pgaccess/lib/help/inheritance.hlp
pgsql/pgaccess/lib/help/insert.hlp
pgsql/pgaccess/lib/help/ipv4func.hlp
pgsql/pgaccess/lib/help/isolation.hlp
pgsql/pgaccess/lib/help/keywords.hlp
pgsql/pgaccess/lib/help/listen.hlp
pgsql/pgaccess/lib/help/load.hlp
pgsql/pgaccess/lib/help/lock.hlp
pgsql/pgaccess/lib/help/mathfunc.hlp
pgsql/pgaccess/lib/help/move.hlp
pgsql/pgaccess/lib/help/mvcc.hlp
pgsql/pgaccess/lib/help/new_query.hlp
pgsql/pgaccess/lib/help/new_table.hlp
pgsql/pgaccess/lib/help/notify.hlp
pgsql/pgaccess/lib/help/open_query.hlp
pgsql/pgaccess/lib/help/open_table.hlp
pgsql/pgaccess/lib/help/pgfunctions.hlp
pgsql/pgaccess/lib/help/postgresql.hlp
pgsql/pgaccess/lib/help/queries.hlp
pgsql/pgaccess/lib/help/reports.hlp
pgsql/pgaccess/lib/help/reset.hlp
pgsql/pgaccess/lib/help/revoke.hlp
pgsql/pgaccess/lib/help/rollback.hlp
pgsql/pgaccess/lib/help/schema.hlp
pgsql/pgaccess/lib/help/scripts.hlp
pgsql/pgaccess/lib/help/select.hlp
pgsql/pgaccess/lib/help/select_into.hlp
pgsql/pgaccess/lib/help/sequences.hlp
pgsql/pgaccess/lib/help/set.hlp
pgsql/pgaccess/lib/help/show.hlp
pgsql/pgaccess/lib/help/sql_guide.hlp
pgsql/pgaccess/lib/help/sqlfunc.hlp
pgsql/pgaccess/lib/help/stringfunc.hlp
pgsql/pgaccess/lib/help/tables.hlp
pgsql/pgaccess/lib/help/unlisten.hlp
pgsql/pgaccess/lib/help/update.hlp
pgsql/pgaccess/lib/help/users.hlp
pgsql/pgaccess/lib/help/vacuum.hlp
pgsql/pgaccess/lib/help/view_table_structure.hlp
pgsql/pgaccess/lib/help/views.hlp
pgsql/pgaccess/lib/help/visual_designer.hlp
pgsql/pgaccess/lib/help/y2k.hlp
pgsql/pgaccess/lib/languages/francais
pgsql/pgaccess/lib/languages/italiano
pgsql/pgaccess/lib/languages/magyar
pgsql/pgaccess/lib/languages/romana
pgsql/pgaccess/images/icon_button.gif
pgsql/pgaccess/images/icon_checkbutton.gif
pgsql/pgaccess/images/icon_entry.gif
pgsql/pgaccess/images/icon_frame.gif
pgsql/pgaccess/images/icon_label.gif
pgsql/pgaccess/images/icon_listbox.gif
pgsql/pgaccess/images/icon_query.gif
pgsql/pgaccess/images/icon_radiobutton.gif
pgsql/pgaccess/images/icon_text.gif
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
share/doc/pgsql/FAQ_DEV
@ -178,6 +301,11 @@ share/doc/pgsql/programmer.ps.gz
share/doc/pgsql/tutorial.ps.gz
share/doc/pgsql/user.ps.gz
@dirrm share/doc/pgsql
@dirrm pgsql/pgaccess/lib/languages
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess
@dirrm pgsql/man/manl
@dirrm pgsql/man/man5
@dirrm pgsql/man/man3

View File

@ -10,6 +10,7 @@ pgsql/bin/ecpg
pgsql/bin/initdb
pgsql/bin/initlocation
pgsql/bin/ipcclean
pgsql/bin/pgaccess
pgsql/bin/pg_dump
pgsql/bin/pg_dumpall
pgsql/bin/pg_id
@ -137,6 +138,128 @@ pgsql/man/manl/show.l
pgsql/man/manl/sql.l
pgsql/man/manl/update.l
pgsql/man/manl/vacuum.l
pgsql/pgaccess/main.tcl
pgsql/pgaccess/lib/database.tcl
pgsql/pgaccess/lib/forms.tcl
pgsql/pgaccess/lib/functions.tcl
pgsql/pgaccess/lib/help.tcl
pgsql/pgaccess/lib/mainlib.tcl
pgsql/pgaccess/lib/preferences.tcl
pgsql/pgaccess/lib/queries.tcl
pgsql/pgaccess/lib/reports.tcl
pgsql/pgaccess/lib/schema.tcl
pgsql/pgaccess/lib/scripts.tcl
pgsql/pgaccess/lib/sequences.tcl
pgsql/pgaccess/lib/tables.tcl
pgsql/pgaccess/lib/users.tcl
pgsql/pgaccess/lib/views.tcl
pgsql/pgaccess/lib/visualqb.tcl
pgsql/pgaccess/lib/help/abort.hlp
pgsql/pgaccess/lib/help/add_records.hlp
pgsql/pgaccess/lib/help/alter_table.hlp
pgsql/pgaccess/lib/help/alter_user.hlp
pgsql/pgaccess/lib/help/author.hlp
pgsql/pgaccess/lib/help/begin.hlp
pgsql/pgaccess/lib/help/close.hlp
pgsql/pgaccess/lib/help/cluster.hlp
pgsql/pgaccess/lib/help/commit.hlp
pgsql/pgaccess/lib/help/copy.hlp
pgsql/pgaccess/lib/help/copyrights.hlp
pgsql/pgaccess/lib/help/create_aggregate.hlp
pgsql/pgaccess/lib/help/create_database.hlp
pgsql/pgaccess/lib/help/create_function.hlp
pgsql/pgaccess/lib/help/create_index.hlp
pgsql/pgaccess/lib/help/create_language.hlp
pgsql/pgaccess/lib/help/create_operator.hlp
pgsql/pgaccess/lib/help/create_rule.hlp
pgsql/pgaccess/lib/help/create_sequence.hlp
pgsql/pgaccess/lib/help/create_table.hlp
pgsql/pgaccess/lib/help/create_table_as.hlp
pgsql/pgaccess/lib/help/create_trigger.hlp
pgsql/pgaccess/lib/help/create_type.hlp
pgsql/pgaccess/lib/help/create_user.hlp
pgsql/pgaccess/lib/help/create_view.hlp
pgsql/pgaccess/lib/help/data_types.hlp
pgsql/pgaccess/lib/help/datefunc.hlp
pgsql/pgaccess/lib/help/declare.hlp
pgsql/pgaccess/lib/help/delete.hlp
pgsql/pgaccess/lib/help/drop_aggregate.hlp
pgsql/pgaccess/lib/help/drop_database.hlp
pgsql/pgaccess/lib/help/drop_function.hlp
pgsql/pgaccess/lib/help/drop_index.hlp
pgsql/pgaccess/lib/help/drop_language.hlp
pgsql/pgaccess/lib/help/drop_operator.hlp
pgsql/pgaccess/lib/help/drop_rule.hlp
pgsql/pgaccess/lib/help/drop_sequence.hlp
pgsql/pgaccess/lib/help/drop_table.hlp
pgsql/pgaccess/lib/help/drop_trigger.hlp
pgsql/pgaccess/lib/help/drop_type.hlp
pgsql/pgaccess/lib/help/drop_user.hlp
pgsql/pgaccess/lib/help/drop_view.hlp
pgsql/pgaccess/lib/help/explain.hlp
pgsql/pgaccess/lib/help/fetch.hlp
pgsql/pgaccess/lib/help/form_design.hlp
pgsql/pgaccess/lib/help/forms.hlp
pgsql/pgaccess/lib/help/functions.hlp
pgsql/pgaccess/lib/help/geomfunc.hlp
pgsql/pgaccess/lib/help/grant.hlp
pgsql/pgaccess/lib/help/history.hlp
pgsql/pgaccess/lib/help/index.hlp
pgsql/pgaccess/lib/help/inheritance.hlp
pgsql/pgaccess/lib/help/insert.hlp
pgsql/pgaccess/lib/help/ipv4func.hlp
pgsql/pgaccess/lib/help/isolation.hlp
pgsql/pgaccess/lib/help/keywords.hlp
pgsql/pgaccess/lib/help/listen.hlp
pgsql/pgaccess/lib/help/load.hlp
pgsql/pgaccess/lib/help/lock.hlp
pgsql/pgaccess/lib/help/mathfunc.hlp
pgsql/pgaccess/lib/help/move.hlp
pgsql/pgaccess/lib/help/mvcc.hlp
pgsql/pgaccess/lib/help/new_query.hlp
pgsql/pgaccess/lib/help/new_table.hlp
pgsql/pgaccess/lib/help/notify.hlp
pgsql/pgaccess/lib/help/open_query.hlp
pgsql/pgaccess/lib/help/open_table.hlp
pgsql/pgaccess/lib/help/pgfunctions.hlp
pgsql/pgaccess/lib/help/postgresql.hlp
pgsql/pgaccess/lib/help/queries.hlp
pgsql/pgaccess/lib/help/reports.hlp
pgsql/pgaccess/lib/help/reset.hlp
pgsql/pgaccess/lib/help/revoke.hlp
pgsql/pgaccess/lib/help/rollback.hlp
pgsql/pgaccess/lib/help/schema.hlp
pgsql/pgaccess/lib/help/scripts.hlp
pgsql/pgaccess/lib/help/select.hlp
pgsql/pgaccess/lib/help/select_into.hlp
pgsql/pgaccess/lib/help/sequences.hlp
pgsql/pgaccess/lib/help/set.hlp
pgsql/pgaccess/lib/help/show.hlp
pgsql/pgaccess/lib/help/sql_guide.hlp
pgsql/pgaccess/lib/help/sqlfunc.hlp
pgsql/pgaccess/lib/help/stringfunc.hlp
pgsql/pgaccess/lib/help/tables.hlp
pgsql/pgaccess/lib/help/unlisten.hlp
pgsql/pgaccess/lib/help/update.hlp
pgsql/pgaccess/lib/help/users.hlp
pgsql/pgaccess/lib/help/vacuum.hlp
pgsql/pgaccess/lib/help/view_table_structure.hlp
pgsql/pgaccess/lib/help/views.hlp
pgsql/pgaccess/lib/help/visual_designer.hlp
pgsql/pgaccess/lib/help/y2k.hlp
pgsql/pgaccess/lib/languages/francais
pgsql/pgaccess/lib/languages/italiano
pgsql/pgaccess/lib/languages/magyar
pgsql/pgaccess/lib/languages/romana
pgsql/pgaccess/images/icon_button.gif
pgsql/pgaccess/images/icon_checkbutton.gif
pgsql/pgaccess/images/icon_entry.gif
pgsql/pgaccess/images/icon_frame.gif
pgsql/pgaccess/images/icon_label.gif
pgsql/pgaccess/images/icon_listbox.gif
pgsql/pgaccess/images/icon_query.gif
pgsql/pgaccess/images/icon_radiobutton.gif
pgsql/pgaccess/images/icon_text.gif
share/doc/pgsql/FAQ
share/doc/pgsql/FAQ_AIX
share/doc/pgsql/FAQ_DEV
@ -162,6 +285,11 @@ share/doc/pgsql/programmer.ps.gz
share/doc/pgsql/tutorial.ps.gz
share/doc/pgsql/user.ps.gz
@dirrm share/doc/pgsql
@dirrm pgsql/pgaccess/lib/languages
@dirrm pgsql/pgaccess/lib/help
@dirrm pgsql/pgaccess/lib
@dirrm pgsql/pgaccess/images
@dirrm pgsql/pgaccess
@dirrm pgsql/man/manl
@dirrm pgsql/man/man5
@dirrm pgsql/man/man3
@ -178,5 +306,3 @@ share/doc/pgsql/user.ps.gz
@dirrm pgsql/include
@dirrm pgsql/bin
@dirrm pgsql
@exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m %D/pgsql/lib
@unexec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m %D/pgsql/lib