Date: Thu, 10 Jun 2004 05:37:24 +0200 (CEST) From: Dejan Lesjak <dejan.lesjak@ijs.si> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67784: Update XFree86 font server to 4.4 release. Message-ID: <20040610033724.D1C0833CA0@idefix.ijs.si> Resent-Message-ID: <200406100340.i5A3eNis095839@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67784 >Category: ports >Synopsis: Update XFree86 font server 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@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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040610033724.D1C0833CA0>