Attachment 43693 Details for Bug 67783 – XFree86-4-fontScalable.diff

[patch] XFree86-4-fontScalable.diff

XFree86-4-fontScalable.diff (text/plain), 3.74 KB, created by Dejan Lesjak on 2004-06-10 04:40:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dejan Lesjak

Created: 2004-06-10 04:40:23 UTC

Size: 3.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /usr/local/freebsd-cvs/ports/x11-fonts/XFree86-4-fontScalable/Makefile,v
>retrieving revision 1.12
>diff -u -r1.12 Makefile
>--- Makefile	31 May 2004 06:13:24 -0000	1.12
>+++ Makefile	10 Jun 2004 01:03:19 -0000
>@@ -6,12 +6,13 @@
> #
> 
> PORTNAME=	fontScalable
>-PORTVERSION=	4.3.0
>+PORTVERSION=	4.4.0
> CATEGORIES=	x11-fonts
> MASTER_SITES=	${MASTER_SITE_XFREE}
> MASTER_SITE_SUBDIR=	${PORTVERSION}
> PKGNAMEPREFIX=	XFree86-
>-DISTFILES=	X430src-4.tgz X430src-5.tgz
>+DISTFILES=	XFree86-4.4.0-src-4.tgz \
>+		XFree86-4.4.0-src-5.tgz
> 
> MAINTAINER=	x11@FreeBSD.org
> COMMENT=	XFree86-4 scalable fonts
>@@ -19,7 +20,7 @@
> 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-* 
>+CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-*
> 
> XFREE86_VERSION=	4
> USE_IMAKE=		YES
>Index: distinfo
>===================================================================
>RCS file: /usr/local/freebsd-cvs/ports/x11-fonts/XFree86-4-fontScalable/distinfo,v
>retrieving revision 1.7
>diff -u -r1.7 distinfo
>--- distinfo	31 Mar 2004 03:12:49 -0000	1.7
>+++ distinfo	10 Jun 2004 01:03:19 -0000
>@@ -1,4 +1,4 @@
>-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
>-SIZE (xc/X430src-4.tgz) = 12906091
>-MD5 (xc/X430src-5.tgz) = 4dbdbe9a85c8f7f98dd0ee015a3c7b4f
>-SIZE (xc/X430src-5.tgz) = 4388018
>+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
>+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
>+MD5 (xc/XFree86-4.4.0-src-5.tgz) = 5c37f028efc6d54a9c725e333f9cc8ae
>+SIZE (xc/XFree86-4.4.0-src-5.tgz) = 4386587
>Index: files/patch-01
>===================================================================
>RCS file: /usr/local/freebsd-cvs/ports/x11-fonts/XFree86-4-fontScalable/files/patch-01,v
>retrieving revision 1.3
>diff -u -r1.3 patch-01
>--- files/patch-01	12 Jun 2001 15:00:34 -0000	1.3
>+++ files/patch-01	10 Jun 2004 01:02:36 -0000
>@@ -1,13 +1,13 @@
>---- Imakefile.orig	Thu Mar  1 09:37:01 2001
>-+++ Imakefile	Tue Jun  5 02:38:03 2001
>-@@ -18,7 +18,11 @@
>- PEXDIR = PEX
>- #endif
>+--- 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) $(PEXDIR)
>++SUBDIRS = $(SCALEDDIR)
> +#else
>- SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR) $(PEXDIR)
>+ SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR)
> +#endif
>  
>  #if MakeLocalFontDir
>Index: files/patch-scaled::TTF::Imakefile
>===================================================================
>RCS file: files/patch-scaled::TTF::Imakefile
>diff -N files/patch-scaled::TTF::Imakefile
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-scaled::TTF::Imakefile	10 Jun 2004 01:02:36 -0000
>@@ -0,0 +1,27 @@
>+--- 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))
>+

Actions: View | Diff

Attachments on bug 67783: 43693