From owner-freebsd-ports  Wed Aug  8  4:30:29 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 9AFAF37B415
	for <freebsd-ports@hub.freebsd.org>; Wed,  8 Aug 2001 04:30:08 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f78BU8e36795;
	Wed, 8 Aug 2001 04:30:08 -0700 (PDT)
	(envelope-from gnats)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2E25D37B403
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  8 Aug 2001 04:22:42 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f78BMgP34954;
	Wed, 8 Aug 2001 04:22:42 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200108081122.f78BMgP34954@freefall.freebsd.org>
Date: Wed, 8 Aug 2001 04:22:42 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/29541: 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:         29541
>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:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 08 04:30:07 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Add MASTER_SITE_SOURCEFORGE to MASTER_SITE
- Support GTK_CONFIG properly
- Use internal sound playing function by default

Remove file:
files/patch-ak

No response from maintainer.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile
--- /usr/ports/x11-wm/xfce/Makefile	Tue Aug  7 06:54:14 2001
+++ x11-wm/xfce/Makefile	Wed Aug  8 20:18:50 2001
@@ -7,8 +7,11 @@
 
 PORTNAME=	xfce
 PORTVERSION=	3.8.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.xfce.org/archive/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.xfce.org/archive/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -35,6 +38,8 @@
 		's|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+	@${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
 
 pre-build:
 	${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool
diff -urN /usr/ports/x11-wm/xfce/files/patch-ak x11-wm/xfce/files/patch-ak
--- /usr/ports/x11-wm/xfce/files/patch-ak	Sun May  6 08:56:25 2001
+++ x11-wm/xfce/files/patch-ak	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- xfce/setup.c.orig	Sun May  6 08:51:24 2001
-+++ xfce/setup.c	Sun May  6 08:51:34 2001
-@@ -132,7 +132,7 @@
-    list = g_list_append(list, "xfce");
- 
-    /* Try to find the location of gtk engines */
--   if ((pdata=popen("gtk-config --prefix","r")) != NULL
-+   if ((pdata=popen("gtk12-config --prefix","r")) != NULL
-                    && fgets(buffer, sizeof(buffer), pdata) != NULL)
-      {
-        char *path;

>Release-Note:
>Audit-Trail:
>Unformatted:

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