Attachment 19190 Details for Bug 34181 – file.diff

[patch] file.diff

file.diff (text/plain), 14.44 KB, created by tkato on 2002-01-22 20:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-01-22 20:20:02 UTC

Size: 14.44 KB

patch

obsolete

>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	Wed Jan 23 00:37:22 2002
>@@ -6,42 +6,54 @@
> #
> 
> PORTNAME=	xfce
>-PORTVERSION=	3.8.8b
>+PORTVERSION=	3.8.14
> 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_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
> 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 +61,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	Wed Jan 23 00:21:04 2002
>@@ -1 +1 @@
>-MD5 (xfce-3.8.8b.tar.gz) = 5b3546b169690cbed13d41b7115f9dee
>+MD5 (xfce-3.8.14.tar.gz) = e92f08aa1aa404d3246cfb21cc9a237e
>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	Wed Jan 23 04:00:15 2002
>@@ -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,8 +73,10 @@
> 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/locale/zh_TW.Big5/LC_MESSAGES/xfce.mo
> share/xfce/COPYING
> share/xfce/XFce3.logo
> share/xfce/backdrops/A-Little-Exercise-3.jpg
>@@ -124,10 +126,13 @@
> 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
>+share/xfce/backdrops/MiceBlue.jpg
> share/xfce/backdrops/Nebula.xpm
> share/xfce/backdrops/Notes.xpm
> share/xfce/backdrops/Overdriven.jpg
>@@ -138,7 +143,9 @@
> share/xfce/backdrops/Psy.xpm
> share/xfce/backdrops/Psy2.xpm
> share/xfce/backdrops/Psy3.xpm
>+share/xfce/backdrops/Purple.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 +189,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 +199,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
>@@ -208,6 +261,27 @@
> 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
>@@ -247,27 +321,6 @@
> 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
>@@ -384,30 +437,38 @@
> 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
> share/xfce/palettes/BlueX4
> share/xfce/palettes/Bronze
> share/xfce/palettes/Bronze2
>+share/xfce/palettes/CandyBox
> 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/Desert
> share/xfce/palettes/Dolly
> share/xfce/palettes/Dust
> 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/GoldenBoy2
> 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 +479,11 @@
> share/xfce/palettes/Jazza2
> share/xfce/palettes/Kdetheme
> share/xfce/palettes/LightBulb
>+share/xfce/palettes/LightBulb2
>+share/xfce/palettes/LightBulb3
>+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 +506,8 @@
> share/xfce/palettes/Prairie
> share/xfce/palettes/Prune
> share/xfce/palettes/PruneDark
>+share/xfce/palettes/Quartz
>+share/xfce/palettes/Reader
> share/xfce/palettes/Salmon
> share/xfce/palettes/Salmon2
> share/xfce/palettes/Sand
>@@ -447,11 +515,16 @@
> share/xfce/palettes/Silver2
> share/xfce/palettes/Smooth
> share/xfce/palettes/SmoothBW
>+share/xfce/palettes/SmoothGreen
>+share/xfce/palettes/SoftBlue
> share/xfce/palettes/Spring
> share/xfce/palettes/Standard
>+share/xfce/palettes/Standard2
> share/xfce/palettes/Stellar
> share/xfce/palettes/Stellar2
> share/xfce/palettes/Stripe
>+share/xfce/palettes/Stripe2
>+share/xfce/palettes/Stripe3
> share/xfce/palettes/Sunny
> share/xfce/palettes/Symbiose
> share/xfce/palettes/TBlue
>@@ -460,9 +533,14 @@
> 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/Ultrafina
>+share/xfce/palettes/Vanadium
> share/xfce/palettes/Win
>+share/xfce/palettes/Win2
>+share/xfce/palettes/Win3
> share/xfce/palettes/Xfce-1
> share/xfce/palettes/Xfce-2
> share/xfce/sounds/alert01.wav
>@@ -517,9 +595,13 @@
> share/xfce/sounds/zap03.wav
> share/xfce/sounds/zap04.wav
> share/xfce/textures/Aluminium.xpm
>+share/xfce/textures/BWGrad.xpm
> 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/DefaultGrad.xpm
> share/xfce/textures/Glass.xpm
> share/xfce/textures/GoldenBoy.xpm
> share/xfce/textures/Kdetheme.xpm
>@@ -530,6 +612,7 @@
> share/xfce/textures/Power2.xpm
> share/xfce/textures/Smooth.xpm
> share/xfce/textures/SmoothBW.xpm
>+share/xfce/textures/Ultrafina.xpm
> share/xfce/textures/Xfcemetal.xpm
> share/xfce/textures/bronze.xpm
> share/xfce/textures/cheese.xpm
>@@ -542,15 +625,16 @@
> 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/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/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

Actions: View | Diff

Attachments on bug 34181: 19190