diff options
| author | jlam <jlam@pkgsrc.org> | 2001-09-09 04:06:08 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-09-09 04:06:08 +0000 |
| commit | a64726316fd91bfe676a449b7389cd181566a8ea (patch) | |
| tree | 3aeb4952e3988cede35e4aee4a1864e2a45ed8fd /japanese | |
| parent | 99c293f270ce92830cf3d9d0e08ad89d9d2127d5 (diff) | |
| download | pkgsrc-a64726316fd91bfe676a449b7389cd181566a8ea.tar.gz | |
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.
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/vflib-lib/Makefile | 10 | ||||
| -rw-r--r-- | japanese/vflib-lib/Makefile.common | 3 | ||||
| -rw-r--r-- | japanese/vflib-utils/Makefile | 10 |
3 files changed, 13 insertions, 10 deletions
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" |