Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Nov 2002 18:58:54 -0600 (CST)
From:      Glenn Johnson <glennpj@charter.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/45811: fix XFCE Makefile for xscreensaver call
Message-ID:  <200211280058.gAS0wsSi086378@gforce.johnson.home>

next in thread | raw e-mail | index | archive | help

>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 <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211280058.gAS0wsSi086378>