Date: Sun, 27 May 2001 05:25:44 +0200 (CEST) From: girgen@partitur.se To: FreeBSD-gnats-submit@freebsd.org Subject: ports/27676: databases/postgresql7, fix and upgrade to 7.1.2 Message-ID: <200105270325.f4R3Pid44193@palle.girgensohn.se>
next in thread | raw e-mail | index | archive | help
>Number: 27676 >Category: ports >Synopsis: databases/postgresql7, fix and upgrade to 7.1.2 >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 26 20:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 4.3-STABLE i386 >Organization: Partitur >Environment: System: FreeBSD palle.girgensohn.se 4.3-STABLE FreeBSD 4.3-STABLE #0: Sat May 19 03:59:57 CEST 2001 girgen@palle.girgensohn.se:/usr/obj/usr/src/sys/STORDATAN i386 >Description: Latest patch to Makefile broke the installation, since (pre|post)-install requires the Makefile.inc file to be included before these targets. I can't reproduce any errors when moving the inclusion to before the pre-extract, but since someone seems to have had problems including the Makefile.inc "before it is created", include it after creating the file but before using it. Maybe this is the best solution? Also, upgrading postgresql to 7.1.2 >How-To-Repeat: Try to install with for example JDBC, the jar will not get installed in share/java/classes as expected. >Fix: cvs remove files/patch-jdbc1-statement and apply this patch: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/Makefile,v retrieving revision 1.81 diff -u -u -r1.81 Makefile --- Makefile 2001/05/24 13:26:47 1.81 +++ Makefile 2001/05/27 01:49:34 @@ -6,7 +6,7 @@ # PORTNAME= postgresql -PORTVERSION= 7.1.1 +PORTVERSION= 7.1.2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -87,9 +87,15 @@ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-fetch: +pre-extract: @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql +# We must .include here because we need the Makefile.inc @ pre-install, +# but it is created @ pre-extract +.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) +.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" +.endif + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) @@ -185,9 +191,5 @@ @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc post-extract: ${POSTEXTRACT} - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/distinfo,v retrieving revision 1.18 diff -u -u -r1.18 distinfo --- distinfo 2001/05/09 06:00:36 1.18 +++ distinfo 2001/05/27 00:46:35 @@ -1,3 +1,3 @@ -MD5 (postgresql/postgresql-base-7.1.1.tar.gz) = 7f579a6274d5b5e251b256c7525f861b -MD5 (postgresql/postgresql-opt-7.1.1.tar.gz) = 3b06dc74de6721a3fcd7c9d8c4c0bce8 -MD5 (postgresql/postgresql-docs-7.1.1.tar.gz) = 9daf2d044b0805aa2d47df769cfa4069 +MD5 (postgresql/postgresql-base-7.1.2.tar.gz) = 06e2a51d5df202b5002b6596636e090f +MD5 (postgresql/postgresql-opt-7.1.2.tar.gz) = a8adc15926348dd4ccee583a6cc55ac2 +MD5 (postgresql/postgresql-docs-7.1.2.tar.gz) = a0c7c074dcdcef092cf548e5fbf13bb5 Index: pkg-plist.doc =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/pkg-plist.doc,v retrieving revision 1.4 diff -u -u -r1.4 pkg-plist.doc --- pkg-plist.doc 2001/05/09 06:00:36 1.4 +++ pkg-plist.doc 2001/05/27 01:31:13 @@ -154,10 +154,10 @@ share/doc/postgresql/html/lisp.html share/doc/postgresql/html/ln11330.html share/doc/postgresql/html/ln1274.html -share/doc/postgresql/html/ln15154.html +share/doc/postgresql/html/ln15168.html share/doc/postgresql/html/ln24.html -share/doc/postgresql/html/ln24983.html -share/doc/postgresql/html/ln37149.html +share/doc/postgresql/html/ln24997.html +share/doc/postgresql/html/ln37163.html share/doc/postgresql/html/ln8.html share/doc/postgresql/html/lo-funcs.html share/doc/postgresql/html/lo-implementation.html @@ -334,6 +334,7 @@ share/doc/postgresql/html/release-7-0-2.html share/doc/postgresql/html/release-7-0-3.html share/doc/postgresql/html/release-7-0.html +share/doc/postgresql/html/release-7-1-1.html share/doc/postgresql/html/release.html share/doc/postgresql/html/relmodel-formal.html share/doc/postgresql/html/relmodel-oper.html @@ -471,7 +472,7 @@ share/doc/postgresql/html/wal-configuration.html share/doc/postgresql/html/wal-implementation.html share/doc/postgresql/html/wal.html -share/doc/postgresql/html/x14487.html +share/doc/postgresql/html/x14501.html share/doc/postgresql/html/xact-read-committed.html share/doc/postgresql/html/xact-serializable.html share/doc/postgresql/html/xaggr.html Index: files/patch-contrib-retep-build =================================================================== RCS file: /home/ncvs/ports/databases/postgresql7/files/patch-contrib-retep-build,v retrieving revision 1.1 diff -u -u -r1.1 patch-contrib-retep-build --- files/patch-contrib-retep-build 2001/04/21 11:34:33 1.1 +++ files/patch-contrib-retep-build 2001/05/27 01:16:25 @@ -1,10 +1,37 @@ ---- contrib/retep/build.xml~ Fri Mar 16 22:50:36 2001 -+++ contrib/retep/build.xml Wed Apr 18 09:24:20 2001 -@@ -38,6 +38,7 @@ - <target name="compile" depends="checks,prepare"> +=================================================================== +RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/retep/build.xml,v +retrieving revision 1.4 +retrieving revision 1.5 +diff -u -r1.4 -r1.5 +--- contrib/retep/build.xml 2001/03/11 11:06:59 1.4 ++++ contrib/retep/build.xml 2001/05/16 16:20:51 1.5 +@@ -2,7 +2,7 @@ + + build file to build the donated retep tools packages + +- $Id: build.xml,v 1.4 2001/03/11 11:06:59 petere Exp $ ++ $Id: build.xml,v 1.5 2001/05/16 16:20:51 momjian Exp $ + + --> + +@@ -22,6 +22,11 @@ + <available property="xml" classname="org.xml.sax.Parser" /> + </target> + ++ <target name="warning" depends="checks" unless="jdk1.2+"> ++ <echo message="WARNING -- contributed retep tools need jdk1.2 or later -- compilation NOT done." /> ++ </target> ++ ++ + <!-- Prepares the build by creating a directory to place the class files --> + <target name="prepare"> + <mkdir dir="${dest}" /> +@@ -35,7 +40,7 @@ + </target> + + <!-- Builds the XML Tools --> +- <target name="compile" depends="checks,prepare"> ++ <target name="compile" depends="checks,prepare,warning" if="jdk1.2+"> <javac srcdir="${src}" destdir="${dest}"> <include name="${package}/**" /> -+ <exclude name="${package}/**" unless="jdk1.2+" /> </javac> - </target> - >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105270325.f4R3Pid44193>