Mon Apr 8 07:37:55 2013 UTC ()
Re-add EXTRACT_SUFX, needed in this case (plus a comment why it's needed).


(wiz)
diff -r1.32 -r1.33 pkgsrc/fonts/intlfonts/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/fonts/intlfonts/Makefile (switch to unified diff)

--- pkgsrc/fonts/intlfonts/Makefile 2013/04/06 13:24:19 1.32
+++ pkgsrc/fonts/intlfonts/Makefile 2013/04/08 07:37:55 1.33
@@ -1,72 +1,74 @@ @@ -1,72 +1,74 @@
1# $NetBSD: Makefile,v 1.32 2013/04/06 13:24:19 rodent Exp $ 1# $NetBSD: Makefile,v 1.33 2013/04/08 07:37:55 wiz Exp $
2 2
3DISTNAME= intlfonts-1.2.1 3DISTNAME= intlfonts-1.2.1
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= fonts x11 5CATEGORIES= fonts x11
6MASTER_SITES= ${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/} 6MASTER_SITES= ${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/}
 7# not redundant here -- needed in the DISTFILES line below
 8EXTRACT_SUFX= .tar.gz
7DISTFILES= ${FONT_SETS:=${EXTRACT_SUFX}} ${MISC_FILES} 9DISTFILES= ${FONT_SETS:=${EXTRACT_SUFX}} ${MISC_FILES}
8 10
9MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Free X11 fonts (BDF format) for all characters that Emacs can handle 12COMMENT= Free X11 fonts (BDF format) for all characters that Emacs can handle
11 13
12FONT_SETS= Asian \ 14FONT_SETS= Asian \
13 Chinese \ 15 Chinese \
14 Ethiopic \ 16 Ethiopic \
15 European \ 17 European \
16 Japanese \ 18 Japanese \
17 Misc 19 Misc
18 20
19USE_TOOLS+= bdftopcf 21USE_TOOLS+= bdftopcf
20 22
21# Use the X font set for Korean, as there isn't anything better 23# Use the X font set for Korean, as there isn't anything better
22FONT_SETS+= Korean.X 24FONT_SETS+= Korean.X
23 25
24# These are extra files that not many folks will likely need or want 26# These are extra files that not many folks will likely need or want
25# They are all bigger than 24 dots -- you'll only want them if you 27# They are all bigger than 24 dots -- you'll only want them if you
26# want to display text in really big fonts. 28# want to display text in really big fonts.
27# 29#
28EXTRA_FONTS= Chinese.BIG \ 30EXTRA_FONTS= Chinese.BIG \
29 European.BIG \ 31 European.BIG \
30 Japanese.BIG 32 Japanese.BIG
31 33
32# Type1/TrueType fonts for Latin1, Thai and Vietnamese 34# Type1/TrueType fonts for Latin1, Thai and Vietnamese
33# XXX need "fonts.scale" for them 35# XXX need "fonts.scale" for them
34# 36#
35EXTRA_FONTS+= Type1 \ 37EXTRA_FONTS+= Type1 \
36 TrueType 38 TrueType
37CONFIGURE_ARGS+= --with-type1 --with-truetype 39CONFIGURE_ARGS+= --with-type1 --with-truetype
38 40
39MISC_FILES= README.split 41MISC_FILES= README.split
40 42
41DIST_SUBDIR= ${PKGNAME_NOREV} 43DIST_SUBDIR= ${PKGNAME_NOREV}
42EXTRACT_ONLY= ${FONT_SETS:=${EXTRACT_SUFX}} 44EXTRACT_ONLY= ${FONT_SETS:=${EXTRACT_SUFX}}
43 45
44GNU_CONFIGURE= yes 46GNU_CONFIGURE= yes
45CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \ 47CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \
46 --enable-compress=gzip 48 --enable-compress=gzip
47INSTALL_MAKE_FLAGS+= fontdir=${DESTDIR}${FONTS_DIR} 49INSTALL_MAKE_FLAGS+= fontdir=${DESTDIR}${FONTS_DIR}
48 50
49FONTS_DIR= ${PREFIX}/lib/X11/fonts/intlfonts 51FONTS_DIR= ${PREFIX}/lib/X11/fonts/intlfonts
50 52
51FONTS_DIRS.x11+= ${FONTS_DIR} 53FONTS_DIRS.x11+= ${FONTS_DIR}
52FONTS_DIRS.x11+= ${FONTS_DIR}/bdf 54FONTS_DIRS.x11+= ${FONTS_DIR}/bdf
53FONTS_DIRS.type1+= ${FONTS_DIR}/Type1 55FONTS_DIRS.type1+= ${FONTS_DIR}/Type1
54FONTS_DIRS.ttf+= ${FONTS_DIR}/TrueType 56FONTS_DIRS.ttf+= ${FONTS_DIR}/TrueType
55REQD_DIRS+= ${FONTS_DIR} 57REQD_DIRS+= ${FONTS_DIR}
56REQD_DIRS+= ${FONTS_DIR}/bdf 58REQD_DIRS+= ${FONTS_DIR}/bdf
57REQD_DIRS+= ${FONTS_DIR}/Type1 59REQD_DIRS+= ${FONTS_DIR}/Type1
58REQD_DIRS+= ${FONTS_DIR}/TrueType 60REQD_DIRS+= ${FONTS_DIR}/TrueType
59 61
60.include "../../mk/bsd.prefs.mk" 62.include "../../mk/bsd.prefs.mk"
61 63
62.if !defined(NO_EXTRA_FONTS) 64.if !defined(NO_EXTRA_FONTS)
63FONT_SETS+= ${EXTRA_FONTS} 65FONT_SETS+= ${EXTRA_FONTS}
64PLIST_SRC= PLIST PLIST.extrafonts 66PLIST_SRC= PLIST PLIST.extrafonts
65.endif 67.endif
66 68
67post-extract: 69post-extract:
68.for file in ${MISC_FILES} 70.for file in ${MISC_FILES}
69 ${CP} ${_DISTDIR}/${file} ${WRKSRC} 71 ${CP} ${_DISTDIR}/${file} ${WRKSRC}
70.endfor 72.endfor
71 73
72.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"