Update to 7.0.3. psqlj has been added.

PR:		ports/23290
Submitted by:	Saito Tomokatsu <saito@a2z.co.jp> (MAINTAINER)

6 files changed, 30 insertions, 16 deletions

diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 0a95f01..41df823 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -6,21 +6,26 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.0.2.20001025
+PORTVERSION=	7.0.3.20001204
 CATEGORIES=	japanese databases
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/v${PORTVERSION:R}/ \
 		ftp://ftp.postgresql.org/pub/v${PORTVERSION:R}/ \
-		${MASTER_SITE_RINGSERVER}
+		${MASTER_SITE_RINGSERVER:R}
 MASTER_SITE_SUBDIR=	misc/db/postgresql-jp/${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jumbo-${PORTVERSION:E}.patch.gz
 DIST_SUBDIR=	postgresql
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
+		ftp://ftp.18software.co.jp/pub/postgres/
+PATCHFILES=	jumbo-${PORTVERSION:E}.patch.gz \
+		psqlj-${PORTVERSION:R}.diff.gz
+PATCH_DIST_STRIP=	-p0 -d ${WRKDIR}
 
 MAINTAINER=	saito@a2z.co.jp
 
+BUILD_DEPENDS=	${PATCH}:${PORTSDIR}/devel/patch
+
 .if ${MACHINE_ARCH} == "alpha"
 BROKEN=		doesn\'t build on the alpha yet
 .endif
@@ -59,6 +64,7 @@ SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCDIR=		${WRKDIR}/${DISTNAME}/doc
 
+PATCH=		${LOCALBASE}/bin/patch
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
@@ -134,7 +140,6 @@ pre-fetch:
 .endif
 
 post-patch:
-	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/jumbo-${PORTVERSION:E}.patch.gz | ${PATCH} ${PATCH_ARGS} -d ${WRKDIR} 2> /dev/null || exit 0
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
 	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \
 		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \
diff --git a/japanese/postgresql-tcltk/distinfo b/japanese/postgresql-tcltk/distinfo
index 97f8427..c5af8d1 100644
--- a/japanese/postgresql-tcltk/distinfo
+++ b/japanese/postgresql-tcltk/distinfo
@@ -1,2 +1,3 @@
-MD5 (postgresql/postgresql-7.0.2.tar.gz) = fc512e38394256e2749299fdd69a937e
-MD5 (postgresql/jumbo-20001025.patch.gz) = c00f6578bba3522c90115412d53293aa
+MD5 (postgresql/postgresql-7.0.3.tar.gz) = b416c04e6c91967160dfde866293ee6f
+MD5 (postgresql/jumbo-20001204.patch.gz) = 33cc7445672f716aad5271a346a047d9
+MD5 (postgresql/psqlj-7.0.3.diff.gz) = 7829c90358532bd232d744909283d9e1
diff --git a/japanese/postgresql-tcltk/pkg-plist b/japanese/postgresql-tcltk/pkg-plist
index 9992da1..5c17666 100644
--- a/japanese/postgresql-tcltk/pkg-plist
+++ b/japanese/postgresql-tcltk/pkg-plist
@@ -21,6 +21,7 @@ pgsql/bin/pg_version
 pgsql/bin/postgres
 pgsql/bin/postmaster
 pgsql/bin/psql
+pgsql/bin/psqlj
 pgsql/bin/vacuumdb
 pgsql/data/PG_VERSION
 pgsql/data/base/template1/PG_VERSION
diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile
index 0a95f01..41df823 100644
--- a/japanese/postgresql7/Makefile
+++ b/japanese/postgresql7/Makefile
@@ -6,21 +6,26 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.0.2.20001025
+PORTVERSION=	7.0.3.20001204
 CATEGORIES=	japanese databases
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
 		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/v${PORTVERSION:R}/ \
 		ftp://ftp.postgresql.org/pub/v${PORTVERSION:R}/ \
-		${MASTER_SITE_RINGSERVER}
+		${MASTER_SITE_RINGSERVER:R}
 MASTER_SITE_SUBDIR=	misc/db/postgresql-jp/${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jumbo-${PORTVERSION:E}.patch.gz
 DIST_SUBDIR=	postgresql
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION:R}/patches/ \
+		ftp://ftp.18software.co.jp/pub/postgres/
+PATCHFILES=	jumbo-${PORTVERSION:E}.patch.gz \
+		psqlj-${PORTVERSION:R}.diff.gz
+PATCH_DIST_STRIP=	-p0 -d ${WRKDIR}
 
 MAINTAINER=	saito@a2z.co.jp
 
+BUILD_DEPENDS=	${PATCH}:${PORTSDIR}/devel/patch
+
 .if ${MACHINE_ARCH} == "alpha"
 BROKEN=		doesn\'t build on the alpha yet
 .endif
@@ -59,6 +64,7 @@ SCRIPTS_ENV+=	JAVA_HOME=${JAVA_HOME}
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCDIR=		${WRKDIR}/${DISTNAME}/doc
 
+PATCH=		${LOCALBASE}/bin/patch
 USE_GMAKE=	YES
 MAKEFILE=	GNUmakefile
 HAS_CONFIGURE=	YES
@@ -134,7 +140,6 @@ pre-fetch:
 .endif
 
 post-patch:
-	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/jumbo-${PORTVERSION:E}.patch.gz | ${PATCH} ${PATCH_ARGS} -d ${WRKDIR} 2> /dev/null || exit 0
 	@ ${MV} ${WRKSRC}/template/freebsd ${WRKSRC}/template/freebsd.orig
 	@ ${SED} -e 's#CFLAGS:-O2 -m486 -pipe#CFLAGS:${CFLAGS}#' \
 		-e 's#USE_LOCALE:no#USE_LOCALE:yes#' \
diff --git a/japanese/postgresql7/distinfo b/japanese/postgresql7/distinfo
index 97f8427..c5af8d1 100644
--- a/japanese/postgresql7/distinfo
+++ b/japanese/postgresql7/distinfo
@@ -1,2 +1,3 @@
-MD5 (postgresql/postgresql-7.0.2.tar.gz) = fc512e38394256e2749299fdd69a937e
-MD5 (postgresql/jumbo-20001025.patch.gz) = c00f6578bba3522c90115412d53293aa
+MD5 (postgresql/postgresql-7.0.3.tar.gz) = b416c04e6c91967160dfde866293ee6f
+MD5 (postgresql/jumbo-20001204.patch.gz) = 33cc7445672f716aad5271a346a047d9
+MD5 (postgresql/psqlj-7.0.3.diff.gz) = 7829c90358532bd232d744909283d9e1
diff --git a/japanese/postgresql7/pkg-plist b/japanese/postgresql7/pkg-plist
index 9992da1..5c17666 100644
--- a/japanese/postgresql7/pkg-plist
+++ b/japanese/postgresql7/pkg-plist
@@ -21,6 +21,7 @@ pgsql/bin/pg_version
 pgsql/bin/postgres
 pgsql/bin/postmaster
 pgsql/bin/psql
+pgsql/bin/psqlj
 pgsql/bin/vacuumdb
 pgsql/data/PG_VERSION
 pgsql/data/base/template1/PG_VERSION