diff options
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/jmk-fonts/Makefile | 6 | ||||
| -rw-r--r-- | fonts/kcfonts/Makefile | 4 | ||||
| -rw-r--r-- | fonts/kcfonts/distinfo | 4 | ||||
| -rw-r--r-- | fonts/kcfonts/patches/patch-aa | 28 |
4 files changed, 27 insertions, 15 deletions
diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile index 760041cf9fb..9cb68b2b6fb 100644 --- a/fonts/jmk-fonts/Makefile +++ b/fonts/jmk-fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2008/01/22 17:09:55 tnn Exp $ +# $NetBSD: Makefile,v 1.14 2009/07/08 16:47:20 joerg Exp $ # DISTNAME= jmk-x11-fonts-3.0 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.jmknoble.net/fonts/ COMMENT= Jim Knoble's font collection for X11 +PKG_DESTDIR_SUPPORT= user-destdir + USE_IMAKE= yes USE_TOOLS+= bdftopcf gzip @@ -18,6 +20,6 @@ FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/jmk REQD_DIRS+= ${PREFIX}/lib/X11/fonts/jmk post-install: - ${RM} ${PREFIX}/lib/X11/fonts/jmk/fonts.scale + ${RM} ${DESTDIR}${PREFIX}/lib/X11/fonts/jmk/fonts.scale .include "../../mk/bsd.pkg.mk" diff --git a/fonts/kcfonts/Makefile b/fonts/kcfonts/Makefile index f0a40e81a04..edb347043e3 100644 --- a/fonts/kcfonts/Makefile +++ b/fonts/kcfonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2008/01/22 17:09:55 tnn Exp $ +# $NetBSD: Makefile,v 1.12 2009/07/08 16:49:05 joerg Exp $ DISTNAME= kcfonts-1.05 PKGREVISION= 3 @@ -8,6 +8,8 @@ MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/} MAINTAINER= kevlo@midassol.com COMMENT= Kuo Chauo Chinese Fonts collection +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} USE_X11BASE= yes FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/local diff --git a/fonts/kcfonts/distinfo b/fonts/kcfonts/distinfo index b9bacebb63c..96e16373857 100644 --- a/fonts/kcfonts/distinfo +++ b/fonts/kcfonts/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2005/12/28 19:50:45 joerg Exp $ +$NetBSD: distinfo,v 1.4 2009/07/08 16:49:05 joerg Exp $ SHA1 (kcfonts-1.05.tar.gz) = b05d2aae45a7624cc9484e1bac0c0670200a0784 RMD160 (kcfonts-1.05.tar.gz) = 81beed36904d4a4a012da99d000ec6ddae6e3d37 Size (kcfonts-1.05.tar.gz) = 903701 bytes -SHA1 (patch-aa) = c72e64cb5723015b463686d256c030b1e13358f5 +SHA1 (patch-aa) = 60f58f1e6d3db116f6bccceaa3b6420aa76c0c72 SHA1 (patch-ab) = 8e395c8f5a6c157db54a9b805fede7136250b11c SHA1 (patch-ad) = 366ba0c305433845417fc5699eb188230f235d34 SHA1 (patch-ae) = 03d0a5c4b541177df800bcea2f80858cadefd98a diff --git a/fonts/kcfonts/patches/patch-aa b/fonts/kcfonts/patches/patch-aa index b825d559a7e..5de457e626a 100644 --- a/fonts/kcfonts/patches/patch-aa +++ b/fonts/kcfonts/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/07/18 16:19:04 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2009/07/08 16:49:05 joerg Exp $ ---- Makefile.orig Sat Dec 16 21:00:46 1995 +--- Makefile.orig 1995-12-16 21:00:46.000000000 +0100 +++ Makefile @@ -2,13 +2,13 @@ # Kau Chauo Chinese Fanti Ming Fonts Version 1.05 For FreeBSD @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/18 16:19:04 wiz Exp $ FONTS =kc24f.pcf.gz kc15f.pcf.gz kc8x15.pcf.gz kc12x24.pcf.gz PROGS =kc24f kc15f kc8x15 kc12x24 kca2et OBJS =tran.o kc24f.o kc15f.o kc8x15.o kc12x24.o kca2et.o -@@ -22,10 +22,14 @@ +@@ -22,10 +22,14 @@ kc15f.pcf.gz: kc15f ./kc15f | bdftopcf | gzip - > kc15f.pcf.gz kc8x15.pcf.gz: kca2et kc8x15 ./kca2et kctext16.f00 ascfont.15 256 16 15 @@ -37,11 +37,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/18 16:19:04 wiz Exp $ kc24f: tran.o kc24f.o $(CC) $(CFLAGS) tran.o kc24f.o -o $@ -@@ -42,6 +46,7 @@ - if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi - cp kc*f.pcf.gz $(CFONTDIR) - cp kc*x*.pcf.gz $(EFONTDIR) -+ cp fonts.alias $(CFONTDIR) - mkfontdir $(CFONTDIR) - mkfontdir $(EFONTDIR) +@@ -39,11 +43,10 @@ kca2et: kca2et.o + $(CC) $(CFLAGS) kca2et.o -o $@ + install: +- if [ ! -d $(CFONTDIR) ]; then mkdir $(CFONTDIR); fi +- cp kc*f.pcf.gz $(CFONTDIR) +- cp kc*x*.pcf.gz $(EFONTDIR) +- mkfontdir $(CFONTDIR) +- mkfontdir $(EFONTDIR) ++ if [ ! -d ${DESTDIR}$(CFONTDIR) ]; then mkdir ${DESTDIR}$(CFONTDIR); fi ++ ${BSD_INSTALL_DATA} kc*f.pcf.gz ${DESTDIR}$(CFONTDIR) ++ ${BSD_INSTALL_DATA} kc*x*.pcf.gz ${DESTDIR}$(EFONTDIR) ++ ${BSD_INSTALL_DATA} fonts.alias ${DESTDIR}$(CFONTDIR) + + clean: + rm -f kc*.pcf.gz ascfont.* *.o *~ $(PROGS) |