Date: Tue, 19 Nov 2002 06:19:00 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45457: Update port: x11-wm/xfce to 3.1.18 Message-ID: <20021119061900.2eab2bf2.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 45457
>Category: ports
>Synopsis: Update port: x11-wm/xfce to 3.1.18
>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: Mon Nov 18 13:30:16 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 3.1.18
New file:
files/patch-other::xinitrc.in
Following PRs should be superseded by this one:
[2002/08/17] ports/41754 ports Patch XFCE for GNOME apps in menu and fix
[2002/11/17] ports/45384 ports xfce have a new release
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile
--- /usr/ports/x11-wm/xfce/Makefile Mon Nov 11 19:01:45 2002
+++ x11-wm/xfce/Makefile Tue Nov 19 04:34:26 2002
@@ -6,7 +6,7 @@
#
PORTNAME= xfce
-PORTVERSION= 3.8.16
+PORTVERSION= 3.8.18
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.xfce.org/archive/
@@ -14,17 +14,15 @@
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
- iconv.3:${PORTSDIR}/converters/libiconv \
- gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
-USE_REINPLACE= yes
USE_X_PREFIX= yes
-USE_GNOMENG= yes
-USE_GNOME= gtk12
USE_XPM= yes
+USE_GNOMENG= yes
+USE_GNOME= gdkpixbuf
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \
@@ -32,11 +30,12 @@
--with-locale-dir=${PREFIX}/share/locale \
--with-xpm=${X11BASE} \
--enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \
- --disable-arts
+ --disable-arts \
+ --enable-taskbar
-MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfumed.1 xfglob.1 xfgnome.1 \
- xfhelp.1 xflock.1 xfmountdev.1 xfmouse.1 xfpager.1 xfprint.1 \
- xfrun.1 xfskin.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1
+MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \
+ xflock.1 xfmountdev.1 xfmouse.1 xfpager.1 xfprint.1 xfrun.1 \
+ xfskin.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfumed.1 xfwm.1
.include <bsd.port.pre.mk>
@@ -61,13 +60,11 @@
@${REINPLACE_CMD} -e 's|=aclocal|=${TRUE}|g ; \
s|=autoconf|=${TRUE}|g ; \
s|=automake|=${TRUE}|g ; \
- s|=autoheader|=${TRUE}|g ; \
- s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+ s|=autoheader|=${TRUE}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
-
-post-install:
- @${LN} -sf ${PREFIX}/share/xfce/help/html/images \
- ${PREFIX}/share/xfce/help/images
+ @${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
.include <bsd.port.post.mk>
diff -urN /usr/ports/x11-wm/xfce/distinfo x11-wm/xfce/distinfo
--- /usr/ports/x11-wm/xfce/distinfo Tue Sep 10 20:35:55 2002
+++ x11-wm/xfce/distinfo Tue Nov 12 03:07:29 2002
@@ -1 +1 @@
-MD5 (xfce-3.8.16.tar.gz) = e73dba58bb04eb1facc682b308a422b3
+MD5 (xfce-3.8.18.tar.gz) = 04c197eee32d712a49170539d50279ea
diff -urN /usr/ports/x11-wm/xfce/files/patch-ltmain.sh x11-wm/xfce/files/patch-ltmain.sh
--- /usr/ports/x11-wm/xfce/files/patch-ltmain.sh Wed Jan 23 06:30:42 2002
+++ x11-wm/xfce/files/patch-ltmain.sh Tue Nov 12 03:09:33 2002
@@ -1,6 +1,6 @@
---- ltmain.sh.orig Thu Nov 22 05:43:58 2001
-+++ ltmain.sh Fri Dec 7 07:18:03 2001
-@@ -944,6 +944,7 @@
+--- ltmain.sh.orig Mon Jun 10 05:25:37 2002
++++ ltmain.sh Tue Nov 12 03:09:05 2002
+@@ -962,6 +962,7 @@
;;
-avoid-version)
@@ -8,17 +8,33 @@
avoid_version=yes
continue
;;
-@@ -2408,6 +2409,9 @@
+@@ -1054,14 +1055,14 @@
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -2471,7 +2472,7 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4175,10 +4179,12 @@
+@@ -4258,10 +4259,12 @@
fi
# Install the pseudo-library for information purposes.
diff -urN /usr/ports/x11-wm/xfce/files/patch-other::xinitrc.in x11-wm/xfce/files/patch-other::xinitrc.in
--- /usr/ports/x11-wm/xfce/files/patch-other::xinitrc.in Thu Jan 1 09:00:00 1970
+++ x11-wm/xfce/files/patch-other::xinitrc.in Tue Nov 19 04:22:14 2002
@@ -0,0 +1,14 @@
+--- other/xinitrc.in.orig Thu May 23 06:24:35 2002
++++ other/xinitrc.in Tue Nov 19 04:22:00 2002
+@@ -41,7 +41,10 @@
+ # fi
+
+ # Launch xscreensaver (if available)
+-xscreensaver -no-splash &
++XBINDIR=%%X11BASE%%/bin
++if [ -x $XBINDIR/xscreensaver ]; then
++ xscreensaver -no-splash &
++fi
+
+ # Finally, launch XFce window manager
+ exec xfwm
diff -urN /usr/ports/x11-wm/xfce/pkg-plist x11-wm/xfce/pkg-plist
--- /usr/ports/x11-wm/xfce/pkg-plist Tue Sep 10 20:35:55 2002
+++ x11-wm/xfce/pkg-plist Tue Nov 12 03:40:05 2002
@@ -31,6 +31,7 @@
etc/xfce/Xclients
etc/xfce/fvwm2rc
etc/xfce/fvwmrc
+etc/xfce/taskbarrc
etc/xfce/xfbdrc
etc/xfce/xfce3rc
etc/xfce/xfce3rc.cs
@@ -64,6 +65,7 @@
share/locale/fi/LC_MESSAGES/xfce.mo
share/locale/fr/LC_MESSAGES/xfce.mo
share/locale/gl/LC_MESSAGES/xfce.mo
+share/locale/he/LC_MESSAGES/xfce.mo
share/locale/hu/LC_MESSAGES/xfce.mo
share/locale/it/LC_MESSAGES/xfce.mo
share/locale/ja/LC_MESSAGES/xfce.mo
@@ -264,27 +266,6 @@
share/xfce/help/html/fileman.html
share/xfce/help/html/gpl.html
share/xfce/help/html/help.html
-share/xfce/help/html/images/buttons.jpg
-share/xfce/help/html/images/xfbd.jpg
-share/xfce/help/html/images/xfbdmgr.jpg
-share/xfce/help/html/images/xfce_panel.jpg
-share/xfce/help/html/images/xfce_popup.jpg
-share/xfce/help/html/images/xfce_setup1.jpg
-share/xfce/help/html/images/xfce_setup2.jpg
-share/xfce/help/html/images/xfce_setup3.jpg
-share/xfce/help/html/images/xfce_setup4.jpg
-share/xfce/help/html/images/xfce_slogan.jpg
-share/xfce/help/html/images/xfce_snap.jpg
-share/xfce/help/html/images/xfclock.jpg
-share/xfce/help/html/images/xfdiff.jpg
-share/xfce/help/html/images/xfglob.jpg
-share/xfce/help/html/images/xfmouse.jpg
-share/xfce/help/html/images/xfpager.jpg
-share/xfce/help/html/images/xfrun.jpg
-share/xfce/help/html/images/xfsamba.jpg
-share/xfce/help/html/images/xfsound.jpg
-share/xfce/help/html/images/xftree.jpg
-share/xfce/help/html/images/xfumed.jpg
share/xfce/help/html/install.html
share/xfce/help/html/intro.html
share/xfce/help/html/license.html
@@ -324,6 +305,27 @@
share/xfce/help/html/utils-xfumed.html
share/xfce/help/html/wm-examples-2.html
share/xfce/help/html/wm.html
+share/xfce/help/images/buttons.jpg
+share/xfce/help/images/xfbd.jpg
+share/xfce/help/images/xfbdmgr.jpg
+share/xfce/help/images/xfce_panel.jpg
+share/xfce/help/images/xfce_popup.jpg
+share/xfce/help/images/xfce_setup1.jpg
+share/xfce/help/images/xfce_setup2.jpg
+share/xfce/help/images/xfce_setup3.jpg
+share/xfce/help/images/xfce_setup4.jpg
+share/xfce/help/images/xfce_slogan.jpg
+share/xfce/help/images/xfce_snap.jpg
+share/xfce/help/images/xfclock.jpg
+share/xfce/help/images/xfdiff.jpg
+share/xfce/help/images/xfglob.jpg
+share/xfce/help/images/xfmouse.jpg
+share/xfce/help/images/xfpager.jpg
+share/xfce/help/images/xfrun.jpg
+share/xfce/help/images/xfsamba.jpg
+share/xfce/help/images/xfsound.jpg
+share/xfce/help/images/xftree.jpg
+share/xfce/help/images/xfumed.jpg
share/xfce/icons/3dpaint.xpm
share/xfce/icons/ABC.xpm
share/xfce/icons/AZ.xpm
@@ -490,6 +492,7 @@
share/xfce/palettes/KStyle2
share/xfce/palettes/KXfce
share/xfce/palettes/Kdetheme
+share/xfce/palettes/Kindaker
share/xfce/palettes/LightBulb
share/xfce/palettes/LightBulb2
share/xfce/palettes/LightBulb3
@@ -522,6 +525,7 @@
share/xfce/palettes/PruneDark
share/xfce/palettes/Quartz
share/xfce/palettes/Reader
+share/xfce/palettes/Redmond
share/xfce/palettes/Salmon
share/xfce/palettes/Salmon2
share/xfce/palettes/SaltLake
@@ -559,6 +563,7 @@
share/xfce/palettes/XLight
share/xfce/palettes/Xfce-1
share/xfce/palettes/Xfce-2
+share/xfce/palettes/Xfce-light
share/xfce/sounds/alert01.wav
share/xfce/sounds/beep01.wav
share/xfce/sounds/beep02.wav
@@ -641,18 +646,16 @@
share/xfce/textures/paper.xpm
share/xfce/textures/silver.xpm
share/xfce/textures/stripe.xpm
-@exec ln -s %D/share/xfce/help/html/images %D/share/xfce/help/images
-@unexec rm %D/share/xfce/help/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/textures
+@dirrm share/xfce/sounds
+@dirrm share/xfce/palettes
+@dirrm share/xfce/icons
@dirrm share/xfce/help/html/stylesheet-images
@dirrm share/xfce/help/html
+@dirrm share/xfce/help/images
@dirrm share/xfce/help
-@dirrm share/xfce/icons
-@dirrm share/xfce/palettes
-@dirrm share/xfce/sounds
-@dirrm share/xfce/textures
+@dirrm share/xfce/fonts
+@dirrm share/xfce/cursors
+@dirrm share/xfce/backdrops
@dirrm share/xfce
+@dirrm etc/xfce
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021119061900.2eab2bf2.tkato>