Update to 7.1.2.

PR:		ports/28094
Submitted by:	Saito Tomokatsu <saito@a2z.co.jp>

Running scripts/configure.postgresql at the post-extract stage is too
late.  Do it at pre-everything to reflect added BUILD_DEPENDS entries.

5 files changed, 19 insertions, 42 deletions

diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile
index da0ce98a151..9f72b5223c8 100644
--- a/japanese/postgresql7/Makefile
+++ b/japanese/postgresql7/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.1.1.20010508
+PORTVERSION=	7.1.2
 CATEGORIES=	japanese databases
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R} \
-	ftp://ftp.postgresql.org/pub/v${PORTVERSION:R}/ \
+MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION}/ \
+	ftp://ftp.postgresql.org/pub/v${PORTVERSION}/ \
 	${MASTER_SITE_RINGSERVER}
-MASTER_SITE_SUBDIR=	misc/db/postgresql-jp/${PORTVERSION:R}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	misc/db/postgresql-jp/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
-	ftp://ftp.net-newbie.com/pub/postgres/
-PATCHFILES=	jumbo-${PORTVERSION:E}.patch.gz \
-	psqlj-${PORTVERSION:R}.diff.gz
+#PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
+PATCH_SITES=	ftp://ftp.net-newbie.com/pub/postgres/
+PATCHFILES=	psqlj-${PORTVERSION}.diff.gz
+#	jumbo-${PORTVERSION:E}.patch.gz
 PATCH_DIST_STRIP=	-p0 -d ${WRKDIR}
 
 MAINTAINER=	saito@a2z.co.jp
@@ -95,7 +95,7 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-pre-extract:
+pre-everything:
 	@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
 
 pre-install:
@@ -190,7 +190,7 @@ post-install:
 .endif
 
 post-clean:
-	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+	@ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/work/Makefile.inc
 
 post-extract: ${POSTEXTRACT}
 
diff --git a/japanese/postgresql7/distinfo b/japanese/postgresql7/distinfo
index 06f5622f8f4..4a7ca09eb7f 100644
--- a/japanese/postgresql7/distinfo
+++ b/japanese/postgresql7/distinfo
@@ -1,3 +1,2 @@
-MD5 (postgresql/postgresql-7.1.1.tar.gz) = e7156d50776d306512a0329f15f37655
-MD5 (postgresql/jumbo-20010508.patch.gz) = d744a658e740a09e4ffe120757008cf6
-MD5 (postgresql/psqlj-7.1.1.diff.gz) = b8c1deda4a2440bc4b1443d210573bcf
+MD5 (postgresql/postgresql-7.1.2.tar.gz) = 8e2e4319828a8a38492c3ce06726237c
+MD5 (postgresql/psqlj-7.1.2.diff.gz) = f596edc4f16b9bc7ce5fb65e8ed2bbf3
diff --git a/japanese/postgresql7/files/patch-bd b/japanese/postgresql7/files/patch-bd
deleted file mode 100644
index 95e6d276b74..00000000000
--- a/japanese/postgresql7/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Sat Apr 14 06:22:46 2001
-+++ ./configure	Thu May  3 21:42:09 2001
-@@ -3053,7 +3053,7 @@
- 
- if test "$with_tk" = yes; then
-     # Extract the first word of "wish", so it can be a program name with args.
--set dummy wish; ac_word=$2
-+set dummy wish8.0jp; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:3059: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then
diff --git a/japanese/postgresql7/files/patch-jdbc1-statement b/japanese/postgresql7/files/patch-jdbc1-statement
deleted file mode 100644
index 41a9a2971f5..00000000000
--- a/japanese/postgresql7/files/patch-jdbc1-statement
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java~	Fri Feb 23 19:12:23 2001
-+++ src/interfaces/jdbc/org/postgresql/jdbc1/Statement.java	Wed Apr 18 08:51:03 2001
-@@ -288,8 +288,8 @@
- 	 */
- 	public java.sql.ResultSet getResultSet() throws SQLException
- 	{
--          if (result != null) && ((org.postgresql.ResultSet)result.reallyResultSet())
--            return result;
-+          if (result != null && ((org.postgresql.ResultSet)result).reallyResultSet())
-+	    return result;
-           return null;
- 	}
- 
diff --git a/japanese/postgresql7/pkg-plist.doc b/japanese/postgresql7/pkg-plist.doc
index 34366cec7aa..5acc8cdabc2 100644
--- a/japanese/postgresql7/pkg-plist.doc
+++ b/japanese/postgresql7/pkg-plist.doc
@@ -152,12 +152,12 @@ share/doc/postgresql/html/libpqpp-copy.html
 share/doc/postgresql/html/libpqpp-exec.html
 share/doc/postgresql/html/libpqpp-notify.html
 share/doc/postgresql/html/lisp.html
-share/doc/postgresql/html/ln11307.html
 share/doc/postgresql/html/ln1274.html
-share/doc/postgresql/html/ln15103.html
+share/doc/postgresql/html/ln11330.html
+share/doc/postgresql/html/ln15168.html
+share/doc/postgresql/html/ln24997.html
 share/doc/postgresql/html/ln24.html
-share/doc/postgresql/html/ln24896.html
-share/doc/postgresql/html/ln37046.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,6 +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/x14501.html
 share/doc/postgresql/html/xact-read-committed.html
 share/doc/postgresql/html/xact-serializable.html
 share/doc/postgresql/html/xaggr.html