-- Add DESTDIR support.

-- Use INSTALLATION_DIRS_FROM_PLIST=yes; share/playvt wasn't in PLIST.
-- Change some assignment operators to ?=, and:
-- Add USE_BSD_MAKEFILE=yes to set those values.
-- Bump rev.

4 files changed, 39 insertions, 11 deletions

diff --git a/sysutils/pcvt-utils/Makefile b/sysutils/pcvt-utils/Makefile
index 002fff0c3d1..31c34e2e9e8 100644
--- a/sysutils/pcvt-utils/Makefile
+++ b/sysutils/pcvt-utils/Makefile
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 21:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/10/30 02:22:54 bjs Exp $
 #
 
 DISTNAME=	netbsd-pcvt-20000611
 PKGNAME=	pcvt-utils-20000611
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/i386/isa/pcvt/
+HOMEPAGE=	http://cvsweb.NetBSD.org/bsdweb.cgi/src/sys/arch/i386/isa/pcvt/
 COMMENT=	Useful leftovers from pcvt: playvt and two font editors
 
-ONLY_FOR_PLATFORM= NetBSD-*-*
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/pcvt/Util
+ONLY_FOR_PLATFORM= 	NetBSD-*-*
+USE_BSD_MAKEFILE=	yes
+WRKSRC=			${WRKDIR}/pcvt/Util
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS_FROM_PLIST=	yes
 
 do-install:
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/demo/playvt \
 		${WRKSRC}/fed/fed \
 		${WRKSRC}/fontedit/fontedit \
-		${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/playvt
+		${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} \
 		${WRKSRC}/demo/*.vt \
-		${PREFIX}/share/playvt
+		${DESTDIR}${PREFIX}/share/playvt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pcvt-utils/PLIST b/sysutils/pcvt-utils/PLIST
index 7255b322e8f..e17ed8506a0 100644
--- a/sysutils/pcvt-utils/PLIST
+++ b/sysutils/pcvt-utils/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:37 zuntum Exp $
-bin/playvt
+@comment $NetBSD: PLIST,v 1.2 2007/10/30 02:22:54 bjs Exp $
 bin/fed
 bin/fontedit
+bin/playvt
 share/playvt/chardemo.vt
 share/playvt/colors.vt
 share/playvt/cowscene.vt
@@ -9,3 +9,4 @@ share/playvt/outerlimit.vt
 share/playvt/sgr.vt
 share/playvt/twzone.vt
 share/playvt/xmas.vt
+@dirrm share/playvt
diff --git a/sysutils/pcvt-utils/distinfo b/sysutils/pcvt-utils/distinfo
index ee0ceffc483..684a63d0fa2 100644
--- a/sysutils/pcvt-utils/distinfo
+++ b/sysutils/pcvt-utils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/11/13 14:51:08 drochner Exp $
+$NetBSD: distinfo,v 1.7 2007/10/30 02:22:54 bjs Exp $
 
 SHA1 (netbsd-pcvt-20000611.tar.gz) = ea51ded62dc82635f1eda3cd198b29cf6f4941ea
 RMD160 (netbsd-pcvt-20000611.tar.gz) = 33364b8503d286047163e9f4256374faa3c6b455
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = d81e7ee5f59bf5d4e23d8f19868e190e2a8b2a53
 SHA1 (patch-af) = ea4c0a0fee930184532d7f6961ef951d1e882027
 SHA1 (patch-ag) = fe39a7224c9ea78d97750a90e110d805d353c0ad
 SHA1 (patch-ah) = c7654e13adc69f365b9674b7aa369f8ffb2c757f
+SHA1 (patch-ai) = 436e86ec12165a3f2f6f004226f00e36c9a21e71
diff --git a/sysutils/pcvt-utils/patches/patch-ai b/sysutils/pcvt-utils/patches/patch-ai
new file mode 100644
index 00000000000..0f934265d19
--- /dev/null
+++ b/sysutils/pcvt-utils/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1 2007/10/30 02:22:54 bjs Exp $
+
+--- Makefile.inc.orig	1999-06-04 14:47:33.000000000 -0400
++++ Makefile.inc
+@@ -4,8 +4,8 @@ ECHO	?=	echo
+ 
+ BINDIR	?=	/usr/bin
+ FONTDIR	=	/usr/share/pcvt/fonts
+-LIBDIR	=	/usr/lib
+-LIBMODE	=	644
++LIBDIR	?=	/usr/lib
++LIBMODE	?=	644
+ 
+ INCDIR= ${DESTDIR}/usr/include/machine
+ 
+@@ -15,7 +15,7 @@ MAN3EXT	=	3
+ MAN4EXT	=	4
+ MAN5EXT	=	5
+ MAN8EXT	=	8
+-MANDIR	=	/usr/share/man
++MANDIR	?=	/usr/share/man
+ 
+ MAN = ${MAN1} ${MAN3} ${MAN4} ${MAN5} ${MAN8}
+