summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql74-client/Makefile4
-rw-r--r--databases/postgresql74-contrib/Makefile4
-rw-r--r--databases/postgresql74-docs/Makefile4
-rw-r--r--databases/postgresql74-lib/Makefile4
-rw-r--r--databases/postgresql74-lib/buildlink3.mk20
-rw-r--r--databases/postgresql74-server/Makefile6
-rw-r--r--databases/postgresql74/Makefile10
-rw-r--r--databases/postgresql74/Makefile.common10
-rw-r--r--databases/postgresql74/distinfo4
9 files changed, 34 insertions, 32 deletions
diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index 99619d35abb..5f254c771f9 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-client-${BASE_VERS}
+PKGNAME= postgresql74-client-${BASE_VERS}
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database client programs
diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile
index 1605bb0fcd7..ca60cd44aca 100644
--- a/databases/postgresql74-contrib/Makefile
+++ b/databases/postgresql74-contrib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2004/06/11 10:40:56 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-contrib-${BASE_VERS}
+PKGNAME= postgresql74-contrib-${BASE_VERS}
SVR4_PKGNAME= pstgc
COMMENT= PostgreSQL database contrib programs
diff --git a/databases/postgresql74-docs/Makefile b/databases/postgresql74-docs/Makefile
index 87d455f228c..e3cff8fb451 100644
--- a/databases/postgresql74-docs/Makefile
+++ b/databases/postgresql74-docs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-docs-${BASE_VERS}
+PKGNAME= postgresql74-docs-${BASE_VERS}
SVR4_PKGNAME= pstgd
COMMENT= PostgreSQL database system documentation
diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile
index 9d6a72592bb..19cdcbd2c0f 100644
--- a/databases/postgresql74-lib/Makefile
+++ b/databases/postgresql74-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-lib-${BASE_VERS}
+PKGNAME= postgresql74-lib-${BASE_VERS}
SVR4_PKGNAME= pstgl
COMMENT= PostgreSQL database headers and libraries
diff --git a/databases/postgresql74-lib/buildlink3.mk b/databases/postgresql74-lib/buildlink3.mk
index 24c936a0afd..1916dddf07a 100644
--- a/databases/postgresql74-lib/buildlink3.mk
+++ b/databases/postgresql74-lib/buildlink3.mk
@@ -1,20 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/07/24 22:44:12 recht Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+
+POSTGRESQL74_LIB_BUILDLINK3_MK:= ${POSTGRESQL74_LIB_BUILDLINK3_MK}+
.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= postgresql-lib
+BUILDLINK_DEPENDS+= postgresql74-lib
.endif
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql-lib}
-BUILDLINK_PACKAGES+= postgresql-lib
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npostgresql74-lib}
+BUILDLINK_PACKAGES+= postgresql74-lib
-.if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql-lib+= postgresql-lib>=7.4.3
-BUILDLINK_PKGSRCDIR.postgresql-lib?= ../../databases/postgresql74-lib
-BUILDLINK_INCDIRS.postgresql-lib?= include/postgresql
-.endif # POSTGRESQL_LIB_BUILDLINK3_MK
+.if !empty(POSTGRESQL74_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.postgresql74-lib+= postgresql74-lib>=7.4.3
+BUILDLINK_PKGSRCDIR.postgresql74-lib?= ../../databases/postgresql74-lib
+BUILDLINK_INCDIRS.postgresql74-lib?= include/postgresql
+.endif # POSTGRESQL74_LIB_BUILDLINK3_MK
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index f3c3168bc7e..0dd3e07e2f3 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2004/05/13 22:09:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-server-${BASE_VERS}
+PKGNAME= postgresql74-server-${BASE_VERS}
SVR4_PKGNAME= pstgs
COMMENT= PostgreSQL database server programs
-DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql74-client
+DEPENDS+= postgresql74-client>=${BASE_VERS}:../../databases/postgresql74-client
# mips has no TAS implementation
NOT_FOR_PLATFORM= *-*-mips
diff --git a/databases/postgresql74/Makefile b/databases/postgresql74/Makefile
index 45eecca7051..1acdc150e48 100644
--- a/databases/postgresql74/Makefile
+++ b/databases/postgresql74/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: Makefile,v 1.4 2004/07/24 22:44:12 recht Exp $
-PKGNAME= postgresql-${BASE_VERS}
+PKGNAME= postgresql74-${BASE_VERS}
COMMENT= Robust, next generation, object-relational DBMS
-DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql74-client
-DEPENDS+= postgresql-server>=${BASE_VERS}:../../databases/postgresql74-server
-DEPENDS+= postgresql-docs>=${BASE_VERS}:../../databases/postgresql74-docs
+DEPENDS+= postgresql74-client>=${BASE_VERS}:../../databases/postgresql74-client
+DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server
+DEPENDS+= postgresql74-docs>=${BASE_VERS}:../../databases/postgresql74-docs
.include "Makefile.common"
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index dc44ac89836..744f8c18b5e 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/06/27 16:38:32 recht Exp $
+# $NetBSD: Makefile.common,v 1.9 2004/07/24 22:44:12 recht Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -22,7 +22,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER?= recht@NetBSD.org
HOMEPAGE?= http://www.postgresql.org/
-CONFLICTS+= postgresql-[0-6]* postgresql-7.0*
+CONFLICTS+= postgresql-[0-9]* postgresql73-[0-9]*
DISTINFO_FILE?= ${.CURDIR}/../postgresql74/distinfo
COMMON_FILESDIR?= ${.CURDIR}/../postgresql74/files
@@ -37,8 +37,8 @@ PATCHDIR?= ${.CURDIR}/../postgresql74/patches
DIST_VERS?= 7.4.3
BASE_VERS?= ${DIST_VERS}
-BUILDLINK_DEPENDS.postgresql-lib?= postgresql-lib>=${BASE_VERS}
-BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=${BASE_VERS}
+BUILDLINK_DEPENDS.postgresql74-lib?= postgresql74-lib>=${BASE_VERS}
+#BUILDLINK_DEPENDS.tcl-postgresql74?= tcl-postgresq74l>=${BASE_VERS}
USE_BUILDLINK3= yes
GNU_CONFIGURE= yes
@@ -59,7 +59,7 @@ SUBST_SED.pkglocaledir2= -e 's|\( localedir[ :]*=\).*|\1${_PKGLOCALEDIR}|'
# see http://gppl.terminal.ru/README.html for details.
.if defined(PGSQL_USE_HIER) && !empty(PGSQL_USE_HIER:M[yY][eE][sS])
PATCH_SITES= http://gppl.terminal.ru/
-PATCHFILES= hier-Pg7.4-0.5.2.tar.gz
+PATCHFILES= hier-Pg7.4-0.5.3.tar.gz
PATCH_DIST_STRIP= -p1
.endif
BUILD_DEFS+= PGSQL_USE_HIER
diff --git a/databases/postgresql74/distinfo b/databases/postgresql74/distinfo
index 2b619f4469d..6d87e0dcb3d 100644
--- a/databases/postgresql74/distinfo
+++ b/databases/postgresql74/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/06/27 16:38:32 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/07/24 22:44:12 recht Exp $
SHA1 (postgresql-7.4.3.tar.bz2) = 26df04f0a32a482646850d9b34d95509c97cb585
Size (postgresql-7.4.3.tar.bz2) = 10149755 bytes
+SHA1 (hier-Pg7.4-0.5.3.tar.gz) = 5b99167a9a87130cc2b7f582e28e3aef6f7f67b3
+Size (hier-Pg7.4-0.5.3.tar.gz) = 34662 bytes
SHA1 (patch-aa) = e9b99b04c02b3f04d21144a22489618948c378a8
SHA1 (patch-ab) = f44a544c56452bad197a88cb827e88624c54656c
SHA1 (patch-ac) = 39ce96f3ea9fc1167c8d21168fd1536077898d58