From owner-freebsd-ports  Fri Jan 10  7:11: 0 2003
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 E554C37B406
	for <freebsd-ports@hub.freebsd.org>; Fri, 10 Jan 2003 07:10:25 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 83F9943FA3
	for <freebsd-ports@hub.freebsd.org>; Fri, 10 Jan 2003 07:10: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 h0AFABNS011680
	for <freebsd-ports@freefall.freebsd.org>; Fri, 10 Jan 2003 07:10:11 -0800 (PST)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0AFABR8011679;
	Fri, 10 Jan 2003 07:10:11 -0800 (PST)
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 71FB137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Jan 2003 07:00:25 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6763A43F18
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 10 Jan 2003 07:00:22 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 9EEF5874
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 11 Jan 2003 00:00:17 +0900 (JST)
Message-Id: <20030110235858.65e66b70.tkato@prontomail.com>
Date: Fri, 10 Jan 2003 23:58:58 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/46950: Update port: x11-wm/xfce
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         46950
>Category:       ports
>Synopsis:       Update port: x11-wm/xfce
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 10 07:10:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Rearrange pre-patch/post-patch target

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile
--- /usr/ports/x11-wm/xfce/Makefile	Mon Jan  6 16:11:05 2003
+++ x11-wm/xfce/Makefile	Fri Jan 10 17:32:08 2003
@@ -57,17 +57,11 @@
 	@${ECHO_MSG}
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|=aclocal|=${TRUE}|g ; \
-		 s|=autoconf|=${TRUE}|g ; \
-		 s|=automake|=${TRUE}|g ; \
-		 s|=autoheader|=${TRUE}|g' ${WRKSRC}/configure
+post-patch:
 	@${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