Move inclusion of bsd.pkg.mk from Makefile.common to individual package

Makefiles.  Move the inclusion of Makefile.common to the top of the
individual Makefiles.

6 files changed, 23 insertions, 19 deletions

diff --git a/devel/prc-tools-base/Makefile b/devel/prc-tools-base/Makefile
index 524823eb3fd..95f177382dc 100644
--- a/devel/prc-tools-base/Makefile
+++ b/devel/prc-tools-base/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/27 05:07:34 jlam Exp $
 #
 
-PKGNAME=	prc-tools-base-${PRC_TOOLS_VERS}
+.include "../../devel/prc-tools/Makefile.common"
 
+PKGNAME=	prc-tools-base-${PRC_TOOLS_VERS}
 COMMENT=	object files and documentation for GNU tool chain for Palm cross development
 
 DEPENDS+=	prc-tools-gcc>=2.0:../../devel/prc-tools-gcc
 DEPENDS+=	palmos-includes>=3.5.1:../../devel/palmos-includes
 
-.include "../../devel/prc-tools/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools-binutils/Makefile b/devel/prc-tools-binutils/Makefile
index 8f6847d4a88..7374c09cef4 100644
--- a/devel/prc-tools-binutils/Makefile
+++ b/devel/prc-tools-binutils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/27 05:07:34 jlam Exp $
 #
 
-PKGNAME=	prc-tools-binutils-${PRC_TOOLS_VERS}
+.include "../../devel/prc-tools/Makefile.common"
 
+PKGNAME=	prc-tools-binutils-${PRC_TOOLS_VERS}
 COMMENT=	binutils and host tools for GNU tool chain for Palm cross development
 
 BASE_DIST=	binutils
@@ -10,4 +11,4 @@ BASE_VERS=	2.9.1
 
 USE_LIBINTL=	YES
 
-.include "../../devel/prc-tools/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools-gcc/Makefile b/devel/prc-tools-gcc/Makefile
index 9ddb9c89223..a469e64abd9 100644
--- a/devel/prc-tools-gcc/Makefile
+++ b/devel/prc-tools-gcc/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2001/04/30 15:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/27 05:07:34 jlam Exp $
 #
 
+.include "../../devel/prc-tools/Makefile.common"
+
 PKGNAME=	prc-tools-gcc-${PRC_TOOLS_VERS}
+COMMENT=	gcc for GNU tool chain for Palm cross development
 
 BASE_DIST=	gcc
 BASE_VERS=	2.95.2
 
-DEPENDS+=	prc-tools-binutils>=2.0:../../devel/prc-tools-binutils
 BUILD_DEPENDS+=	autoconf-*:../../devel/autoconf
-
-COMMENT=	gcc for GNU tool chain for Palm cross development
+DEPENDS+=	prc-tools-binutils>=2.0:../../devel/prc-tools-binutils
 
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
@@ -17,4 +18,4 @@ INSTALL_TARGET=	install-gcc
 post-install:
 	@${RMDIR} ${PREFIX}/m68k-palmos/include
 
-.include "../../devel/prc-tools/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools-gdb/Makefile b/devel/prc-tools-gdb/Makefile
index c709f2b2d48..26d9e5ffd17 100644
--- a/devel/prc-tools-gdb/Makefile
+++ b/devel/prc-tools-gdb/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/06/27 05:07:35 jlam Exp $
 #
 
-PKGNAME=	prc-tools-gdb-${PRC_TOOLS_VERS}
+.include "../../devel/prc-tools/Makefile.common"
 
+PKGNAME=	prc-tools-gdb-${PRC_TOOLS_VERS}
 COMMENT=	gdb for GNU tool chain for Palm cross development
 
 BASE_DIST=	gdb
@@ -13,4 +14,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/gdb/gdb/gdb.1 \
 		${PREFIX}/man/man1/m68k-palmos-gdb.1
 
-.include "../../devel/prc-tools/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 0d9eff33871..7729bf97e94 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/11 11:13:21 dillo Exp $
+# $NetBSD: Makefile,v 1.3 2001/06/27 05:07:33 jlam Exp $
 #
 
+.include "Makefile.common"
+
 COMMENT=	GNU tool chain for Palm cross development
 
 MASTER_SITES=   # empty
@@ -18,4 +20,4 @@ NO_BUILD=       yes
 
 do-install:     # empty
 
-.include "Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools/Makefile.common b/devel/prc-tools/Makefile.common
index 7d4453bf505..73e5d9d8919 100644
--- a/devel/prc-tools/Makefile.common
+++ b/devel/prc-tools/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2001/04/25 17:39:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/06/27 05:07:34 jlam Exp $
 #
 
 DISTNAME=	prc-tools-${PRC_TOOLS_VERS}
@@ -27,5 +27,3 @@ post-extract:
 	cd ${WRKDIR} && ${PATCH} --quiet -p0 < ${WRKSRC}/${DIFF_FILE}
 	${LN} -s ../${BASE_DIST}-${BASE_VERS} ${WRKSRC}/${BASE_DIST}
 .endif
-
-.include "../../mk/bsd.pkg.mk"