Date: Sun, 30 Dec 2001 04:01:03 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33340: Update port: x11-wm/xfce to 3.8.12b (fix ports/32629) Message-ID: <200112301201.fBUC13l66028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33340 >Category: ports >Synopsis: Update port: x11-wm/xfce to 3.8.12b (fix ports/32629) >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: Sun Dec 30 04:10:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.8.12b New file: files/patch-ltmain.sh This PR supersedes ports/32629. Note: Following series of PRs have been left alone for about two months.... -- [2001/10/29] ports/31618 Update port: x11-wm/xfce to 3.8.9 [2001/10/30] ports/31646 Update port: x11-wm/xfce to 3.8.10 (fix ports/31618) [2001/11/03] ports/31725 Update port: x11-wm/xfce to 3.8.11 (fix ports/31646) [2001/11/23] ports/32221 Update port: x11-wm/xfce to 3.8.12 (fix ports/31725) [2001/12/08] ports/32629 Update port: x11-wm/xfce to 3.8.12b (fix ports/32221) >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/xfce/Makefile x11-wm/xfce/Makefile --- /usr/ports/x11-wm/xfce/Makefile Tue Oct 23 19:06:17 2001 +++ x11-wm/xfce/Makefile Fri Dec 28 23:17:02 2001 @@ -6,42 +6,53 @@ # PORTNAME= xfce -PORTVERSION= 3.8.8b +PORTVERSION= 3.8.12b 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 +LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf USE_X_PREFIX= yes USE_GTK= yes USE_XPM= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 + --enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \ + --disable-arts + +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 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1 .include <bsd.port.pre.mk> -.if defined(WITH_XFT) && ${WITH_XFT} == yes -CONFIGURE_ARGS+= --enable-xft +.if ${XFREE86_VERSION} == 4 +.if defined(WITH_XFT) +CONFIGURE_ARGS+= --enable-xft +.endif +CONFIGURE_ARGS+= --enable-xinerama .else +CONFIGURE_ARGS+= --disable-xinerama +.endif + pre-everything:: +.if !defined(WITH_XFT) && ${XFREE86_VERSION} == 4 @${ECHO_MSG} @${ECHO_MSG} "If you want to enable anti-aliased font support," @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_XFT=yes\"" @${ECHO_MSG} .endif -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 - pre-patch: @${PERL} -pi -e \ 's|DATADIRNAME=lib|DATADIRNAME=share|g ; \ @@ -49,8 +60,5 @@ 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 .include <bsd.port.post.mk> diff -urN /usr/ports/x11-wm/xfce/distinfo x11-wm/xfce/distinfo --- /usr/ports/x11-wm/xfce/distinfo Tue Oct 23 19:06:17 2001 +++ x11-wm/xfce/distinfo Fri Dec 7 05:32:29 2001 @@ -1 +1 @@ -MD5 (xfce-3.8.8b.tar.gz) = 5b3546b169690cbed13d41b7115f9dee +MD5 (xfce-3.8.12b.tar.gz) = 3fe7d1be820873a9106bba0c22570580 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 Thu Jan 1 09:00:00 1970 +++ x11-wm/xfce/files/patch-ltmain.sh Fri Dec 7 07:18:22 2001 @@ -0,0 +1,33 @@ +--- ltmain.sh.orig Thu Nov 22 05:43:58 2001 ++++ ltmain.sh Fri Dec 7 07:18:03 2001 +@@ -944,6 +944,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -2408,6 +2409,9 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4175,10 +4179,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false ; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff -urN /usr/ports/x11-wm/xfce/pkg-plist x11-wm/xfce/pkg-plist --- /usr/ports/x11-wm/xfce/pkg-plist Tue Oct 23 19:06:18 2001 +++ x11-wm/xfce/pkg-plist Fri Dec 7 07:07:54 2001 @@ -40,6 +40,7 @@ etc/xfce/xfce3rc.ko etc/xfce/xfce3rc.nl etc/xfce/xfce3rc.sr +etc/xfce/xfce3rc.uk etc/xfce/xfce3rc.zh_CN.GB2312 etc/xfce/xfce3rc.zh_TW.Big5 etc/xfce/xfclockrc @@ -50,7 +51,6 @@ etc/xfce/xinitrc.mwm etc/xfce/xsession etc/xfce/xtree.reg -lib/gtk/themes/engines/libxfce.la lib/gtk/themes/engines/libxfce.so share/locale/ca/LC_MESSAGES/xfce.mo share/locale/cs/LC_MESSAGES/xfce.mo @@ -73,6 +73,7 @@ share/locale/sk/LC_MESSAGES/xfce.mo share/locale/sr/LC_MESSAGES/xfce.mo share/locale/sv/LC_MESSAGES/xfce.mo +share/locale/uk/LC_MESSAGES/xfce.mo share/locale/zh/LC_MESSAGES/xfce.mo share/locale/zh_CN/LC_MESSAGES/xfce.mo share/xfce/COPYING @@ -101,6 +102,7 @@ share/xfce/backdrops/Compute.xpm share/xfce/backdrops/Concrete.xpm share/xfce/backdrops/Darkblue2.xpm +share/xfce/backdrops/Default.jpg share/xfce/backdrops/Default.xpm share/xfce/backdrops/Desert2.xpm share/xfce/backdrops/Dry.xpm @@ -124,7 +126,9 @@ share/xfce/backdrops/Greysea.xpm share/xfce/backdrops/Hardblue.xpm share/xfce/backdrops/Honey.xpm +share/xfce/backdrops/Horizon.png share/xfce/backdrops/Leaves.xpm +share/xfce/backdrops/Linea.xpm share/xfce/backdrops/Marbled.xpm share/xfce/backdrops/Master-Plan.jpg share/xfce/backdrops/Maze.xpm @@ -139,6 +143,7 @@ share/xfce/backdrops/Psy2.xpm share/xfce/backdrops/Psy3.xpm share/xfce/backdrops/PurpleStripes.xpm +share/xfce/backdrops/Reader.xpm share/xfce/backdrops/Rotin.xpm share/xfce/backdrops/Rough.xpm share/xfce/backdrops/Sandy-ridges.xpm @@ -182,6 +187,7 @@ share/xfce/backdrops/Weird.xpm share/xfce/backdrops/Whirl.xpm share/xfce/backdrops/WhiteStripes.xpm +share/xfce/backdrops/WipeBlue.png share/xfce/backdrops/Wood-floor.xpm share/xfce/backdrops/Wood.xpm share/xfce/backdrops/Wood2.xpm @@ -191,8 +197,53 @@ share/xfce/backdrops/XfceStellar.xpm share/xfce/backdrops/Xfcelogo.xpm share/xfce/backdrops/Xfcemice.jpg -share/xfce/fonts/cursor2.pcf +share/xfce/cursors/cursor2.pcf +share/xfce/cursors/fonts.dir share/xfce/fonts/fonts.dir +share/xfce/fonts/uniread-variable-05-b-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-05-b-i.pcf.gz +share/xfce/fonts/uniread-variable-05-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-05-b-r.pcf.gz +share/xfce/fonts/uniread-variable-05-m-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-05-m-i.pcf.gz +share/xfce/fonts/uniread-variable-05-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-05-m-r.pcf.gz +share/xfce/fonts/uniread-variable-07-b-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-07-b-i.pcf.gz +share/xfce/fonts/uniread-variable-07-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-07-b-r.pcf.gz +share/xfce/fonts/uniread-variable-07-m-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-07-m-i.pcf.gz +share/xfce/fonts/uniread-variable-07-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-07-m-r.pcf.gz +share/xfce/fonts/uniread-variable-09-b-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-09-b-i.pcf.gz +share/xfce/fonts/uniread-variable-09-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-09-b-r.pcf.gz +share/xfce/fonts/uniread-variable-09-m-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-09-m-i.pcf.gz +share/xfce/fonts/uniread-variable-09-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-09-m-r.pcf.gz +share/xfce/fonts/uniread-variable-10-b-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-10-b-i.pcf.gz +share/xfce/fonts/uniread-variable-10-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-10-b-r.pcf.gz +share/xfce/fonts/uniread-variable-10-m-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-10-m-i.pcf.gz +share/xfce/fonts/uniread-variable-10-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-10-m-r.pcf.gz +share/xfce/fonts/uniread-variable-12-b-i-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-12-b-i.pcf.gz +share/xfce/fonts/uniread-variable-12-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-12-b-r.pcf.gz +share/xfce/fonts/uniread-variable-12-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-12-m-r.pcf.gz +share/xfce/fonts/uniread-variable-14-b-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-14-b-r.pcf.gz +share/xfce/fonts/uniread-variable-14-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-14-m-r.pcf.gz +share/xfce/fonts/uniread-variable-18-m-r-ISO8859-1.pcf.gz +share/xfce/fonts/uniread-variable-18-m-r.pcf.gz share/xfce/help/html/adv-wm-appearance.html share/xfce/help/html/adv-wm-bindings.html share/xfce/help/html/adv-wm-commands.html @@ -384,6 +435,7 @@ share/xfce/palettes/BeHappy2 share/xfce/palettes/BeHappy3 share/xfce/palettes/BeHappy4 +share/xfce/palettes/Blue share/xfce/palettes/BlueX share/xfce/palettes/BlueX2 share/xfce/palettes/BlueX3 @@ -391,11 +443,13 @@ share/xfce/palettes/Bronze share/xfce/palettes/Bronze2 share/xfce/palettes/Cheese +share/xfce/palettes/Chrome share/xfce/palettes/Citrouille share/xfce/palettes/Classic share/xfce/palettes/Classic2 share/xfce/palettes/Clinky share/xfce/palettes/Craters +share/xfce/palettes/DarkMetal share/xfce/palettes/Default share/xfce/palettes/Defcon share/xfce/palettes/Dolly @@ -403,11 +457,13 @@ share/xfce/palettes/Eaz-l share/xfce/palettes/Fall share/xfce/palettes/GTK+Default +share/xfce/palettes/GTK+Default2 share/xfce/palettes/Glass share/xfce/palettes/Golden share/xfce/palettes/GoldenBoy share/xfce/palettes/Grayscale share/xfce/palettes/GreenIron +share/xfce/palettes/GreySlate share/xfce/palettes/Ground share/xfce/palettes/Helice share/xfce/palettes/HiContrast @@ -418,6 +474,9 @@ share/xfce/palettes/Jazza2 share/xfce/palettes/Kdetheme share/xfce/palettes/LightBulb +share/xfce/palettes/Linea +share/xfce/palettes/Linea2 +share/xfce/palettes/Linea3 share/xfce/palettes/Liquid share/xfce/palettes/Liquid2 share/xfce/palettes/Mauve @@ -440,6 +499,7 @@ share/xfce/palettes/Prairie share/xfce/palettes/Prune share/xfce/palettes/PruneDark +share/xfce/palettes/Reader share/xfce/palettes/Salmon share/xfce/palettes/Salmon2 share/xfce/palettes/Sand @@ -460,9 +520,12 @@ share/xfce/palettes/Tiny share/xfce/palettes/Tommy share/xfce/palettes/Tradition +share/xfce/palettes/Tradition2 share/xfce/palettes/Troica share/xfce/palettes/Typhoon +share/xfce/palettes/Vanadium share/xfce/palettes/Win +share/xfce/palettes/Win2 share/xfce/palettes/Xfce-1 share/xfce/palettes/Xfce-2 share/xfce/sounds/alert01.wav @@ -520,6 +583,8 @@ share/xfce/textures/BlueX.xpm share/xfce/textures/BlueX2.xpm share/xfce/textures/Bronze2.xpm +share/xfce/textures/Chrome.xpm +share/xfce/textures/DarkMetal.xpm share/xfce/textures/Glass.xpm share/xfce/textures/GoldenBoy.xpm share/xfce/textures/Kdetheme.xpm @@ -544,6 +609,7 @@ share/xfce/textures/stripe.xpm @dirrm etc/xfce @dirrm share/xfce/backdrops +@dirrm share/xfce/cursors @dirrm share/xfce/fonts @dirrm share/xfce/help/html/stylesheet-images @dirrm share/xfce/help/html >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?200112301201.fBUC13l66028>