Fri Mar 14 17:22:49 2008 UTC ()
Support user-destdir installation.


(jlam)
diff -r1.14 -r1.15 pkgsrc/graphics/freetype-lib/Makefile
diff -r1.9 -r1.10 pkgsrc/graphics/freetype-lib/distinfo
diff -r1.2 -r1.3 pkgsrc/graphics/freetype-lib/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/graphics/freetype-lib/patches/patch-ac
diff -r0 -r1.1 pkgsrc/graphics/freetype-lib/patches/patch-ae
diff -r1.21 -r1.22 pkgsrc/graphics/freetype-utils/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/graphics/freetype-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/freetype-lib/Makefile 2006/06/17 19:41:32 1.14
+++ pkgsrc/graphics/freetype-lib/Makefile 2008/03/14 17:22:49 1.15
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: Makefile,v 1.14 2006/06/17 19:41:32 minskim Exp $ 1# $NetBSD: Makefile,v 1.15 2008/03/14 17:22:49 jlam Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "Makefile.common" 5.include "Makefile.common"
4 6
5PKGNAME= freetype-lib-${FT_VERS} 7PKGNAME= freetype-lib-${FT_VERS}
6COMMENT= TrueType font rendering engine and library API 8COMMENT= TrueType font rendering engine and library API
7 9
8CONFIGURE_ARGS+= --without-x 10CONFIGURE_ARGS+= --without-x
9 11
10BUILD_TARGET= ttlib ttpo 12BUILD_TARGET= ttlib ttpo
11INSTALL_TARGET= install-ttlib install-ttpo 13INSTALL_TARGET= install-ttlib install-ttpo
12 14
13.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/graphics/freetype-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/freetype-lib/distinfo 2006/06/17 19:41:32 1.9
+++ pkgsrc/graphics/freetype-lib/distinfo 2008/03/14 17:22:49 1.10
@@ -1,20 +1,15 @@ @@ -1,20 +1,15 @@
1$NetBSD: distinfo,v 1.9 2006/06/17 19:41:32 minskim Exp $ 1$NetBSD: distinfo,v 1.10 2008/03/14 17:22:49 jlam Exp $
2 2
3SHA1 (freetype1_1.4pre.20030402.orig.tar.gz) = 595d526813e63400b56a5993caa3e2ea18f2f92c 3SHA1 (freetype1_1.4pre.20030402.orig.tar.gz) = 595d526813e63400b56a5993caa3e2ea18f2f92c
4RMD160 (freetype1_1.4pre.20030402.orig.tar.gz) = 9db8891cfb348faeb5387fba0b92dcae54cfed7c 4RMD160 (freetype1_1.4pre.20030402.orig.tar.gz) = 9db8891cfb348faeb5387fba0b92dcae54cfed7c
5Size (freetype1_1.4pre.20030402.orig.tar.gz) = 1402735 bytes 5Size (freetype1_1.4pre.20030402.orig.tar.gz) = 1402735 bytes
6SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac 
7SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3 
8SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74 
9SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae 
10SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91 
11SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858 
12SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664 6SHA1 (patch-aa) = b75fc2d414c2bab0c4abf2bc84c370c9298c1664
13SHA1 (patch-ab) = 8bea35dceffa399cf0f17065e2d1f9aafabf56e3 7SHA1 (patch-ab) = d15513455534873cdbccc01d011c1c82b25de2f7
14SHA1 (patch-ac) = b27f18b5f84c4d1451376295cf3b7caf08d2d56f 8SHA1 (patch-ac) = 0d15e23f3dbdb6d6a55f114f0b05774356e43a85
 9SHA1 (patch-ae) = 62aa38ccb5498321687b81fbe0b070cc7e613736
15SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac 10SHA1 (patch-ttf2pk-aa) = 89ed737e5cfdb4e38538f4782940b2c7c4482dac
16SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3 11SHA1 (patch-ttf2pk-ab) = 64816d93a0b3f1d38a3dcd9c051433165aa0f1c3
17SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74 12SHA1 (patch-ttf2pk-ac) = 6e80f39b704dcbf06bc25cbc23c3a1ca5f978e74
18SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae 13SHA1 (patch-ttf2pk-ad) = 0a4119f58af75cf338766b734ba16f0fc0f061ae
19SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91 14SHA1 (patch-ttf2pk-ae) = 8671f5eb1bdc5bf956083cb87eeaa9a15baf2f91
20SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858 15SHA1 (patch-ttf2pk-af) = 8a47cd019ad3ae3c503f20818e0a06c91312e858
cvs diff -r1.2 -r1.3 pkgsrc/graphics/freetype-lib/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/freetype-lib/patches/patch-ab 2000/07/22 08:12:40 1.2
+++ pkgsrc/graphics/freetype-lib/patches/patch-ab 2008/03/14 17:22:49 1.3
@@ -1,19 +1,31 @@ @@ -1,19 +1,31 @@
1$NetBSD: patch-ab,v 1.2 2000/07/22 08:12:40 jlam Exp $ 1$NetBSD: patch-ab,v 1.3 2008/03/14 17:22:49 jlam Exp $
2 2
3--- test/arch/unix/Makefile.in.orig Mon Jun 28 15:52:08 1999 3--- test/arch/unix/Makefile.in.orig 2001-12-25 15:13:19.000000000 -0500
4+++ test/arch/unix/Makefile.in Sat Jul 22 03:24:26 2000 4+++ test/arch/unix/Makefile.in
5@@ -62,11 +62,12 @@ 5@@ -75,11 +75,12 @@ EFENCE =
6  6
7 # variables used to compile either with libtool or not 7 # variables used to compile either with libtool or not
8 # 8 #
9-PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) 9-PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS)
10+PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) $(LDFLAGS) -lttf -lintl 10+PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) $(LDFLAGS) -lttf -lintl
11 #PROCESS = $(CC) $(FT_CFLAGS) 11 #PROCESS = $(CC) $(FT_CFLAGS)
12  12
13-LIBTTF = $(top_builddir)/lib/libttf.la 13-LIBTTF = $(top_builddir)/lib/libttf.la
14+#LIBTTF = $(top_builddir)/lib/libttf.la 14+#LIBTTF = $(top_builddir)/lib/libttf.la
15 #LIBTTF =$(top_builddir)/lib/libttf.a 15 #LIBTTF =$(top_builddir)/lib/libttf.a
16+LIBTTF = 16+LIBTTF =
17  17
18 .c.o: 18 .c.o:
19 $(CC) -c $(FT_CFLAGS) $< 19 $(CC) -c $(FT_CFLAGS) $<
 20@@ -137,9 +138,9 @@ ftstrtto: ftstrtto.o $(DISPOBJS) arabic.
 21
 22
 23 install: $(ALL_PROGRAMS)
 24- $(MKINSTALLDIRS) $(bindir)
 25+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 26 for P in $(ALL_PROGRAMS) ; do \
 27- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
 28+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(DESTDIR)$(bindir)/$$P ; \
 29 done
 30
 31 uninstall:
