From owner-freebsd-ports Wed Nov 27 17: 0:15 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5CA4337B401 for ; Wed, 27 Nov 2002 17:00:13 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4244D43EC2 for ; Wed, 27 Nov 2002 17:00:12 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gAS10Cx3043961 for ; Wed, 27 Nov 2002 17:00:12 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gAS10Cde043960; Wed, 27 Nov 2002 17:00:12 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8D1637B401 for ; Wed, 27 Nov 2002 16:58:57 -0800 (PST) Received: from charter.net (dhcp-220-8.slidell.charter-ala.com [24.158.214.244]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD54943EB2 for ; Wed, 27 Nov 2002 16:58:56 -0800 (PST) (envelope-from glennpj@charter.net) Received: from gforce.johnson.home (localhost [127.0.0.1]) by charter.net (8.12.6/8.12.6) with ESMTP id gAS0ws3g086455 for ; Wed, 27 Nov 2002 18:58:54 -0600 (CST) (envelope-from glenn@gforce.johnson.home) Received: (from glenn@localhost) by gforce.johnson.home (8.12.6/8.12.6/Submit) id gAS0wsSi086378; Wed, 27 Nov 2002 18:58:54 -0600 (CST) Message-Id: <200211280058.gAS0wsSi086378@gforce.johnson.home> Date: Wed, 27 Nov 2002 18:58:54 -0600 (CST) From: Glenn Johnson Reply-To: Glenn Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45811: fix XFCE Makefile for xscreensaver call Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45811 >Category: ports >Synopsis: fix XFCE Makefile for xscreensaver call >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 27 17:00:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Glenn Johnson >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD gforce.johnson.home 4.7-STABLE FreeBSD 4.7-STABLE #46: Wed Nov 27 11:44:32 CST 2002 root@gforce.johnson.home:/usr/obj/usr/src/sys/GFORCE i386 >Description: The sed command in the Makefile that alters the xinitrc file needs to be moved from the pre-patch target to a post-patch target. >How-To-Repeat: >Fix: Apply the attached patch to the Makefile of x11-wm/xfce. --- Makefile.orig Wed Nov 20 07:29:26 2002 +++ Makefile Wed Nov 27 18:56:31 2002 @@ -7,6 +7,7 @@ PORTNAME= xfce PORTVERSION= 3.8.18 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.xfce.org/archive/ @@ -62,9 +63,11 @@ s|=automake|=${TRUE}|g ; \ s|=autoheader|=${TRUE}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/other/xinitrc.in @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c @${REINPLACE_CMD} -e 's|/opt/kde3|${LOCALBASE}|g ; \ s|/opt/gnome|${X11BASE}|g' ${WRKSRC}/xfmenu/xfmenu.c + +post-patch: + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/other/xinitrc.in .include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message