Support user-destdir installation.

6 files changed, 61 insertions, 20 deletions

diff --git a/graphics/freetype-lib/Makefile b/graphics/freetype-lib/Makefile
index 662246cbefa..127ef8dd20d 100644
--- a/graphics/freetype-lib/Makefile
+++ b/graphics/freetype-lib/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2006/06/17 19:41:32 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/14 17:22:49 jlam Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
diff --git a/graphics/freetype-lib/distinfo b/graphics/freetype-lib/distinfo
index 27565c2669e..a891622a10c 100644
--- a/graphics/freetype-lib/distinfo
+++ b/graphics/freetype-lib/distinfo
@@ -1,17 +1,12 @@
-$NetBSD: distinfo,v 1.9 2006/06/17 19:41:32 minskim Exp $
+$NetBSD: distinfo,v 1.10 2008/03/14 17:22:49 jlam Exp $
 
 SHA1 (freetype1_1.4pre.20030402.orig.tar.gz) = 595d526813e63400b56a5993caa3e2ea18f2f92c
 RMD160 (freetype1_1.4pre.20030402.orig.tar.gz) = 9db8891cfb348faeb5387fba0b92dcae54cfed7c
 Size (freetype1_1.4pre.20030402.orig.tar.gz) = 1402735 bytes
-SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac
-SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3
-SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74
-SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae
-SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91
-SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858
 SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664
-SHA1 (patch-ab) = 8bea35dceffa399cf0f17065e2d1f9aafabf56e3
-SHA1 (patch-ac) = b27f18b5f84c4d1451376295cf3b7caf08d2d56f
+SHA1 (patch-ab) = d15513455534873cdbccc01d011c1c82b25de2f7
+SHA1 (patch-ac) = 0d15e23f3dbdb6d6a55f114f0b05774356e43a85
+SHA1 (patch-ae) = 62aa38ccb5498321687b81fbe0b070cc7e613736
 SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac
 SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3
 SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74
diff --git a/graphics/freetype-lib/patches/patch-ab b/graphics/freetype-lib/patches/patch-ab
index 796a741ce48..5d3fe2b4923 100644
--- a/graphics/freetype-lib/patches/patch-ab
+++ b/graphics/freetype-lib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/07/22 08:12:40 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2008/03/14 17:22:49 jlam Exp $
 
---- test/arch/unix/Makefile.in.orig	Mon Jun 28 15:52:08 1999
-+++ test/arch/unix/Makefile.in	Sat Jul 22 03:24:26 2000
-@@ -62,11 +62,12 @@
+--- test/arch/unix/Makefile.in.orig	2001-12-25 15:13:19.000000000 -0500
++++ test/arch/unix/Makefile.in
+@@ -75,11 +75,12 @@ EFENCE =
  
  # variables used to compile either with libtool or not
  #
@@ -17,3 +17,15 @@ $NetBSD: patch-ab,v 1.2 2000/07/22 08:12:40 jlam Exp $
  
  .c.o:
  	$(CC) -c $(FT_CFLAGS) $<
+@@ -137,9 +138,9 @@ ftstrtto: ftstrtto.o $(DISPOBJS) arabic.
+ 
+ 
+ install: $(ALL_PROGRAMS)
+-	$(MKINSTALLDIRS) $(bindir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
+ 	for P in $(ALL_PROGRAMS) ; do \
+-          $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
++          $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(DESTDIR)$(bindir)/$$P ; \
+         done
+ 
+ uninstall:
diff --git a/graphics/freetype-lib/patches/patch-ac b/graphics/freetype-lib/patches/patch-ac
index 51b4d1f5c9a..32fbeda0398 100644
--- a/graphics/freetype-lib/patches/patch-ac
+++ b/graphics/freetype-lib/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2000/07/22 08:12:40 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2008/03/14 17:22:49 jlam Exp $
 
---- lib/arch/unix/Makefile.in.orig	Sat Jul 31 02:48:17 1999
-+++ lib/arch/unix/Makefile.in	Sat Jul 22 03:30:08 2000
-@@ -195,7 +195,7 @@
+--- lib/arch/unix/Makefile.in.orig	2001-10-29 04:44:12.000000000 -0500
++++ lib/arch/unix/Makefile.in
+@@ -205,15 +205,15 @@ freetype.lo: $(SRC_S) $(SRC_M)
                                          $(SRC_S)
  
  libttf.la: $(LIB_FILES)
@@ -11,3 +11,14 @@ $NetBSD: patch-ac,v 1.1 2000/07/22 08:12:40 jlam Exp $
                                 -rpath $(libdir) \
                                 -version-info $(version_info) $(FT_LIBS)
  
+ install: libttf.la
+-	$(MKINSTALLDIRS) $(libdir) $(includedir)/freetype
+-	$(LIBTOOL) --mode=install $(INSTALL) libttf.la $(libdir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/freetype
++	$(LIBTOOL) --mode=install $(INSTALL) libttf.la $(DESTDIR)$(libdir)
+ 	-for P in $(HEADERS) ; do \
+-          $(INSTALL_DATA) $$P $(includedir)/freetype ; \
++          $(INSTALL_DATA) $$P $(DESTDIR)$(includedir)/freetype ; \
+         done
+ 
+ uninstall: 
diff --git a/graphics/freetype-lib/patches/patch-ae b/graphics/freetype-lib/patches/patch-ae
new file mode 100644
index 00000000000..130630b27b6
--- /dev/null
+++ b/graphics/freetype-lib/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2008/03/14 17:22:49 jlam Exp $
+
+--- po/Makefile.in.in.orig	2002-12-20 11:33:36.000000000 -0500
++++ po/Makefile.in.in
+@@ -106,12 +106,12 @@ install-exec:
+ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+-	$(top_srcdir)/mkinstalldirs $(datadir); \
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index d4f675ec912..7aeea7cc9bf 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2007/02/15 14:58:20 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/14 17:22:49 jlam Exp $
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../graphics/freetype-lib/Makefile.common"
 
@@ -7,7 +9,6 @@ COMMENT=	Utilities for manipulating TrueType fonts
 
 BUILDLINK_API_DEPENDS.freetype=	freetype-lib>=${FT_VERS}
 
-
 CONFIGURE_ARGS+=	--with-x
 BUILD_TARGET=		tttest
 INSTALL_TARGET=		install-tttest