diff options
| author | Yukihiro Nakai <nakai@FreeBSD.org> | 2002-02-18 10:37:10 +0000 |
|---|---|---|
| committer | Yukihiro Nakai <nakai@FreeBSD.org> | 2002-02-18 10:37:10 +0000 |
| commit | 101a385790373d249f12ed508c82e352b4bb3e53 (patch) | |
| tree | 06f82bc27dd3a4c5d6a0e0fb37e9c5a690faa21a /x11-wm/xfce4 | |
| parent | Prevent /bin/sh from hanging around along with esd just polluting ps(1) output. (diff) | |
Update to 3.8.14c
Use giconv
PR: ports/34775
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=54864
Diffstat (limited to 'x11-wm/xfce4')
| -rw-r--r-- | x11-wm/xfce4/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/xfce4/distinfo | 2 | ||||
| -rw-r--r-- | x11-wm/xfce4/pkg-plist | 18 |
3 files changed, 16 insertions, 14 deletions
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|<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 --git a/x11-wm/xfce4/distinfo b/x11-wm/xfce4/distinfo index df26299da3bb..277295a38aae 100644 --- a/x11-wm/xfce4/distinfo +++ b/x11-wm/xfce4/distinfo @@ -1 +1 @@ -MD5 (xfce-3.8.14.tar.gz) = e92f08aa1aa404d3246cfb21cc9a237e +MD5 (xfce-3.8.14c.tar.gz) = 64f83b3fe758777593da353c6f1c2044 diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist index cf0b14f20f1b..c1fed1fd3215 100644 --- a/x11-wm/xfce4/pkg-plist +++ b/x11-wm/xfce4/pkg-plist @@ -625,16 +625,16 @@ share/xfce/textures/oldwood.xpm share/xfce/textures/paper.xpm share/xfce/textures/silver.xpm share/xfce/textures/stripe.xpm -@dirrm share/xfce/textures -@dirrm share/xfce/sounds -@dirrm share/xfce/palettes -@dirrm share/xfce/icons -@dirrm share/xfce/help/html/stylesheet-images +@dirrm etc/xfce +@dirrm share/xfce/backdrops +@dirrm share/xfce/cursors +@dirrm share/xfce/fonts @dirrm share/xfce/help/html/images +@dirrm share/xfce/help/html/stylesheet-images @dirrm share/xfce/help/html @dirrm share/xfce/help -@dirrm share/xfce/fonts -@dirrm share/xfce/cursors -@dirrm share/xfce/backdrops +@dirrm share/xfce/icons +@dirrm share/xfce/palettes +@dirrm share/xfce/sounds +@dirrm share/xfce/textures @dirrm share/xfce -@dirrm etc/xfce |