Specify the category when including other files and when depending on other

packages.  From PR pkg/21864 by ccatrian at eml.cc.

5 files changed, 12 insertions, 12 deletions

diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index ac13ad14e33..f1bdd756981 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2003/09/17 21:03:07 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2003/09/18 16:25:14 jmmv Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		5
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL, a free SQL database (server)
 
-.include "../mysql-client/Makefile.common"
+.include "../databases/mysql-client/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-libwrap
 CONFIGURE_ARGS+=	--without-berkeley-db
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index c5c830a8bc1..6d1f4ece2f8 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:16 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/18 16:25:16 jmmv Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 SVR4_PKGNAME=		pstgc
 COMMENT=		PostgreSQL database client programs
 
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-zlib
@@ -28,7 +28,7 @@ post-install:
 	cd ${PREFIX}/man && 						\
 		${PAX} -O -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
 
-.include "../postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 11a3dde43e7..bc04de45117 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/25 15:13:48 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/18 16:25:17 jmmv Exp $
 
 PKGNAME=		postgresql-docs-${BASE_VERS}
 SVR4_PKGNAME=		pstgd
 COMMENT=		PostgreSQL database system documentation
 
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
 
 BUILD_DIRS=		${WRKSRC}/doc
 DOCDIR=			${PREFIX}/share/doc/postgresql
diff --git a/databases/postgresql-lib/Makefile b/databases/postgresql-lib/Makefile
index 9c7acf987b1..e36edadd569 100644
--- a/databases/postgresql-lib/Makefile
+++ b/databases/postgresql-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2003/03/25 15:13:48 cjep Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/18 16:25:18 jmmv Exp $
 
 PKGNAME=		postgresql-lib-${BASE_VERS}
 SVR4_PKGNAME=		pstgl
 COMMENT=		PostgreSQL database headers and libraries
 
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 BUILD_DIRS=		${WRKSRC}/src/include
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index dfe81e41fe5..39610a18afc 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/08/30 22:51:14 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2003/09/18 16:25:19 jmmv Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
@@ -10,7 +10,7 @@ DEPENDS+=		postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
 # mips has no TAS implementation
 NOT_FOR_PLATFORM=	*-*-mips
 
-.include "../postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.common"
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
@@ -68,5 +68,5 @@ post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
 
-.include "../postgresql-lib/buildlink2.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"