user-destdir support

3 files changed, 14 insertions, 10 deletions

diff --git a/fonts/ttf2pt1/Makefile b/fonts/ttf2pt1/Makefile
index 69e8d8ade03..99c6f3b7f7d 100644
--- a/fonts/ttf2pt1/Makefile
+++ b/fonts/ttf2pt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/09/04 19:27:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2009/07/08 17:03:51 joerg Exp $
 #
 
 DISTNAME=	ttf2pt1-3.4.4
@@ -11,6 +11,8 @@ MAINTAINER=	reinoud@NetBSD.org
 HOMEPAGE=	http://ttf2pt1.sourceforge.net/
 COMMENT=	TrueType font converter to Postscript type 1
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	t1utils-[0-9]*:../../fonts/t1utils
 
 USE_TOOLS+=	perl:run
@@ -20,6 +22,8 @@ REPLACE_PERL+=	other/cntstems.pl other/lst.pl other/showdf other/showg
 REPLACE_PERL+=	scripts/forceiso scripts/frommap scripts/html2man
 REPLACE_PERL+=	scripts/inst_dir scripts/t1fdir scripts/trans
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttf2pt1/distinfo b/fonts/ttf2pt1/distinfo
index da5433efb2c..d7319413926 100644
--- a/fonts/ttf2pt1/distinfo
+++ b/fonts/ttf2pt1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 19:18:29 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/07/08 17:03:51 joerg Exp $
 
 SHA1 (ttf2pt1-3.4.4.tgz) = 936771b11a740c16a8e0adb737b54b22cca18cb2
 RMD160 (ttf2pt1-3.4.4.tgz) = f88d7a26b30fa02055fd12ce1450220bd52d8df2
 Size (ttf2pt1-3.4.4.tgz) = 230547 bytes
-SHA1 (patch-aa) = e8344ed0026c94015771d08102ea4e1858061403
+SHA1 (patch-aa) = 3168178e1801a876f5161e98f796c7796d40ab94
 SHA1 (patch-ab) = 4133a4ded43eec3da256eeea31ff35b9b8167351
diff --git a/fonts/ttf2pt1/patches/patch-aa b/fonts/ttf2pt1/patches/patch-aa
index d58e5c65438..91e1a59e46c 100644
--- a/fonts/ttf2pt1/patches/patch-aa
+++ b/fonts/ttf2pt1/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/08 17:03:51 joerg Exp $
 
 --- Makefile.orig	2002-08-30 18:03:07.000000000 +0000
 +++ Makefile
@@ -94,9 +94,9 @@ $NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
 -	chmod -R go-w $(SHAREDIR)
 -	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
 -	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
-+	$(BSD_INSTALL_DATA_DIR) $(SHAREDIR)
-+	cp -Rf $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
-+	$(BSD_INSTALL_PROGRAM) ttf2pt1 $(BINDIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(SHAREDIR)
++	cp -Rf $(TXTFILES) $(SUBDIRS) ${DESTDIR}$(SHAREDIR)
++	$(BSD_INSTALL_PROGRAM) ttf2pt1 ${DESTDIR}$(BINDIR)
  	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
  		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
  		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
@@ -104,9 +104,9 @@ $NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
 -	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
 -	rm cvt.tmp
 -	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
-+	$(BSD_INSTALL_SCRIPT) cvt.tmp $(BINDIR)/ttf2pt1_convert
++	$(BSD_INSTALL_SCRIPT) cvt.tmp ${DESTDIR}$(BINDIR)/ttf2pt1_convert
 +	rm -f cvt.tmp
-+	$(BSD_INSTALL_SCRIPT) scripts/x2gs $(BINDIR)/ttf2pt1_x2gs
++	$(BSD_INSTALL_SCRIPT) scripts/x2gs ${DESTDIR}$(BINDIR)/ttf2pt1_x2gs
  	for i in $(MANS1); do { \
  		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
  			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
@@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/27 15:18:08 adam Exp $
 -		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
 -		&& chmod 0644 $(MANDIR)/man1/$$i \
 +			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$$i.tmp \
-+		&& $(BSD_INSTALL_MAN) $$i.tmp $(MANDIR)/man1/$$i \
++		&& $(BSD_INSTALL_MAN) $$i.tmp ${DESTDIR}$(MANDIR)/man1/$$i \
 +		&& rm -f $$i.tmp \
  		|| exit 1; \
  	} done