Date: Thu, 10 Jun 2004 09:44:05 +0200 (CEST) From: Dejan Lesjak <dejan.lesjak@ijs.si> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67787: Update XFree86 nest server to 4.4 release. Message-ID: <20040610074405.76EBB33CA0@idefix.ijs.si> Resent-Message-ID: <200406100750.i5A7oRad020364@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67787 >Category: ports >Synopsis: Update XFree86 nest 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 07:50:26 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 nest 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::Xserver::Xext::Imakefile >How-To-Repeat: >Fix: --- XFree86-4-NestServer.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-NestServer/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 12 Dec 2003 23:50:10 -0000 1.26 +++ Makefile 3 Jun 2004 01:16:06 -0000 @@ -6,26 +6,26 @@ # PORTNAME= NestServer -PORTVERSION= 4.3.0 -PORTREVISION= 4 +PORTVERSION= 4.4.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ +DISTFILES= XFree86-4.4.0-src-1.tgz:x \ + XFree86-4.4.0-src-2.tgz:x \ + XFree86-4.4.0-src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +EXTRACT_ONLY= 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 nested X server MAN1= Xnest.1 +EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver @@ -35,5 +35,8 @@ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c +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-NestServer/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- distinfo 31 Mar 2004 03:12:51 -0000 1.12 +++ distinfo 3 Jun 2004 01:16:06 -0000 @@ -1,8 +1,8 @@ -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 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 SIZE (xc/Wraphelp2.gz) = 3376 Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-install 3 Jun 2004 01:16:05 -0000 @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "$2" != "POST-INSTALL" ]; then + exit 0 +fi + +PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} +SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver + +if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then + cp ${SECCONFDIR}/SecurityPolicy.default-NestServer \ + ${SECCONFDIR}/SecurityPolicy +fi Index: pkg-plist =================================================================== RCS file: /usr/local/freebsd-cvs/ports/x11-servers/XFree86-4-NestServer/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 16 Jan 2003 02:21:13 -0000 1.5 +++ pkg-plist 3 Jun 2004 01:16:07 -0000 @@ -1,2 +1,2 @@ bin/Xnest -lib/X11/xserver/SecurityPolicy +lib/X11/xserver/SecurityPolicy.default-NestServer Index: files/patch-programs::Xserver::Xext::Imakefile =================================================================== RCS file: files/patch-programs::Xserver::Xext::Imakefile diff -N files/patch-programs::Xserver::Xext::Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-programs::Xserver::Xext::Imakefile 3 Jun 2004 01:14:44 -0000 @@ -0,0 +1,11 @@ +--- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 ++++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 +@@ -160,7 +160,7 @@ + LinkSourceFile(modinit.h,extmod) + + #if BuildXCSecurity && InstallSecurityConfig +-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) ++InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-NestServer,$(SERVERCONFIGDIR)) + #endif + + DependTarget() --- XFree86-4-NestServer.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?20040610074405.76EBB33CA0>