Attachment #43693 for bug #67783

View | Details | Raw Unified | Return to bug 67783
Collapse All | Expand All




#

PORTNAME=	fontScalable
PORTVERSION=	4.4.0
CATEGORIES=	x11-fonts
MASTER_SITES=	${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR=	${PORTVERSION}
PKGNAMEPREFIX=	XFree86-
DISTFILES=	XFree86-4.4.0-src-4.tgz \
		XFree86-4.4.0-src-5.tgz

MAINTAINER=	x11@FreeBSD.org
COMMENT=	XFree86-4 scalable fonts

BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-*

XFREE86_VERSION=	4
USE_IMAKE=		YES

Lines 1-4 Link Here

(-)distinfo (-4 / +4 lines)
1	MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38	1	MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
2	SIZE (xc/X430src-4.tgz) = 12906091	2	SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
3	MD5 (xc/X430src-5.tgz) = 4dbdbe9a85c8f7f98dd0ee015a3c7b4f	3	MD5 (xc/XFree86-4.4.0-src-5.tgz) = 5c37f028efc6d54a9c725e333f9cc8ae
4	SIZE (xc/X430src-5.tgz) = 4388018	4	SIZE (xc/XFree86-4.4.0-src-5.tgz) = 4386587




--- Imakefile.orig	Sun Apr 11 03:46:05 2004
+++ Imakefile	Sun Apr 11 03:46:48 2004
@@ -15,7 +15,11 @@
 
 FONTDIRS = bdf $(SCALEDDIR)
 
+#if defined(FreeBSDBuildXscl) || FreeBSDBuildXscl
+SUBDIRS = $(SCALEDDIR)
+#else
 SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR)
+#endif
 
 #if MakeLocalFontDir




--- scaled/TTF/Imakefile.orig	Tue Apr 20 08:55:17 2004
+++ scaled/TTF/Imakefile	Tue Apr 20 08:56:04 2004
@@ -8,7 +8,7 @@
 VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
 	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
 
-FONTS = $(LUXIFONTS) $(VERAFONTS)
+FONTS = $(LUXIFONTS)
 OBJS = $(FONTS)
 
 FONTINSTDIR = $(FONTDIR)/TTF
@@ -30,15 +30,4 @@
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
-
-LinkSourceFile(Vera.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
-LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
 

Return to bug 67783

Lines 6-17 Link Here

(-)Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= fontScalable	8	PORTNAME= fontScalable
9	PORTVERSION= 4.3.0	9	PORTVERSION= 4.4.0
10	CATEGORIES= x11-fonts	10	CATEGORIES= x11-fonts
11	MASTER_SITES= ${MASTER_SITE_XFREE}	11	MASTER_SITES= ${MASTER_SITE_XFREE}
12	MASTER_SITE_SUBDIR= ${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION}
13	PKGNAMEPREFIX= XFree86-	13	PKGNAMEPREFIX= XFree86-
14	DISTFILES= X430src-4.tgz X430src-5.tgz	14	DISTFILES= XFree86-4.4.0-src-4.tgz \
		15	XFree86-4.4.0-src-5.tgz
15		16
16	MAINTAINER= x11@FreeBSD.org	17	MAINTAINER= x11@FreeBSD.org
17	COMMENT= XFree86-4 scalable fonts	18	COMMENT= XFree86-4 scalable fonts
Lines 19-25 Link Here
19	BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients	20	BUILD_DEPENDS= ucs2any:${PORTSDIR}/x11/XFree86-4-clients
20	RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings	21	RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
21		22
22	CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-*	23	CONFLICTS= xorg-fonts-type1-* xorg-fonts-truetype-*
23		24
24	XFREE86_VERSION= 4	25	XFREE86_VERSION= 4
25	USE_IMAKE= YES	26	USE_IMAKE= YES

Lines 1-13 Link Here

(-)files/patch-01 (-7 / +7 lines)
1	--- Imakefile.orig Thu Mar 1 09:37:01 2001	1	--- Imakefile.orig Sun Apr 11 03:46:05 2004
2	+++ Imakefile Tue Jun 5 02:38:03 2001	2	+++ Imakefile Sun Apr 11 03:46:48 2004
3	@@ -18,7 +18,11 @@	3	@@ -15,7 +15,11 @@
4	PEXDIR = PEX	4
5	#endif	5	FONTDIRS = bdf $(SCALEDDIR)
6		6
7	+#if defined(FreeBSDBuildXscl) \|\| FreeBSDBuildXscl	7	+#if defined(FreeBSDBuildXscl) \|\| FreeBSDBuildXscl
8	+SUBDIRS = $(SCALEDDIR) $(PEXDIR)	8	+SUBDIRS = $(SCALEDDIR)
9	+#else	9	+#else
10	SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR) $(PEXDIR)	10	SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR)
11	+#endif	11	+#endif
12		12
13	#if MakeLocalFontDir	13	#if MakeLocalFontDir

Added Link Here

(-)files/patch-scaled::TTF::Imakefile (+27 lines)
1	--- scaled/TTF/Imakefile.orig Tue Apr 20 08:55:17 2004
2	+++ scaled/TTF/Imakefile Tue Apr 20 08:56:04 2004
3	@@ -8,7 +8,7 @@
4	VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
5	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
6
7	-FONTS = $(LUXIFONTS) $(VERAFONTS)
8	+FONTS = $(LUXIFONTS)
9	OBJS = $(FONTS)
10
11	FONTINSTDIR = $(FONTDIR)/TTF
12	@@ -30,15 +30,4 @@
13	MakeSubdirs($(SUBDIRS))
14	DependSubdirs($(SUBDIRS))
15	#endif
16	-
17	-LinkSourceFile(Vera.ttf,$(VERASRCDIR))
18	-LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
19	-LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
20	-LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
21	-LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
22	-LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
23	-LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
24	-LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
25	-LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
26	-LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
27