Move inclusion of bsd.pkg.mk from Makefile.common into the individual

package Makefiles.  The idiom is to define any variables, include
Makefile.common, then any additional targets, then include bsd.pkg.mk.

6 files changed, 26 insertions, 20 deletions

diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile
index d6c071e82af..ac5b67572a9 100644
--- a/graphics/freetype-lib/Makefile
+++ b/graphics/freetype-lib/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:00 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 04:06:08 jlam Exp $
 
 PKGNAME=		freetype-lib-${FT_VERS}
 COMMENT=		TrueType font rendering engine and library API
 
+USE_BUILDLINK_ONLY=	# defined
 CONFIGURE_ARGS+=	--without-x
 
-USE_BUILDLINK_ONLY=	# defined
+.include "Makefile.common"
+
 ALL_TARGET=		ttlib ttpo
 INSTALL_TARGET=		install-ttlib install-ttpo
 
-.include "Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index 21383490d57..86bbd81de38 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2001/09/09 03:37:00 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2001/09/09 04:06:09 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
 FT_VERS=		1.3.1
@@ -20,8 +20,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-locale-dir=${PREFIX}/${PKGLOCALEDIR}/locale
 
-DISTINFO_FILE=		${.CURDIR}/../../graphics/freetype-lib/distinfo
-PATCHDIR=		${.CURDIR}/../../graphics/freetype-lib/patches
+DISTINFO_FILE=		${.CURDIR}/../freetype-lib/distinfo
+PATCHDIR=		${.CURDIR}/../freetype-lib/patches
 
 .include "../../devel/gettext-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index e20913fa208..2804741fee2 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:00 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 04:06:09 jlam Exp $
 
 PKGNAME=		freetype-utils-${FT_VERS}
 COMMENT=		Utilities for manipulating TrueType fonts
@@ -7,10 +7,12 @@ BUILDLINK_DEPENDS.freetype=	freetype-lib>=${FT_VERS}
 
 USE_BUILDLINK_ONLY=	# defined
 USE_X11=		# defined
-CONFIGURE_ARGS+=	--with-x
 
+.include "../freetype-lib/Makefile.common"
+
+CONFIGURE_ARGS+=	--with-x
 ALL_TARGET=		tttest
 INSTALL_TARGET=		install-tttest
 
 .include "../../graphics/freetype-lib/buildlink.mk"
-.include "../freetype-lib/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/Makefile b/japanese/vflib-lib/Makefile
index bdd34ff4a3a..25cb411f881 100644
--- a/japanese/vflib-lib/Makefile
+++ b/japanese/vflib-lib/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:01 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/09/09 04:06:10 jlam Exp $
 
 PKGNAME=		ja-vflib-lib-${VFLIB_VERSION}
 COMMENT=		Japanese Vector font library
 
-CONFIGURE_ARGS+=	--without-x
-
 USE_BUILDLINK_ONLY=	# defined
+
+.include "Makefile.common"
+
+CONFIGURE_ARGS+=	--without-x
 ALL_TARGET=		build-src
 INSTALL_TARGET=		install-src
 
@@ -27,4 +29,4 @@ post-install:
 	cd ${WRKSRC}; ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION}
 	${CHMOD} -R a-w ${PREFIX}/share/VFlib/${VFLIB_VERSION}
 
-.include "Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index 845a2872275..9098ac90e6f 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2001/09/09 03:37:01 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2001/09/09 04:06:10 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -34,4 +34,3 @@ PATCHDIR=		${.CURDIR}/../../japanese/vflib-lib/patches
 EXTRACT_ONLY=		${VFLIB_SRC}
 
 .include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-utils/Makefile b/japanese/vflib-utils/Makefile
index 0b5398f886b..8695684a513 100644
--- a/japanese/vflib-utils/Makefile
+++ b/japanese/vflib-utils/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 03:37:01 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/09 04:06:10 jlam Exp $
 
 PKGNAME=		ja-vflib-utils-${VFLIB_VERSION}
 COMMENT=		Utilities for manipulating VFlib vector font files
 
-BUILDLINK_DEPENDS.vflib=	ja-vflib-lib>=${VFLIB_VERSION}
-
+BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
 USE_BUILDLINK_ONLY=	# defined
+
+.include "../vflib-lib/Makefile.common"
+
 USE_X11=		# defined
 CONFIGURE_ARGS+=	--enable-tools --with-x
 
@@ -13,4 +15,4 @@ ALL_TARGET=		build-tools
 INSTALL_TARGET=		install-tools
 
 .include "../../japanese/vflib-lib/buildlink.mk"
-.include "../vflib-lib/Makefile.common"
+.include "../../mk/bsd.pkg.mk"