From owner-freebsd-ports  Sat Feb  9 12: 0:24 2002
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 2886237B428
	for <freebsd-ports@hub.freebsd.org>; Sat,  9 Feb 2002 12:00:05 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g19K04l27374;
	Sat, 9 Feb 2002 12:00:04 -0800 (PST)
	(envelope-from gnats)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E20F937B405
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  9 Feb 2002 11:55:41 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g19JtfB25358;
	Sat, 9 Feb 2002 11:55:41 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200202091955.g19JtfB25358@freefall.freebsd.org>
Date: Sat, 9 Feb 2002 11:55:41 -0800 (PST)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/34775: Update port: x11-wm/xfce to 3.8.14c
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:         34775
>Category:       ports
>Synopsis:       Update port: x11-wm/xfce to 3.8.14c
>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:   Sat Feb 09 12:00:04 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 3.8.14c

ports/34229 and ports/34715 should be superseded by this PR.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile
--- /usr/ports/x11-wm/xfce/Makefile	Thu Jan 24 20:30:43 2002
+++ x11-wm/xfce/Makefile	Sun Feb 10 04:08:35 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce
-PORTVERSION=	3.8.14
+PORTVERSION=	3.8.14c
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xfce.org/archive/
@@ -15,6 +15,7 @@
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
+		giconv.2:${PORTSDIR}/converters/libiconv \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_X_PREFIX=	yes
@@ -23,7 +24,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-conf-dir=${PREFIX}/etc/xfce \
 		--with-data-dir=${PREFIX}/share/xfce \
 		--with-locale-dir=${PREFIX}/share/locale \
@@ -57,9 +58,10 @@
 pre-patch:
 	@${PERL} -pi -e \
 		'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
+		 s|<iconv.h>|<giconv.h>|g ; \
+		 s|-liconv|-lgiconv|g' ${WRKSRC}/configure
 	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+	@${PERL} -pi -e 's|<iconv.h>|<giconv.h>}|g' ${WRKSRC}/xfmenu/xfmenu.c
 	@${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/x11-wm/xfce/distinfo x11-wm/xfce/distinfo
--- /usr/ports/x11-wm/xfce/distinfo	Thu Jan 24 20:30:43 2002
+++ x11-wm/xfce/distinfo	Wed Feb  6 22:48:31 2002
@@ -1 +1 @@
-MD5 (xfce-3.8.14.tar.gz) = e92f08aa1aa404d3246cfb21cc9a237e
+MD5 (xfce-3.8.14c.tar.gz) = 64f83b3fe758777593da353c6f1c2044

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

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