From owner-freebsd-x11@FreeBSD.ORG Sat Jul 24 21:50:22 2004 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56FC216A4CE for ; Sat, 24 Jul 2004 21:50:22 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3885B43D41 for ; Sat, 24 Jul 2004 21:50:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i6OLoMK5001421 for ; Sat, 24 Jul 2004 21:50:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6OLoMKe001420; Sat, 24 Jul 2004 21:50:22 GMT (envelope-from gnats) Date: Sat, 24 Jul 2004 21:50:22 GMT Message-Id: <200407242150.i6OLoMKe001420@freefall.freebsd.org> To: x11@FreeBSD.org From: Mark Linimon Subject: Re: ports/67787: Update XFree86 nest server to 4.4 release. X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mark Linimon List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2004 21:50:22 -0000 The following reply was made to PR ports/67787; it has been noted by GNATS. From: Mark Linimon To: freebsd-gnats-submit@FreeBSD.org Cc: dejan.lesjak@ijs.si Subject: Re: ports/67787: Update XFree86 nest server to 4.4 release. Date: Sat, 24 Jul 2004 16:41:52 -0500 --Boundary-00=_getABncyonU37jF Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Now that the x.org patches have gone in, the above patch no longer applies cleanly. Here is a corrected one. --Boundary-00=_getABncyonU37jF Content-Type: text/x-diff; charset="us-ascii"; name="67787.corrected" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="67787.corrected" Index: Makefile =================================================================== RCS file: /home/FreeBSD/pcvs/ports/x11-servers/XFree86-4-NestServer/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 23 Jul 2004 19:10:25 -0000 1.28 +++ Makefile 24 Jul 2004 04:50:16 -0000 @@ -6,21 +6,20 @@ # 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 \ - Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz +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= 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 @@ -28,6 +27,7 @@ CONFLICTS= xorg-nestserver-* 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 @@ -36,6 +36,9 @@ post-extract: ${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 --Boundary-00=_getABncyonU37jF--