upgrade to 7.1.2

PR:		27676
Submitted by:	maintainer

4 files changed, 50 insertions, 20 deletions

diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 4ba024eccafc..886d3edb2686 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -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 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		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)	
@@ -186,8 +192,4 @@ post-clean:
 
 post-extract: ${POSTEXTRACT}
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
 .include <bsd.port.mk>
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index c4ab6e29b6ff..84aac20dc02b 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -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
diff --git a/databases/postgresql83-server/files/patch-contrib-retep-build b/databases/postgresql83-server/files/patch-contrib-retep-build
index 30df3a0e72c9..80f40f1cc86d 100644
--- a/databases/postgresql83-server/files/patch-contrib-retep-build
+++ b/databases/postgresql83-server/files/patch-contrib-retep-build
@@ -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>
- 
diff --git a/databases/postgresql83-server/pkg-plist.doc b/databases/postgresql83-server/pkg-plist.doc
index 5f13201ae647..4d5c62aa889e 100644
--- a/databases/postgresql83-server/pkg-plist.doc
+++ b/databases/postgresql83-server/pkg-plist.doc
@@ -154,10 +154,10 @@ share/doc/postgresql/html/libpqpp-notify.html
 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-1.html
 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/user.html
 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