From 1cfc32a206c5dc27c4a95c6a26eb8a22a6133cd2 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Thu, 7 Sep 2006 17:19:41 +0000
Subject: Specify *_TARGET instead of patch to Makefile. Suggested by Jukka
 Salmi via private mail.

---
 fonts/terminus-font/Makefile         |  5 ++++-
 fonts/terminus-font/distinfo         |  3 +--
 fonts/terminus-font/patches/patch-aa | 27 ---------------------------
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 fonts/terminus-font/patches/patch-aa

diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index 983e2d99e66..ba580b29464 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/07 17:13:17 obache Exp $
+# $NetBSD: Makefile,v 1.3 2006/09/07 17:19:41 obache Exp $
 #
 
 DISTNAME=		terminus-font-4.20
@@ -14,6 +14,9 @@ USE_TOOLS+=		perl bdftopcf gzip
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--x11dir=${PREFIX}/lib/X11/fonts/misc
 
+BUILD_TARGET=		pcf
+INSTALL_TARGET=		install-pcf
+
 FONTS_DIRS.x11=		${PREFIX}/lib/X11/fonts/misc
 REQD_DIRS+=		${PREFIX}/lib/X11/fonts/misc
 
diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
index 33c5297bcfc..4c546f6e1b2 100644
--- a/fonts/terminus-font/distinfo
+++ b/fonts/terminus-font/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/06 14:01:17 obache Exp $
+$NetBSD: distinfo,v 1.2 2006/09/07 17:19:41 obache Exp $
 
 SHA1 (terminus-font-4.20.tar.gz) = f8215f8236e72423c4720956587cbda4eeea9176
 RMD160 (terminus-font-4.20.tar.gz) = f7e8a3d6990d036d00c748dbb5ba466e3694e708
 Size (terminus-font-4.20.tar.gz) = 201816 bytes
-SHA1 (patch-aa) = 24349912ec279f5551acfae8f4cf14bd0abecbad
diff --git a/fonts/terminus-font/patches/patch-aa b/fonts/terminus-font/patches/patch-aa
deleted file mode 100644
index c061e25a6ba..00000000000
--- a/fonts/terminus-font/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/09/06 14:01:17 obache Exp $
-
---- Makefile.orig	2005-05-03 19:04:32.000000000 +0000
-+++ Makefile
-@@ -69,7 +69,7 @@ PCF_32N	= ter-132n.pcf ter-232n.pcf ter-
- PCF_32B	= ter-132b.pcf ter-232b.pcf ter-532b.pcf ter-932b.pcf ter-c32b.pcf ter-d32b.pcf ter-f32b.pcf ter-g32b.pcf ter-k32b.pcf ter-p32b.pcf ter-u32b.pcf ter-x32b.pcf
- PCF	= $(PCF_12N) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
- 
--all: $(PSF) $(PCF)
-+all: $(PCF)
- psf: $(PSF)
- txt: $(TXT)
- raw: $(RAW)
-@@ -79,11 +79,9 @@ pcf: $(PCF)
- DESTDIR	= 
- prefix	= /usr
- psfdir	= $(prefix)/share/consolefonts
--x11dir	= $(prefix)/X11R6/lib/X11/fonts/local
-+x11dir	= $(PREFIX)/lib/X11/fonts/misc
- 
--install: $(PSF) $(PCF)
--	mkdir -p $(DESTDIR)$(psfdir)
--	for i in $(PSF) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done
-+install: $(PCF)
- 	mkdir -p $(DESTDIR)$(x11dir)
- 	for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
- 
-- 
cgit v1.2.3