s/wip/databases/ (hi uebayasi!)

8 files changed, 26 insertions, 26 deletions

diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index 4267ed47085..0be9c94f9af 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:50 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
 
-.include "../../wip/postgresql81/Makefile.common"
+.include "../../databases/postgresql81/Makefile.common"
 
 USE_TOOLS+=		gzip tar
 USE_LIBTOOL=		yes
@@ -42,7 +42,7 @@ BUILD_DIRS=	${INSTALL_DIRS}
 BUILD_DIRS+=	${WRKSRC}/src/backend
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql81-client
-.include "../../wip/postgresql81/options.mk"
+.include "../../databases/postgresql81/options.mk"
 
 .for _file_ in pg_service.conf psqlrc
 CONF_FILES+=	${PG_DATA_DIR}/${_file_}.sample ${PG_ETC_DIR}/${_file_}
diff --git a/databases/postgresql81-client/buildlink3.mk b/databases/postgresql81-client/buildlink3.mk
index 4c1df83cb70..dd710dfd693 100644
--- a/databases/postgresql81-client/buildlink3.mk
+++ b/databases/postgresql81-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/03/20 14:45:50 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 POSTGRESQL81_CLIENT_BUILDLINK3_MK:=	${POSTGRESQL81_CLIENT_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	postgresql81-client
 
 .if !empty(POSTGRESQL81_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.postgresql81-client+=		postgresql81-client>=8.1.0
-BUILDLINK_PKGSRCDIR.postgresql81-client?=	../../wip/postgresql81-client
+BUILDLINK_PKGSRCDIR.postgresql81-client?=	../../databases/postgresql81-client
 
 .  if defined(PG_SUBPREFIX) && !empty(PG_SUBPREFIX)
 BUILDLINK_INCDIRS.postgresql81-client?=	${PG_SUBPREFIX}/include
diff --git a/databases/postgresql81-plperl/Makefile b/databases/postgresql81-plperl/Makefile
index b28979540fd..9da9723fb56 100644
--- a/databases/postgresql81-plperl/Makefile
+++ b/databases/postgresql81-plperl/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-plperl-${BASE_VERS}
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
-DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../wip/postgresql81-server
+DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
 
-.include "../../wip/postgresql81/Makefile.common"
+.include "../../databases/postgresql81/Makefile.common"
 
 PERL5_CONFIGURE=	NO
 CONFIGURE_ARGS+=	--with-perl
@@ -16,7 +16,7 @@ MAKEFILE=		GNUmakefile
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-.include "../../wip/postgresql81-client/buildlink3.mk"
+.include "../../databases/postgresql81-client/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql81-plpython/Makefile b/databases/postgresql81-plpython/Makefile
index cd74f9d118f..c9e056fbcec 100644
--- a/databases/postgresql81-plpython/Makefile
+++ b/databases/postgresql81-plpython/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-plpython-${BASE_VERS}
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
-DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../wip/postgresql81-server
+DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
 
-.include "../../wip/postgresql81/Makefile.common"
+.include "../../databases/postgresql81/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON="${PYTHONBIN}"
@@ -15,7 +15,7 @@ BUILD_DIRS=		${WRKSRC}/src/pl/plpython
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-.include "../../wip/postgresql81-client/buildlink3.mk"
+.include "../../databases/postgresql81-client/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql81-pltcl/Makefile b/databases/postgresql81-pltcl/Makefile
index f374a9c7c25..c90fb5e5b9d 100644
--- a/databases/postgresql81-pltcl/Makefile
+++ b/databases/postgresql81-pltcl/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-pltcl-${BASE_VERS}
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
-DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../wip/postgresql81-server
+DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
 
-.include "../../wip/postgresql81/Makefile.common"
+.include "../../databases/postgresql81/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
@@ -17,7 +17,7 @@ BUILD_DIRS=		${WRKSRC}/src/pl/tcl
 USE_LIBTOOL=		yes
 PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 
-.include "../../wip/postgresql81-client/buildlink3.mk"
+.include "../../databases/postgresql81-client/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index a1023c091fb..22d1618824d 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:51 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -6,7 +6,7 @@ COMMENT=	PostgreSQL database server programs
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 
-.include "../../wip/postgresql81/Makefile.common"
+.include "../../databases/postgresql81/Makefile.common"
 
 # Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
 USE_LIBTOOL=		yes
@@ -44,7 +44,7 @@ DL_LIBS+=	-lltdl
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql81-server
 PKG_SUPPORTED_OPTIONS=	pam
-.include "../../wip/postgresql81/options.mk"
+.include "../../databases/postgresql81/options.mk"
 
 # PGUSER	username of the database administrator
 # PGGROUP	group of the database administrator
@@ -64,7 +64,7 @@ PKG_GROUPS=		${PGGROUP}
 
 RCD_SCRIPTS=		pgsql
 
-.include "../../wip/postgresql81-client/buildlink3.mk"
+.include "../../databases/postgresql81-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 # Avoid conflict between "${SSLBASE}/include/openssl/des.h" and
diff --git a/databases/postgresql81/Makefile b/databases/postgresql81/Makefile
index 3238cf90425..47f17aed2b7 100644
--- a/databases/postgresql81/Makefile
+++ b/databases/postgresql81/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/20 14:45:49 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2006/03/21 06:39:33 martti Exp $
 
 PKGNAME=	postgresql81-${BASE_VERS}
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql81-client>=${BASE_VERS}:../../wip/postgresql81-client
-DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../wip/postgresql81-server
+DEPENDS+=	postgresql81-client>=${BASE_VERS}:../../databases/postgresql81-client
+DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
 
 .include "Makefile.common"
 
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index 5841aef6b5a..5578f463a21 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2006/03/20 14:45:49 uebayasi Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/03/21 06:39:33 martti Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -9,7 +9,7 @@
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
-.include "../../wip/postgresql81/Makefile.mirrors"
+.include "../../databases/postgresql81/Makefile.mirrors"
 
 DISTNAME?=	postgresql-${DIST_VERS}
 CATEGORIES+=	databases