Sun Oct 14 17:48:34 2012 UTC ()
Use a more restrictive pattern in setting DIST_SUBDIR for TeX Live packages.


(minskim)
diff -r1.16 -r1.17 pkgsrc/print/texlive/package.mk
cvs diff -r1.16 -r1.17 pkgsrc/print/texlive/package.mk (expand / switch to unified diff)

--- pkgsrc/print/texlive/package.mk 2012/10/08 13:45:48 1.16
+++ pkgsrc/print/texlive/package.mk 2012/10/14 17:48:34 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: package.mk,v 1.16 2012/10/08 13:45:48 asau Exp $ 1# $NetBSD: package.mk,v 1.17 2012/10/14 17:48:34 minskim Exp $
2# 2#
3# This Makefile fragment is intended to be included by packages that build 3# This Makefile fragment is intended to be included by packages that build
4# TeX Live packages. 4# TeX Live packages.
5# 5#
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# REPLACE_TEXLUA 8# REPLACE_TEXLUA
9# A list of texlua scripts to be installed, relative to ${WRKSRC}. 9# A list of texlua scripts to be installed, relative to ${WRKSRC}.
10# 10#
11# TEX_FORMATS 11# TEX_FORMATS
12# See ../../print/texlive-tetex/format.mk. 12# See ../../print/texlive-tetex/format.mk.
13# 13#
14# TEX_HYPHEN_DAT 14# TEX_HYPHEN_DAT
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23# TEXLIVE_IGNORE_PATTERNS 23# TEXLIVE_IGNORE_PATTERNS
24# glob patterns for files and directories in ${WRKSRC} that 24# glob patterns for files and directories in ${WRKSRC} that
25# should not be installed. 25# should not be installed.
26 26
27CATEGORIES?= print 27CATEGORIES?= print
28.if empty(TEXLIVE_USE_CTAN) 28.if empty(TEXLIVE_USE_CTAN)
29MASTER_SITES?= ${MASTER_SITE_BACKUP} 29MASTER_SITES?= ${MASTER_SITE_BACKUP}
30.else 30.else
31MASTER_SITES?= ${MASTER_SITE_TEX_CTAN:=systems/texlive/tlnet/archive/} 31MASTER_SITES?= ${MASTER_SITE_TEX_CTAN:=systems/texlive/tlnet/archive/}
32.endif 32.endif
33.if empty(TEXLIVE_REV) 33.if empty(TEXLIVE_REV)
34DIST_SUBDIR?= ${PKGNAME_NOREV} 34DIST_SUBDIR?= ${PKGNAME_NOREV}
35.else 35.else
36DIST_SUBDIR?= ${PKGBASE:S/-doc//}-${TEXLIVE_REV} 36DIST_SUBDIR?= ${PKGBASE:C/-doc$$//}-${TEXLIVE_REV}
37.endif 37.endif
38EXTRACT_SUFX?= .tar.xz 38EXTRACT_SUFX?= .tar.xz
39 39
40HOMEPAGE?= http://www.tug.org/texlive/ 40HOMEPAGE?= http://www.tug.org/texlive/
41 41
42USE_TOOLS+= pax 42USE_TOOLS+= pax
43 43
44NO_BUILD?= yes 44NO_BUILD?= yes
45WRKSRC?= ${WRKDIR} 45WRKSRC?= ${WRKDIR}
46 46
47.if defined(REPLACE_TEXLUA) 47.if defined(REPLACE_TEXLUA)
48DEPENDS+= luatex-[0-9]*:../../print/luatex 48DEPENDS+= luatex-[0-9]*:../../print/luatex
49 49