ports/67783: Update XFree86 scalable fonts to 4.4 release.

[Dejan Lesjak]

>Number:         67783
>Category:       ports
>Synopsis:       Update XFree86 scalable fonts to 4.4 release.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 10 03:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Dejan Lesjak
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD idefix.ijs.si 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Thu Jun 3 21:26:10 CEST 2004 lesi at idefix.ijs.si:/usr/obj/usr/src/sys/IDEFIX i386


	
>Description:
Update XFree86 scalable fonts to 4.4 release.
Release notes are available at:
http://www.xfree86.org/4.4.0/RELNOTES.html

added files:
files/patch-scaled::TTF::Imakefile

	
>How-To-Repeat:
	
>Fix:

	

--- XFree86-4-fontScalable.diff begins here ---
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 at 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))
+ 
--- XFree86-4-fontScalable.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: