View | Details | Raw Unified | Return to bug 87847 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/x11-fonts/webfonts/Makefile (-21 / +50 lines)
Lines 6-27 Link Here
6
#
6
#
7
7
8
PORTNAME=	webfonts
8
PORTNAME=	webfonts
9
PORTVERSION=	0.21
9
PORTVERSION=	0.22
10
PORTREVISION=	3
11
CATEGORIES=	x11-fonts
10
CATEGORIES=	x11-fonts
12
MASTER_SITES=	${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/} \
11
MASTER_SITES=	${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \
13
	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/} \
12
	${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \
14
	ftp://ftp.uni-koeln.de/pc/win32/msoft/ \
13
	ftp://ftp.uni-koeln.de/pc/win32/msoft/:group1 \
15
	ftp://ftp.extra.ouh.nl/studie/alg/hulp/win/fonts/ \
14
	ftp://ftp.extra.ouh.nl/studie/alg/hulp/win/fonts/:group1 \
16
	ftp://ftp.vn.ua/pub/win/freefont/ \
15
	ftp://ftp.vn.ua/pub/win/freefont/:group1 \
17
	ftp://ftp.vsu.ru/pub/tex/font-packs/mscore/ \
16
	ftp://ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
18
	ftp://ftp.directnet.ru/pub/fonts-win/ \
17
	ftp://ftp.directnet.ru/pub/fonts-win/:group1 \
19
	ftp://ftp.sinn.ru/pub/win95/fonts/ \
18
	ftp://ftp.sinn.ru/pub/win95/fonts/:group1 \
20
	ftp://ftp.lexa.ru/pub/mirrors/ftp.vsu.ru/pub/tex/font-packs/mscore/ \
19
	ftp://ftp.lexa.ru/pub/mirrors/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
21
	ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/
20
	ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \
22
DISTFILES=	andale32.exe trebuc32.exe georgi32.exe verdan32.exe \
21
	http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/:group2 \
23
		comic32.exe arialb32.exe impact32.exe arial32.exe \
22
	http://www.zeuscat.com/andrew/software/corefonts/:group2 \
24
		times32.exe courie32.exe webdin32.exe
23
	ftp://ftp.isu.edu.tw/pub/MsDownload/ie6sp1/en/:group2
24
DISTFILES=	andale32.exe:group1  arial32.exe:group1 arialb32.exe:group1 \
25
		 comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \
26
		impact32.exe:group1  times32.exe:group1 trebuc32.exe:group1 \
27
		verdan32.exe:group1 webdin32.exe:group1
28
29
.if defined(HAVE_MSWINDOWS_LICENSE)
30
DISTFILES+=	ielpkth.cab:group2
31
.endif
32
25
DIST_SUBDIR=	${PORTNAME}
33
DIST_SUBDIR=	${PORTNAME}
26
34
27
MAINTAINER=	kkonstan@duth.gr
35
MAINTAINER=	kkonstan@duth.gr
Lines 36-43 Link Here
36
NO_PACKAGE=	"Restrictive license - cannot distribute in modified form"
44
NO_PACKAGE=	"Restrictive license - cannot distribute in modified form"
37
45
38
EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
46
EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
39
EXTRACT_BEFORE_ARGS=	--lowercase --quiet
47
EXTRACT_BEFORE_ARGS=	-qLF '*.ttf' -d ${WRKSRC}
40
EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
48
EXTRACT_AFTER_ARGS=
41
49
42
#
50
#
43
# Local variables
51
# Local variables
Lines 53-58 Link Here
53
MSG_FILE=	${PKGDIR}/pkg-message
61
MSG_FILE=	${PKGDIR}/pkg-message
54
PKGMESSAGE=	${WRKDIR}/pkg-message
62
PKGMESSAGE=	${WRKDIR}/pkg-message
55
63
64
FONTS_FILE=	${WRKDIR}/fonts.dir
65
56
.include <bsd.port.pre.mk>
66
.include <bsd.port.pre.mk>
57
67
58
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
68
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
Lines 72-84 Link Here
72
# Post-extract
82
# Post-extract
73
#
83
#
74
post-extract:
84
post-extract:
75
	${RM} -f ${WRKSRC}/*.dll ${WRKSRC}/*.exe ${WRKSRC}/*.inf
85
	${EXTRACT_CMD} -qLF '*.txt' -d ${WRKSRC} ${_DISTDIR}/webdin32.exe
76
86
77
#
87
#
78
# Post-patch
88
# Post-patch
79
#
89
#
80
post-patch:
90
post-patch:
81
	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
91
	${SED}	-e 's|%%FONTSDIR%%|${FONTSDIR}|g' \
92
		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
93
		${MSG_FILE} > ${PKGMESSAGE}
94
.if defined(HAVE_MSWINDOWS_LICENSE)
95
	${SORT} ${FILESDIR}/fonts.dir ${FILESDIR}/tahoma.dir > ${FONTS_FILE}
96
.else
97
	${CP} ${FILESDIR}/fonts.dir ${FONTS_FILE}
98
.endif
99
	${PRINTF} "1i\n%u\n.\nwq\n" `wc -l < ${FONTS_FILE}` | \
100
		ed -s ${FONTS_FILE}
101
102
#
103
# Pre-install
104
#
105
pre-install:
106
.if exists(${.CURDIR}/work/${DISTNAME}/tahoma.ttf)
107
PLIST_SUB+=	EXTRAFONTS=""
108
.else
109
PLIST_SUB+=	EXTRAFONTS="@comment "
110
.endif
82
111
83
#
112
#
84
# Install
113
# Install
Lines 86-93 Link Here
86
do-install:
115
do-install:
87
	${MKDIR} ${FONTSDIR} ${DOCSDIR}
116
	${MKDIR} ${FONTSDIR} ${DOCSDIR}
88
	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
117
	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
89
	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
118
	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}
90
	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}/fonts.scale
119
	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale
91
	${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
120
	${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
92
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
121
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
93
	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
122
	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
(-)/usr/ports/x11-fonts/webfonts/distinfo (+2 lines)
Lines 20-22 Link Here
20
SIZE (webfonts/courie32.exe) = 646368
20
SIZE (webfonts/courie32.exe) = 646368
21
MD5 (webfonts/webdin32.exe) = 230a1d13a365b22815f502eb24d9149b
21
MD5 (webfonts/webdin32.exe) = 230a1d13a365b22815f502eb24d9149b
22
SIZE (webfonts/webdin32.exe) = 185072
22
SIZE (webfonts/webdin32.exe) = 185072
23
MD5 (webfonts/ielpkth.cab) = 358584cddb75ac90472c25f01b308ebe
24
SIZE (webfonts/ielpkth.cab) = 411248
(-)/usr/ports/x11-fonts/webfonts/files/fonts.dir (-1 lines)
Lines 1-4 Link Here
1
839
2
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-adobe-standard
1
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-adobe-standard
3
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ansi-1251
2
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ansi-1251
4
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ascii-0
3
andalemo.ttf -monotype-andale mono-book-r-monospaced--0-0-0-0-m-0-ascii-0
(-)/usr/ports/x11-fonts/webfonts/pkg-descr (+2 lines)
Lines 10-13 Link Here
10
      ISO 8859-1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 15
10
      ISO 8859-1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 15
11
      KOI8-R and -RU
11
      KOI8-R and -RU
12
12
13
Tahoma can also be installed as an option, but a Windows License is required.
14
13
-- Konstantinos Konstantinidis
15
-- Konstantinos Konstantinidis
(-)/usr/ports/x11-fonts/webfonts/pkg-message (-2 / +2 lines)
Lines 1-7 Link Here
1
IMPORTANT - READ CAREFULLY: You may not use these fonts if you do not agree to
1
IMPORTANT - READ CAREFULLY: You may not use these fonts if you do not agree to
2
the terms of the Microsoft End-User License Agreement ("EULA").  You will find
2
the terms of the Microsoft End-User License Agreement ("EULA").  You will find
3
the EULA at %%FONTSDIR%%/LICENSE.  If you read and agree
3
the EULA at %%DOCSDIR%%/LICENSE.  If you read and agree
4
to the EULA, you can start using the fonts by following these insructions:
4
to the EULA, you can start using the fonts by following these instructions:
5
5
6
--- XFree86 4.x.x (using the freetype module)
6
--- XFree86 4.x.x (using the freetype module)
7
7
(-)/usr/ports/x11-fonts/webfonts/pkg-plist (-1 / +3 lines)
Lines 11-17 Link Here
11
%%FONTSDIR%%/courbd.ttf
11
%%FONTSDIR%%/courbd.ttf
12
%%FONTSDIR%%/courbi.ttf
12
%%FONTSDIR%%/courbi.ttf
13
%%FONTSDIR%%/couri.ttf
13
%%FONTSDIR%%/couri.ttf
14
%%FCACHE%%@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
14
%%FCACHE%%@unexec /bin/rm -f %D/%%FONTSDIR%%/fonts.cache-1 || /usr/bin/true
15
%%FONTSDIR%%/fonts.dir
15
%%FONTSDIR%%/fonts.dir
16
%%FONTSDIR%%/fonts.scale
16
%%FONTSDIR%%/fonts.scale
17
%%FONTSDIR%%/georgia.ttf
17
%%FONTSDIR%%/georgia.ttf
Lines 19-24 Link Here
19
%%FONTSDIR%%/georgiai.ttf
19
%%FONTSDIR%%/georgiai.ttf
20
%%FONTSDIR%%/georgiaz.ttf
20
%%FONTSDIR%%/georgiaz.ttf
21
%%FONTSDIR%%/impact.ttf
21
%%FONTSDIR%%/impact.ttf
22
%%EXTRAFONTS%%%%FONTSDIR%%/tahoma.ttf
23
%%EXTRAFONTS%%%%FONTSDIR%%/tahomabd.ttf
22
%%FONTSDIR%%/times.ttf
24
%%FONTSDIR%%/times.ttf
23
%%FONTSDIR%%/timesbd.ttf
25
%%FONTSDIR%%/timesbd.ttf
24
%%FONTSDIR%%/timesbi.ttf
26
%%FONTSDIR%%/timesbi.ttf

Return to bug 87847