Date: Mon, 23 Jul 2001 14:12:47 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/29181: Update port: x11-wm/xfce to 3.8.5 (fix ports/29023) Message-ID: <200107232112.f6NLCln49019@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 29181 >Category: ports >Synopsis: Update port: x11-wm/xfce to 3.8.5 (fix ports/29023) >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 Jul 23 14:20:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.8.5 Remove file: files/patch-ag files/patch-ah files/patch-ai files/patch-ak This PR supersedes ports/29023. >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile --- /usr/ports/x11-wm/xfce/Makefile Mon Jun 11 19:20:13 2001 +++ x11-wm/xfce/Makefile Mon Jul 23 20:02:29 2001 @@ -6,14 +6,18 @@ # PORTNAME= xfce -PORTVERSION= 3.8.3 +PORTVERSION= 3.8.5 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 +LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf + USE_X_PREFIX= yes -USE_IMLIB= yes +USE_GTK= yes USE_XPM= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -33,6 +37,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/distinfo x11-wm/xfce/distinfo --- /usr/ports/x11-wm/xfce/distinfo Mon Jun 11 19:20:13 2001 +++ x11-wm/xfce/distinfo Mon Jul 23 19:15:32 2001 @@ -1 +1 @@ -MD5 (xfce-3.8.3.tar.gz) = f708f02e3a0aa290c030980d5f685b40 +MD5 (xfce-3.8.5.tar.gz) = 04b150a55a768b5e76d0e76c2e8dff8a diff -urN /usr/ports/x11-wm/xfce/files/patch-ag x11-wm/xfce/files/patch-ag --- /usr/ports/x11-wm/xfce/files/patch-ag Mon May 7 19:41:57 2001 +++ x11-wm/xfce/files/patch-ag Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- libs/configure.h.orig Sat Apr 14 04:55:30 2001 -+++ libs/configure.h Sun May 6 08:03:18 2001 -@@ -22,7 +22,7 @@ - #define CLOSE_STRING4 "quit" - - /* #ifdef __alpha */ --#if defined(__alpha) && !defined(linux) && !defined(__DECC) -+#if defined(__alpha) && !(defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__DECC) - #define NEEDS_ALPHA_HEADER - #undef BROKEN_SUN_HEADERS - #endif /* (__alpha) */ diff -urN /usr/ports/x11-wm/xfce/files/patch-ah x11-wm/xfce/files/patch-ah --- /usr/ports/x11-wm/xfce/files/patch-ah Mon Jun 11 19:20:13 2001 +++ x11-wm/xfce/files/patch-ah Thu Jan 1 09:00:00 1970 @@ -1,6 +0,0 @@ ---- other/xfsoundrc.in.orig Tue May 22 05:04:07 2001 -+++ other/xfsoundrc.in Sat Jun 9 22:03:03 2001 -@@ -1,5 +1,5 @@ - Play --xfplay -+internal diff -urN /usr/ports/x11-wm/xfce/files/patch-ai x11-wm/xfce/files/patch-ai --- /usr/ports/x11-wm/xfce/files/patch-ai Sat Feb 10 06:39:51 2001 +++ x11-wm/xfce/files/patch-ai Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- xfsound/xfdsp.c.orig Fri Jul 7 05:51:00 2000 -+++ xfsound/xfdsp.c Tue Feb 6 04:52:16 2001 -@@ -45,7 +45,7 @@ - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <sys/types.h> --#if defined(linux) -+#if defined(linux) || defined(__FreeBSD__) - #include <sys/soundcard.h> /* guess :) */ - #endif - -@@ -62,7 +62,7 @@ - - int masterfd; - --#if defined(linux) -+#if defined(linux) || defined(__FreeBSD__) - int - i_play (char *soundfile) - { 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; diff -urN /usr/ports/x11-wm/xfce/pkg-plist x11-wm/xfce/pkg-plist --- /usr/ports/x11-wm/xfce/pkg-plist Mon Jun 11 19:20:14 2001 +++ x11-wm/xfce/pkg-plist Mon Jul 23 22:14:16 2001 @@ -37,6 +37,7 @@ etc/xfce/xfce3rc.ja etc/xfce/xfce3rc.ko etc/xfce/xfce3rc.nl +etc/xfce/xfce3rc.sr etc/xfce/xfce3rc.zh_CN.GB2312 etc/xfce/xfce3rc.zh_TW.Big5 etc/xfce/xfclockrc @@ -53,6 +54,7 @@ share/locale/cs/LC_MESSAGES/xfce.mo share/locale/da/LC_MESSAGES/xfce.mo share/locale/de/LC_MESSAGES/xfce.mo +share/locale/en_GB/LC_MESSAGES/xfce.mo share/locale/es/LC_MESSAGES/xfce.mo share/locale/et/LC_MESSAGES/xfce.mo share/locale/fi/LC_MESSAGES/xfce.mo @@ -67,8 +69,10 @@ share/locale/ro/LC_MESSAGES/xfce.mo share/locale/ru/LC_MESSAGES/xfce.mo share/locale/sk/LC_MESSAGES/xfce.mo +share/locale/sr/LC_MESSAGES/xfce.mo share/locale/sv/LC_MESSAGES/xfce.mo share/locale/zh/LC_MESSAGES/xfce.mo +share/locale/zh_CN/LC_MESSAGES/xfce.mo share/xfce/COPYING share/xfce/XFce3.logo share/xfce/backdrops/A-Little-Exercise-3.jpg @@ -76,6 +80,7 @@ share/xfce/backdrops/Anneaux.xpm share/xfce/backdrops/Arena.xpm share/xfce/backdrops/Aurora.xpm +share/xfce/backdrops/BlackStripes.xpm share/xfce/backdrops/Blue.list share/xfce/backdrops/BlueSatin.xpm share/xfce/backdrops/BlueSea.xpm @@ -106,10 +111,12 @@ share/xfce/backdrops/Glasses.xpm share/xfce/backdrops/Gold.xpm share/xfce/backdrops/Gradient.xpm +share/xfce/backdrops/Green.xpm share/xfce/backdrops/GreenStripes.xpm share/xfce/backdrops/GreenStucco.xpm share/xfce/backdrops/Greenslate.xpm share/xfce/backdrops/Grey.xpm +share/xfce/backdrops/GreyArena.xpm share/xfce/backdrops/Greydrops.xpm share/xfce/backdrops/Greysea.xpm share/xfce/backdrops/Hardblue.xpm @@ -151,6 +158,7 @@ share/xfce/backdrops/Sunny.xpm share/xfce/backdrops/Teal.xpm share/xfce/backdrops/The-Good-Times.jpg +share/xfce/backdrops/TheLake.jpg share/xfce/backdrops/Tiles.xpm share/xfce/backdrops/Tiles2.xpm share/xfce/backdrops/Tiles3.xpm @@ -170,6 +178,7 @@ share/xfce/backdrops/Weave-red.xpm share/xfce/backdrops/Weird.xpm share/xfce/backdrops/Whirl.xpm +share/xfce/backdrops/WhiteStripes.xpm share/xfce/backdrops/Wood-floor.xpm share/xfce/backdrops/Wood.xpm share/xfce/backdrops/Wood2.xpm @@ -180,35 +189,81 @@ share/xfce/backdrops/Xfcemice.jpg share/xfce/fonts/cursor2.pcf share/xfce/fonts/fonts.dir -share/xfce/help/help.gl.html -share/xfce/help/help.html -share/xfce/help/help.nl.html -share/xfce/help/slogan.jpg -share/xfce/help/title_legend.jpg -share/xfce/help/xfbd.jpg -share/xfce/help/xfce_action.jpg -share/xfce/help/xfce_colorsel.jpg -share/xfce/help/xfce_fontsel.jpg -share/xfce/help/xfce_modify.jpg -share/xfce/help/xfce_panel.jpg -share/xfce/help/xfce_popup.jpg -share/xfce/help/xfce_popup_detached.jpg -share/xfce/help/xfce_screen.jpg -share/xfce/help/xfce_setup1.jpg -share/xfce/help/xfce_setup2.jpg -share/xfce/help/xfce_setup3.jpg -share/xfce/help/xfce_setup4.jpg -share/xfce/help/xfce_snap.jpg -share/xfce/help/xfmouse.jpg -share/xfce/help/xfpager.jpg -share/xfce/help/xfsound.jpg -share/xfce/help/xftree.jpg -share/xfce/help/xftree_menu.jpg -share/xfce/help/xfwm_menu1.jpg -share/xfce/help/xfwm_menu2.jpg -share/xfce/help/xfwm_menu3.jpg -share/xfce/help/xfwm_menu4.jpg -share/xfce/help/xfwm_menu5.jpg +share/xfce/help/html/adv-wm-appearance.html +share/xfce/help/html/adv-wm-bindings.html +share/xfce/help/html/adv-wm-commands.html +share/xfce/help/html/adv-wm-defaults.html +share/xfce/help/html/adv-wm-examples.html +share/xfce/help/html/adv-wm-general.html +share/xfce/help/html/adv-wm-management.html +share/xfce/help/html/adv-wm-menus.html +share/xfce/help/html/adv-wm-style.html +share/xfce/help/html/adv-wm-xresources.html +share/xfce/help/html/advanced-wm.html +share/xfce/help/html/copyright.html +share/xfce/help/html/fileman.html +share/xfce/help/html/gpl.html +share/xfce/help/html/help.html +share/xfce/help/html/install.html +share/xfce/help/html/intro.html +share/xfce/help/html/license.html +share/xfce/help/html/ln9.html +share/xfce/help/html/overview.html +share/xfce/help/html/panel.html +share/xfce/help/html/resources.html +share/xfce/help/html/setup-startup.html +share/xfce/help/html/setup-wm.html +share/xfce/help/html/setup-xfce.html +share/xfce/help/html/setup.html +share/xfce/help/html/stylesheet-images/caution.gif +share/xfce/help/html/stylesheet-images/home.gif +share/xfce/help/html/stylesheet-images/important.gif +share/xfce/help/html/stylesheet-images/next.gif +share/xfce/help/html/stylesheet-images/note.gif +share/xfce/help/html/stylesheet-images/prev.gif +share/xfce/help/html/stylesheet-images/tip.gif +share/xfce/help/html/stylesheet-images/toc-blank.gif +share/xfce/help/html/stylesheet-images/toc-minus.gif +share/xfce/help/html/stylesheet-images/toc-plus.gif +share/xfce/help/html/stylesheet-images/up.gif +share/xfce/help/html/stylesheet-images/warning.gif +share/xfce/help/html/user-manual.html +share/xfce/help/html/utilities.html +share/xfce/help/html/utils-xfbdmgr.html +share/xfce/help/html/utils-xfclock.html +share/xfce/help/html/utils-xfdiff.html +share/xfce/help/html/utils-xfglob.html +share/xfce/help/html/utils-xfgnome.html +share/xfce/help/html/utils-xfmenu.html +share/xfce/help/html/utils-xfmouse.html +share/xfce/help/html/utils-xfpager.html +share/xfce/help/html/utils-xfrun.html +share/xfce/help/html/utils-xfsamba.html +share/xfce/help/html/utils-xfsound.html +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 @@ -312,6 +367,9 @@ share/xfce/icons/Xterm.xpm share/xfce/icons/Xv.xpm share/xfce/palettes/Alpine +share/xfce/palettes/Altxfce +share/xfce/palettes/Altxfce2 +share/xfce/palettes/Altxfce3 share/xfce/palettes/Aluminium share/xfce/palettes/Analog share/xfce/palettes/Anthracite @@ -337,6 +395,7 @@ share/xfce/palettes/Golden share/xfce/palettes/GoldenBoy share/xfce/palettes/Grayscale +share/xfce/palettes/GreenIron share/xfce/palettes/Ground share/xfce/palettes/Helice share/xfce/palettes/HiContrast @@ -344,6 +403,7 @@ share/xfce/palettes/HiTech2 share/xfce/palettes/Iceland share/xfce/palettes/Jazza +share/xfce/palettes/Jazza2 share/xfce/palettes/Kdetheme share/xfce/palettes/Liquid share/xfce/palettes/Liquid2 @@ -351,6 +411,8 @@ share/xfce/palettes/Metal share/xfce/palettes/Military share/xfce/palettes/Modern +share/xfce/palettes/Moz9 +share/xfce/palettes/Moz9-2 share/xfce/palettes/Nature share/xfce/palettes/Nemo share/xfce/palettes/Netsy @@ -444,10 +506,12 @@ share/xfce/textures/Kdetheme.xpm share/xfce/textures/Liquid.xpm share/xfce/textures/Modern.xpm +share/xfce/textures/Moz9.xpm share/xfce/textures/Power.xpm share/xfce/textures/Power2.xpm share/xfce/textures/Smooth.xpm share/xfce/textures/SmoothBW.xpm +share/xfce/textures/Xfcemetal.xpm share/xfce/textures/bronze.xpm share/xfce/textures/cheese.xpm share/xfce/textures/craters.xpm @@ -459,12 +523,15 @@ share/xfce/textures/paper.xpm share/xfce/textures/silver.xpm share/xfce/textures/stripe.xpm -@dirrm etc/xfce -@dirrm share/xfce/backdrops -@dirrm share/xfce/fonts -@dirrm share/xfce/help -@dirrm share/xfce/icons -@dirrm share/xfce/palettes -@dirrm share/xfce/sounds @dirrm share/xfce/textures +@dirrm share/xfce/sounds +@dirrm share/xfce/palettes +@dirrm share/xfce/icons +@dirrm share/xfce/help/images +@dirrm share/xfce/help/html/stylesheet-images +@dirrm share/xfce/help/html +@dirrm share/xfce/help +@dirrm share/xfce/fonts +@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?200107232112.f6NLCln49019>