From lesi@idefix.ijs.si  Thu Jun 10 03:37:28 2004
Return-Path: <lesi@idefix.ijs.si>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1FD2C16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jun 2004 03:37:28 +0000 (GMT)
Received: from avs1.arnes.si (avs1.arnes.si [193.2.1.74])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 560D743D48
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jun 2004 03:37:27 +0000 (GMT)
	(envelope-from lesi@idefix.ijs.si)
Received: from localhost (avs1.arnes.si [193.2.1.74])
	by avs1.arnes.si (Postfix) with ESMTP id 94E4E1988AB
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jun 2004 05:37:26 +0200 (CEST)
Received: from avs1.arnes.si ([193.2.1.74])
	by localhost (avs1.arnes.si [193.2.1.74]) (amavisd-new, port 10024)
	with ESMTP id 66110-09 for <FreeBSD-gnats-submit@freebsd.org>;
	Thu, 10 Jun 2004 05:37:26 +0200 (CEST)
Received: from idefix.ijs.si (clj8-144.dial-up.arnes.si [194.249.52.144])
	by avs1.arnes.si (Postfix) with ESMTP id DF38A1988AC
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 10 Jun 2004 05:37:25 +0200 (CEST)
Received: by idefix.ijs.si (Postfix, from userid 1001)
	id D1C0833CA0; Thu, 10 Jun 2004 05:37:24 +0200 (CEST)
Message-Id: <20040610033724.D1C0833CA0@idefix.ijs.si>
Date: Thu, 10 Jun 2004 05:37:24 +0200 (CEST)
From: Dejan Lesjak <dejan.lesjak@ijs.si>
Reply-To: Dejan Lesjak <dejan.lesjak@ijs.si>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update XFree86 font server to 4.4 release.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67784
>Category:       ports
>Synopsis:       Update XFree86 font server to 4.4 release.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    x11
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 10 03:40:23 GMT 2004
>Closed-Date:    Tue Aug 10 01:52:56 GMT 2004
>Last-Modified:  Tue Aug 10 01:52:56 GMT 2004
>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@idefix.ijs.si:/usr/obj/usr/src/sys/IDEFIX i386


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

added files:
pkg-install
files/patch-programs::xfs::Imakefile

	
>How-To-Repeat:
	
>Fix:

	

--- XFree86-4-FontServer.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-FontServer/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	12 Dec 2003 23:50:09 -0000	1.23
+++ Makefile	2 Jun 2004 20:50:50 -0000
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	FontServer
-PORTVERSION=	4.3.0
-PORTREVISION=	3
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-1.tgz \
-		X430src-2.tgz \
-		X430src-3.tgz
+DISTFILES=	XFree86-4.4.0-src-1.tgz \
+		XFree86-4.4.0-src-2.tgz \
+		XFree86-4.4.0-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 font server
@@ -23,6 +22,10 @@
 XBUILD_DIRS=		programs/xfs
 XINCLUDE_DIRS=		lib/xtrans programs/Xserver
 XINSTALL_MAN_DIRS=	programs/xfs
+EXTRA_PATCHES+=		${FILESDIR}/patch-programs::xfs::Imakefile
+
+post-install:
+	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-FontServer/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	31 Mar 2004 03:12:51 -0000	1.9
+++ distinfo	2 Jun 2004 20:50:47 -0000
@@ -1,6 +1,6 @@
-MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
-SIZE (xc/X430src-1.tgz) = 10993622
-MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
-SIZE (xc/X430src-2.tgz) = 7962239
-MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
-SIZE (xc/X430src-3.tgz) = 12366363
+MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
+SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
+MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
+SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
+MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
+SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-install	2 Jun 2004 20:50:41 -0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
+XFSCONFDIR=${PKG_PREFIX}/lib/X11/fs
+
+if [ ! -f ${XFSCONFDIR}/config ]; then
+	cp ${XFSCONFDIR}/config.default ${XFSCONFDIR}/config
+fi
Index: pkg-plist
===================================================================
RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-FontServer/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	25 Mar 2001 23:04:50 -0000	1.5
+++ pkg-plist	2 Jun 2004 20:50:54 -0000
@@ -1,2 +1,3 @@
+@unexec if cmp -s %D/lib/X11/fs/config %D/lib/X11/fs/config.default; then rm -f %D/lib/X11/fs/config; fi
 bin/xfs
-lib/X11/fs/config
+lib/X11/fs/config.default
Index: files/patch-programs::xfs::Imakefile
===================================================================
RCS file: files/patch-programs::xfs::Imakefile
diff -N files/patch-programs::xfs::Imakefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-programs::xfs::Imakefile	2 Jun 2004 20:50:11 -0000
@@ -0,0 +1,11 @@
+--- programs/xfs/Imakefile.orig	Tue Apr 20 20:57:28 2004
++++ programs/xfs/Imakefile	Tue Apr 20 20:58:12 2004
+@@ -58,7 +58,7 @@
+ InstallManPage(xfs,$(MANDIR))
+ 
+ #if InstallFSConfig
+-InstallNonExecFile(config,$(FSLIBDIR))
++InstallNamedNonExec(config,config.default,$(FSLIBDIR))
+ #else
+ InstallNonExecFileNoClobber(config,$(FSLIBDIR))
+ #endif
--- XFree86-4-FontServer.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->x11 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Jun 10 06:48:35 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67784 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67508 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67510 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67513 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67775 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67733 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67776 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67777 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67778 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67779 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67781 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67783 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Tue Aug 10 01:50:08 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67784 
>Unformatted:
