Date: Wed, 7 Feb 2001 10:24:38 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24932: Update port: x11-wm/xfce to version 3.7.2 Message-ID: <200102071824.f17IOcv94842@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24932 >Category: ports >Synopsis: Update port: x11-wm/xfce to version 3.7.2 >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: Wed Feb 07 10:30:02 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.2-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.7.2 New file: files/patch-ag files/patch-ah files/patch-ai files/patch-aj files/patch-ak Remove file: files/patch-af No response from maintainer. >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile --- /usr/ports/x11-wm/xfce/Makefile Tue Feb 6 21:32:06 2001 +++ x11-wm/xfce/Makefile Wed Feb 7 22:16:55 2001 @@ -6,7 +6,7 @@ # PORTNAME= xfce -PORTVERSION= 3.6.3 +PORTVERSION= 3.7.2 CATEGORIES= x11-wm MASTER_SITES= http://www.xfce.org/archive/ @@ -14,18 +14,23 @@ USE_X_PREFIX= yes USE_IMLIB= yes -USE_ESOUND= yes USE_XPM= yes +USE_AUTOMAKE= yes +AUTOMAKE_ARGS= --include-deps USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share \ - --datadir=${PREFIX}/share \ - --sysconfdir=${PREFIX}/etc \ - --with-xpm=${X11BASE} + LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \ + --with-data-dir=${PREFIX}/share/xfce \ + --with-locale-dir=${PREFIX}/share/locale \ + --with-xpm=${X11BASE} \ + --disable-xinerama -MAN1= xfbd.1 xfce.1 xfclock.1 xfgnome.1 xfhelp.1 xflock.1 xfmountdev.1 \ - xfmouse.1 xfpager.1 xfprint.1 xfrun.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 \ + xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1 + +post-patch: + @cd ${WRKSRC} && aclocal .include <bsd.port.mk> diff -urN /usr/ports/x11-wm/xfce/distinfo x11-wm/xfce/distinfo --- /usr/ports/x11-wm/xfce/distinfo Tue Dec 5 23:04:00 2000 +++ x11-wm/xfce/distinfo Wed Feb 7 21:57:22 2001 @@ -1 +1 @@ -MD5 (xfce-3.6.3.tar.gz) = e42e017604edf8daa24417a28a218333 +MD5 (xfce-3.7.2.tar.gz) = bfa75eebe26852f7377c639e8abcbe4f diff -urN /usr/ports/x11-wm/xfce/files/patch-af x11-wm/xfce/files/patch-af --- /usr/ports/x11-wm/xfce/files/patch-af Thu Nov 2 20:09:10 2000 +++ x11-wm/xfce/files/patch-af Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- configure.orig Sun Oct 1 01:16:19 2000 -+++ configure Thu Nov 2 05:45:10 2000 -@@ -2622,6 +2622,8 @@ - if test "$cross_compiling" = yes; then - ac_cv_func_mmap_fixed_mapped=no - else -+ ac_save_LIBS="$LIBS" -+ LIBS="-lintl $LIBS" - cat > conftest.$ac_ext <<EOF - #line 2627 "configure" - #include "confdefs.h" -@@ -6667,8 +6669,8 @@ - - - -- -- -+XFCE_DIR=`eval echo $XFCE_DIR` -+XFCE_CONFDIR=`eval echo $XFCE_CONFDIR` - sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_setup.in > scripts/xfce_setup - sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_upgrade.in > scripts/xfce_upgrade - sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfhelp.in > scripts/xfhelp diff -urN /usr/ports/x11-wm/xfce/files/patch-ag x11-wm/xfce/files/patch-ag --- /usr/ports/x11-wm/xfce/files/patch-ag Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-ag Tue Feb 6 00:44:49 2001 @@ -0,0 +1,26 @@ +--- acinclude.m4.orig Thu Jun 22 10:41:00 2000 ++++ acinclude.m4 Tue Feb 6 00:44:40 2001 +@@ -128,9 +128,10 @@ + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, +- [AC_TRY_LINK([], [return (int) gettext ("")], +- gt_cv_func_gettext_libintl=yes, +- gt_cv_func_gettext_libintl=no)])]) ++ [AC_CHECK_LIB(intl, gettext, ++ gt_cv_func_gettext_libintl=yes, ++ gt_cv_func_gettext_libintl=no)], ++ gt_cv_func_gettext_libintl=no)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ +@@ -151,6 +152,9 @@ + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi ++ fi ++ if test "$gt_cv_func_gettext_libintl" = "yes"; then ++ INTLLIBS='-lintl' + fi + ]) + diff -urN /usr/ports/x11-wm/xfce/files/patch-ah x11-wm/xfce/files/patch-ah --- /usr/ports/x11-wm/xfce/files/patch-ah Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-ah Wed Feb 7 00:53:11 2001 @@ -0,0 +1,11 @@ +--- libs/configure.h.orig Tue Sep 5 02:26:09 2000 ++++ libs/configure.h Wed Feb 7 00:53:01 2001 +@@ -22,7 +22,7 @@ + #define CLOSE_STRING4 "quit" + + /* #ifdef __alpha */ +-#if defined(__alpha) && !defined(linux) ++#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) + #define NEEDS_ALPHA_HEADER + #undef BROKEN_SUN_HEADERS + #endif /* (__alpha) */ diff -urN /usr/ports/x11-wm/xfce/files/patch-ai x11-wm/xfce/files/patch-ai --- /usr/ports/x11-wm/xfce/files/patch-ai Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-ai Tue Feb 6 05:07:58 2001 @@ -0,0 +1,9 @@ +--- other/xfsoundrc.in.orig Tue Sep 5 02:26:09 2000 ++++ other/xfsoundrc.in Tue Feb 6 05:07:47 2001 +@@ -1,5 +1,5 @@ + Play +-xfplay ++internal + XFCE_DIR/sounds/beep03.wav + XFCE_DIR/sounds/pop02.wav + diff -urN /usr/ports/x11-wm/xfce/files/patch-aj x11-wm/xfce/files/patch-aj --- /usr/ports/x11-wm/xfce/files/patch-aj Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-aj Tue Feb 6 04:52:33 2001 @@ -0,0 +1,20 @@ +--- 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 Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-ak Tue Feb 6 04:56:24 2001 @@ -0,0 +1,37 @@ +--- xfwm/session.c.orig Wed Jan 31 04:50:16 2001 ++++ xfwm/session.c Tue Feb 6 04:56:10 2001 +@@ -566,8 +566,10 @@ + callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data) + { + char *path = NULL; +- char *filename = NULL; +- FILE *f = NULL; ++ char *filename; ++ FILE *f; ++ int fd; ++ + Bool success = True; + struct passwd *pwd; + +@@ -578,16 +580,18 @@ + path = pwd->pw_dir; + } + +- filename = tempnam (path, ".fs-"); ++ sprintf (filename, "path/.fs-XXXXXXXX"); ++ fd = mkstemp (filename); + + if (Scr.Options & SessionMgt) + { +- f = fopen (filename, "w"); ++ f = fdopen (fd, "w"); + success = save_session_state (sm_conn, filename, f); + fclose (f); + } +- if (!success) ++ if (!success || fd < 0) + xfwm_msg (WARN, "SaveSession", "Can't save session\n"); ++ close (fd); + /* also save session for builtin session mgt, so user will get + * back to his environmnent even if he doesn't use ICE + */ diff -urN /usr/ports/x11-wm/xfce/pkg-plist x11-wm/xfce/pkg-plist --- /usr/ports/x11-wm/xfce/pkg-plist Tue Dec 5 23:04:00 2000 +++ x11-wm/xfce/pkg-plist Thu Feb 8 02:37:46 2001 @@ -1,14 +1,19 @@ bin/CDE2Xfcepal +bin/glob bin/startxfce bin/xfbd +bin/xfbdmgr bin/xfce bin/xfce_remove bin/xfce_setup bin/xfce_upgrade bin/xfclock +bin/xfdiff +bin/xfglob bin/xfgnome bin/xfhelp bin/xflock +bin/xfmenu bin/xfmountdev bin/xfmouse bin/xfpager @@ -29,6 +34,7 @@ etc/xfce/xfce3rc.hu etc/xfce/xfce3rc.ja etc/xfce/xfce3rc.ko +etc/xfce/xfce3rc.nl etc/xfce/xfce3rc.zh_CN.GB2312 etc/xfce/xfce3rc.zh_TW.Big5 etc/xfce/xfclockrc @@ -66,6 +72,8 @@ share/xfce/backdrops/A-Little-Exercise.jpg share/xfce/backdrops/Anneaux.xpm share/xfce/backdrops/Arena.xpm +share/xfce/backdrops/Aurora.xpm +share/xfce/backdrops/Blue.list share/xfce/backdrops/BlueSatin.xpm share/xfce/backdrops/BlueSea.xpm share/xfce/backdrops/BlueStucco.xpm @@ -105,9 +113,12 @@ share/xfce/backdrops/Marbled.xpm share/xfce/backdrops/Master-Plan.jpg share/xfce/backdrops/Maze.xpm +share/xfce/backdrops/Nebula.xpm share/xfce/backdrops/Notes.xpm +share/xfce/backdrops/Overdriven.jpg share/xfce/backdrops/Pencils.xpm share/xfce/backdrops/Plasma.xpm +share/xfce/backdrops/Pled.xpm share/xfce/backdrops/Pool.xpm share/xfce/backdrops/Psy.xpm share/xfce/backdrops/Psy2.xpm @@ -125,11 +136,13 @@ share/xfce/backdrops/Slate.xpm share/xfce/backdrops/Soft.xpm share/xfce/backdrops/Softblue.xpm +share/xfce/backdrops/Softblue2.xpm share/xfce/backdrops/Sol.xpm share/xfce/backdrops/Solid.xpm share/xfce/backdrops/Space.xpm share/xfce/backdrops/Space2.xpm share/xfce/backdrops/Storm.xpm +share/xfce/backdrops/Sunny.xpm share/xfce/backdrops/Teal.xpm share/xfce/backdrops/The-Good-Times.jpg share/xfce/backdrops/Tiles.xpm @@ -141,13 +154,16 @@ share/xfce/backdrops/Toulouse-2.jpg share/xfce/backdrops/Toulouse-3.jpg share/xfce/backdrops/Toulouse-4.jpg +share/xfce/backdrops/Toulouse.list share/xfce/backdrops/Ufo.xpm share/xfce/backdrops/Wall1.xpm share/xfce/backdrops/Wall2.xpm share/xfce/backdrops/Wall3.xpm +share/xfce/backdrops/WaterPurple.xpm share/xfce/backdrops/Wax.xpm share/xfce/backdrops/Weave-red.xpm share/xfce/backdrops/Weird.xpm +share/xfce/backdrops/Whirl.xpm share/xfce/backdrops/Wood-floor.xpm share/xfce/backdrops/Wood.xpm share/xfce/backdrops/Wood2.xpm @@ -155,6 +171,8 @@ share/xfce/backdrops/Xfce.jpg share/xfce/backdrops/Xfce.xpm 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 @@ -297,7 +315,9 @@ share/xfce/palettes/BlueX share/xfce/palettes/BlueX2 share/xfce/palettes/BlueX3 +share/xfce/palettes/BlueX4 share/xfce/palettes/Bronze +share/xfce/palettes/Bronze2 share/xfce/palettes/Cheese share/xfce/palettes/Citrouille share/xfce/palettes/Clinky @@ -308,6 +328,7 @@ share/xfce/palettes/Fall share/xfce/palettes/Glass share/xfce/palettes/Golden +share/xfce/palettes/GoldenBoy share/xfce/palettes/Grayscale share/xfce/palettes/Ground share/xfce/palettes/Helice @@ -335,6 +356,8 @@ share/xfce/palettes/Sand share/xfce/palettes/Silver share/xfce/palettes/Silver2 +share/xfce/palettes/Smooth +share/xfce/palettes/SmoothBW share/xfce/palettes/Spring share/xfce/palettes/Standard share/xfce/palettes/Stellar @@ -403,11 +426,16 @@ share/xfce/sounds/zap04.wav share/xfce/textures/Aluminium.xpm share/xfce/textures/BlueX.xpm +share/xfce/textures/BlueX2.xpm +share/xfce/textures/Bronze2.xpm share/xfce/textures/Glass.xpm +share/xfce/textures/GoldenBoy.xpm share/xfce/textures/Liquid.xpm share/xfce/textures/Modern.xpm share/xfce/textures/Power.xpm share/xfce/textures/Power2.xpm +share/xfce/textures/Smooth.xpm +share/xfce/textures/SmoothBW.xpm share/xfce/textures/bronze.xpm share/xfce/textures/cheese.xpm share/xfce/textures/craters.xpm @@ -419,14 +447,12 @@ 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/help -@dirrm share/xfce/icons -@dirrm share/xfce/palettes -@dirrm share/xfce/sounds @dirrm share/xfce/textures -@dirrm share/xfce/locale/et -@dirrm share/xfce/locale/fr -@dirrm share/xfce/locale/it +@dirrm share/xfce/sounds +@dirrm share/xfce/palettes +@dirrm share/xfce/icons +@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?200102071824.f17IOcv94842>