From 101a385790373d249f12ed508c82e352b4bb3e53 Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Mon, 18 Feb 2002 10:37:10 +0000 Subject: Update to 3.8.14c Use giconv PR: ports/34775 Submitted by: KATO Tsuguru --- x11-wm/xfce4/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'x11-wm/xfce4/Makefile') diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 91ccc196ce3e..f6138b4cb3e2 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -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 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 @@ USE_XPM= yes 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-everything:: 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|||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|||g' ${WRKSRC}/xfmenu/xfmenu.c @${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in .include -- cgit v1.2.3