some fixes

This commit is contained in:
form 1998-06-17 05:41:24 +00:00
parent 7e1f64661e
commit 83aa2b6027
3 changed files with 47 additions and 89 deletions

View File

@ -3,7 +3,7 @@
# Date created: 6 May 1998
# Whom: Oleg Safiullin <form@vs.itam.nsc.ru>
#
# $OpenBSD: Makefile,v 1.5 1998/06/10 06:06:52 form Exp $
# $OpenBSD: Makefile,v 1.6 1998/06/17 05:41:24 form Exp $
# FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp
#
@ -19,7 +19,8 @@ BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison
# postgresql with tcl support by typing: make USE_TCL=yes
.if defined(USE_TCL)
MAKE_ENV= USE_TCL=true TCL_INCDIR=${PREFIX}/include/tcl8.0
LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80
LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 \
tk80\\.1\\.:${PORTSDIR}/x11/tk80
WITH_TCL= --with-tcl
.endif
@ -56,7 +57,7 @@ MANL= abort.l alter_table.l alter_user.l begin.l close.l cluster.l \
MANPREFIX= ${PREFIX}/pgsql
pre-fetch:
pre-build:
.if !defined(USE_TCL)
@${ECHO_MSG} "To build the \"PostgreSQL to Tcl interface library\", libpgtcl, type:"
@${ECHO_MSG} " make USE_TCL=yes"
@ -64,12 +65,6 @@ pre-fetch:
@${ECHO_MSG} "Building PostgreSQL with \"libpgtcl\"."
.endif
post-build:
@ ${ECHO} "------------------------------------------------------------"
@ ${ECHO} "Dump existing databases, before installing new db version !!"
@ ${ECHO} "Detailed instructions, see INSTALL file under ${WRKDIR}... "
@ ${ECHO} "------------------------------------------------------------"
pre-install:
.if defined(PACKAGE_BUILDING)
/bin/rm -rf ${PREFIX}/pgsql
@ -101,14 +96,17 @@ post-install:
>> ${PREFIX}/pgsql/.profile; \
fi
@ chown -R pgsql:pgsql ${PREFIX}/pgsql
@ ${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'
@ ${LDCONFIG} -m ${PREFIX}/pgsql/lib
@ su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'
@ ${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl \
> ${PREFIX}/etc/rc.d/pgsql.sh
@ chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
@ chown root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh
@ ${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
@ if [ ! -d ${PREFIX}/pgsql/data ]; then \
${ECHO} 'Initializing PostgreSQL Databases - this may take a few minutes...'; \
${LDCONFIG} -m ${PREFIX}/pgsql/lib; \
su -l pgsql -c '${PREFIX}/pgsql/bin/initdb --pglib=${PREFIX}/pgsql/lib --pgdata=${PREFIX}/pgsql/data'; \
else \
${ECHO} 'Found existing PostgreSQL database(s) -- skipping database initializing...'; \
fi
${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
chown root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh
${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/pgsql
${CP} -r ${WRKDIR}/${DISTNAME}/doc/* ${PREFIX}/share/doc/pgsql

View File

@ -1,11 +1,19 @@
--- interfaces/libpgtcl/Makefile.in.orig Tue Apr 21 23:11:21 1998
+++ interfaces/libpgtcl/Makefile.in Tue Apr 21 23:11:34 1998
@@ -31,7 +31,7 @@
install-shlib-dep :=
shlib :=
*** configure.orig Wed Jun 17 10:56:00 1998
--- configure Wed Jun 17 11:08:22 1998
***************
*** 1135,1141 ****
-LIBPQ = -L $(SRCDIR)/interfaces/libpq -lpq
+LIBPQ = -L $(SRCDIR)/interfaces/libpq -lpq -lcrypt
ifeq ($(PORTNAME), linux)
ifdef LINUX_ELF
HAVECXX='HAVE_Cplusplus=false'
!
INSTALLPATH="/usr/ucb:$PATH"
for ac_prog in ginstall installbsd bsdinst scoinst install
do
--- 1135,1141 ----
HAVECXX='HAVE_Cplusplus=false'
! test "$INSTALL" && INSTALL=`echo $INSTALL |cut -f1 -d' '`
INSTALLPATH="/usr/ucb:$PATH"
for ac_prog in ginstall installbsd bsdinst scoinst install
do

View File

@ -14,62 +14,12 @@ pgsql/bin/pg_dumpall
pgsql/bin/pg_id
pgsql/bin/pg_passwd
pgsql/bin/pg_version
pgsql/bin/pgtclsh
pgsql/bin/pgtksh
@unexec rm -f %D/pgsql/bin/pgtclsh
@unexec rm -f %D/pgsql/bin/pgtksh
pgsql/bin/postgres
pgsql/bin/postmaster
pgsql/bin/psql
pgsql/data/PG_VERSION
pgsql/data/base/template1/PG_VERSION
pgsql/data/base/template1/pg_aggregate
pgsql/data/base/template1/pg_am
pgsql/data/base/template1/pg_amop
pgsql/data/base/template1/pg_amproc
pgsql/data/base/template1/pg_attrdef
pgsql/data/base/template1/pg_attrdef_adrelid_index
pgsql/data/base/template1/pg_attribute
pgsql/data/base/template1/pg_attribute_attrelid_index
pgsql/data/base/template1/pg_attribute_relid_attnam_index
pgsql/data/base/template1/pg_attribute_relid_attnum_index
pgsql/data/base/template1/pg_class
pgsql/data/base/template1/pg_class_oid_index
pgsql/data/base/template1/pg_class_relname_index
pgsql/data/base/template1/pg_description
pgsql/data/base/template1/pg_description_objoid_index
pgsql/data/base/template1/pg_index
pgsql/data/base/template1/pg_inheritproc
pgsql/data/base/template1/pg_inherits
pgsql/data/base/template1/pg_internal.init
pgsql/data/base/template1/pg_ipl
pgsql/data/base/template1/pg_language
pgsql/data/base/template1/pg_listener
pgsql/data/base/template1/pg_opclass
pgsql/data/base/template1/pg_operator
pgsql/data/base/template1/pg_parg
pgsql/data/base/template1/pg_proc
pgsql/data/base/template1/pg_proc_oid_index
pgsql/data/base/template1/pg_proc_proname_index
pgsql/data/base/template1/pg_proc_prosrc_index
pgsql/data/base/template1/pg_relcheck
pgsql/data/base/template1/pg_relcheck_rcrelid_index
pgsql/data/base/template1/pg_rewrite
pgsql/data/base/template1/pg_statistic
pgsql/data/base/template1/pg_trigger
pgsql/data/base/template1/pg_trigger_tgrelid_index
pgsql/data/base/template1/pg_type
pgsql/data/base/template1/pg_type_oid_index
pgsql/data/base/template1/pg_type_typname_index
pgsql/data/base/template1/pg_user
pgsql/data/base/template1/pg_version
pgsql/data/pg_database
pgsql/data/pg_geqo.sample
pgsql/data/pg_group
pgsql/data/pg_hba.conf
pgsql/data/pg_log
pgsql/data/pg_pwd
pgsql/data/pg_shadow
pgsql/data/pg_variable
pgsql/errlog
@unexec rm -f %D/pgsql/errlog
pgsql/include/access/attnum.h
pgsql/include/c.h
pgsql/include/commands/trigger.h
@ -79,7 +29,7 @@ pgsql/include/ecpgtype.h
pgsql/include/executor/spi.h
pgsql/include/fmgr.h
pgsql/include/lib/dllist.h
pgsql/include/libpgtcl.h
@unexec rm -f %D/pgsql/include/libpgtcl.h
pgsql/include/libpq-fe.h
pgsql/include/libpq/libpq-fs.h
pgsql/include/libpq/pqcomm.h
@ -95,9 +45,9 @@ pgsql/lib/global1.description
pgsql/lib/libecpg.a
pgsql/lib/libecpg.so
pgsql/lib/libecpg.so.1.1
pgsql/lib/libpgtcl.a
pgsql/lib/libpgtcl.so.1.0
pgsql/lib/libpgtcl.so
@unexec rm -f %D/pgsql/lib/libpgtcl.a
@unexec rm -f %D/pgsql/lib/libpgtcl.so.1.0
@unexec rm -f %D/pgsql/lib/libpgtcl.so
pgsql/lib/libpq.a
pgsql/lib/libpq.so.1.1
pgsql/lib/libpq.so
@ -276,9 +226,6 @@ share/doc/pgsql/userguide.ps
@dirrm share/doc/pgsql/src
@dirrm share/doc/pgsql
@dirrm pgsql/bin
@dirrm pgsql/data/base/template1
@dirrm pgsql/data/base
@dirrm pgsql/data
@dirrm pgsql/include/access
@dirrm pgsql/include/commands
@dirrm pgsql/include/executor
@ -295,4 +242,9 @@ share/doc/pgsql/userguide.ps
@dirrm pgsql/man/man5
@dirrm pgsql/man/manl
@dirrm pgsql/man
@dirrm pgsql
@unexec echo "***"
@unexec echo "*** Please remove /usr/local/pgsql manually, if you don't"
@unexec echo "*** want to keep existing databases. Also you should remove"
@unexec echo "*** pgsql entries from /etc/master.passwd and /etc/group"
@unexec echo "*** if won't install pgsql again."
@unexec echo "***"