summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjlam <jlam>2001-09-09 04:06:08 +0000
committerjlam <jlam>2001-09-09 04:06:08 +0000
commit9525beb215bec7a6715f9ae5a4f01383c262bfae (patch)
tree3aeb4952e3988cede35e4aee4a1864e2a45ed8fd /graphics
parentd9ac3b894e82a99d71b58d03fad308f718f90217 (diff)
downloadpkgsrc-9525beb215bec7a6715f9ae5a4f01383c262bfae.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 'graphics')
-rw-r--r--graphics/freetype-lib/Makefile8
-rw-r--r--graphics/freetype-lib/Makefile.common7
-rw-r--r--graphics/freetype-utils/Makefile8
3 files changed, 13 insertions, 10 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"