cvs diff -r1.1 -r1.2 pkgsrc/graphics/freetype-lib/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/graphics/freetype-lib/patches/patch-ac 2000/07/22 08:12:40 1.1
+++ pkgsrc/graphics/freetype-lib/patches/patch-ac 2008/03/14 17:22:49 1.2
@@ -1,13 +1,24 @@ @@ -1,13 +1,24 @@
1$NetBSD: patch-ac,v 1.1 2000/07/22 08:12:40 jlam Exp $ 1$NetBSD: patch-ac,v 1.2 2008/03/14 17:22:49 jlam Exp $
2 2
3--- lib/arch/unix/Makefile.in.orig Sat Jul 31 02:48:17 1999 3--- lib/arch/unix/Makefile.in.orig 2001-10-29 04:44:12.000000000 -0500
4+++ lib/arch/unix/Makefile.in Sat Jul 22 03:30:08 2000 4+++ lib/arch/unix/Makefile.in
5@@ -195,7 +195,7 @@ 5@@ -205,15 +205,15 @@ freetype.lo: $(SRC_S) $(SRC_M)
6 $(SRC_S) 6 $(SRC_S)
7  7
8 libttf.la: $(LIB_FILES) 8 libttf.la: $(LIB_FILES)
9- $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \ 9- $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \
10+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libttf.la $(LIB_FILES) \ 10+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libttf.la $(LIB_FILES) \
11 -rpath $(libdir) \ 11 -rpath $(libdir) \
12 -version-info $(version_info) $(FT_LIBS) 12 -version-info $(version_info) $(FT_LIBS)
13  13
 14 install: libttf.la
 15- $(MKINSTALLDIRS) $(libdir) $(includedir)/freetype
 16- $(LIBTOOL) --mode=install $(INSTALL) libttf.la $(libdir)
 17+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/freetype
 18+ $(LIBTOOL) --mode=install $(INSTALL) libttf.la $(DESTDIR)$(libdir)
 19 -for P in $(HEADERS) ; do \
 20- $(INSTALL_DATA) $$P $(includedir)/freetype ; \
 21+ $(INSTALL_DATA) $$P $(DESTDIR)$(includedir)/freetype ; \
 22 done
 23
 24 uninstall:
File Added: pkgsrc/graphics/freetype-lib/patches/patch-ae
$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; \
cvs diff -r1.21 -r1.22 pkgsrc/graphics/freetype-utils/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/freetype-utils/Makefile 2007/02/15 14:58:20 1.21
+++ pkgsrc/graphics/freetype-utils/Makefile 2008/03/14 17:22:49 1.22
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile,v 1.21 2007/02/15 14:58:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.22 2008/03/14 17:22:49 jlam Exp $
 2
 3PKG_DESTDIR_SUPPORT= user-destdir
2 4
3.include "../../graphics/freetype-lib/Makefile.common" 5.include "../../graphics/freetype-lib/Makefile.common"
4 6
5PKGNAME= freetype-utils-${FT_VERS} 7PKGNAME= freetype-utils-${FT_VERS}
6COMMENT= Utilities for manipulating TrueType fonts 8COMMENT= Utilities for manipulating TrueType fonts
7 9
8BUILDLINK_API_DEPENDS.freetype= freetype-lib>=${FT_VERS} 10BUILDLINK_API_DEPENDS.freetype= freetype-lib>=${FT_VERS}
9 11
10 
11CONFIGURE_ARGS+= --with-x 12CONFIGURE_ARGS+= --with-x
12BUILD_TARGET= tttest 13BUILD_TARGET= tttest
13INSTALL_TARGET= install-tttest 14INSTALL_TARGET= install-tttest
14 15
15BUILDLINK_DEPMETHOD.libXt?= build 16BUILDLINK_DEPMETHOD.libXt?= build
16 17
17.include "../../graphics/freetype-lib/buildlink3.mk" 18.include "../../graphics/freetype-lib/buildlink3.mk"
18.include "../../x11/libXt/buildlink3.mk" 19.include "../../x11/libXt/buildlink3.mk"
19.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"