Attachment #26654 for bug #45457

View | Details | Raw Unified | Return to bug 45457
Collapse All | Expand All




#

PORTNAME=	xfce
PORTVERSION=	3.8.18
CATEGORIES=	x11-wm
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
		http://www.xfce.org/archive/


MAINTAINER=	ports@FreeBSD.org

LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
		iconv.3:${PORTSDIR}/converters/libiconv \
		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf

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=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--with-conf-dir=${PREFIX}/etc/xfce \

		--with-locale-dir=${PREFIX}/share/locale \
		--with-xpm=${X11BASE} \
		--enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \
		--disable-arts \
		--enable-taskbar

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>


	@${REINPLACE_CMD} -e 's|=aclocal|=${TRUE}|g ; \
		 s|=autoconf|=${TRUE}|g ; \
		 s|=automake|=${TRUE}|g ; \
		 s|=autoheader|=${TRUE}|g' ${WRKSRC}/configure
		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
	@${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>

Line 1 Link Here

(-)x11-wm/xfce/distinfo (-1 / +1 lines)
1	MD5 (xfce-3.8.16.tar.gz) = e73dba58bb04eb1facc682b308a422b3	1	MD5 (xfce-3.8.18.tar.gz) = 04c197eee32d712a49170539d50279ea




--- 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)

 	avoid_version=yes
 	continue
 	;;
@@ -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.
 	    ;;
-	  *-*-openbsd*)
+	  *-*-openbsd* | *-*-freebsd*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *)
@@ -4258,10 +4259,12 @@
 	    if test $build_libtool_need_lc = "yes"; then
@@ -4175,10 +4179,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.




--- 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




etc/xfce/Xclients
etc/xfce/fvwm2rc
etc/xfce/fvwmrc
etc/xfce/taskbarrc
etc/xfce/xfbdrc
etc/xfce/xfce3rc
etc/xfce/xfce3rc.cs

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

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

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

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

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

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

share/xfce/textures/paper.xpm
share/xfce/textures/silver.xpm
share/xfce/textures/stripe.xpm
@dirrm share/xfce/textures
@dirrm share/xfce/sounds
@dirrm share/xfce/palettes
@dirrm share/xfce/icons
@dirrm share/xfce/cursors
@dirrm share/xfce/fonts
@dirrm share/xfce/help/html/images
@dirrm share/xfce/help/html/stylesheet-images
@dirrm share/xfce/help/html
@dirrm share/xfce/help/images
@dirrm share/xfce/help
@dirrm share/xfce/fonts
@dirrm share/xfce/cursors
@dirrm share/xfce/backdrops
@dirrm share/xfce/textures
@dirrm share/xfce
@dirrm etc/xfce

Return to bug 45457

Lines 6-12 Link Here

(-)x11-wm/xfce/Makefile (-19 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= xfce	8	PORTNAME= xfce
9	PORTVERSION= 3.8.16	9	PORTVERSION= 3.8.18
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
12	http://www.xfce.org/archive/	12	http://www.xfce.org/archive/
Lines 14-30 Link Here
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \	17	LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
18	iconv.3:${PORTSDIR}/converters/libiconv \
19	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
20		18
21	USE_REINPLACE= yes
22	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
23	USE_GNOMENG= yes
24	USE_GNOME= gtk12
25	USE_XPM= yes	20	USE_XPM= yes
		21	USE_GNOMENG= yes
		22	USE_GNOME= gdkpixbuf
		23	USE_REINPLACE= yes
26	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
27	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}	25	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
29	LDFLAGS="-L${LOCALBASE}/lib"	27	LDFLAGS="-L${LOCALBASE}/lib"
30	CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \	28	CONFIGURE_ARGS= --with-conf-dir=${PREFIX}/etc/xfce \
Lines 32-42 Link Here
32	--with-locale-dir=${PREFIX}/share/locale \	30	--with-locale-dir=${PREFIX}/share/locale \
33	--with-xpm=${X11BASE} \	31	--with-xpm=${X11BASE} \
34	--enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \	32	--enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \
35	--disable-arts	33	--disable-arts \
		34	--enable-taskbar
36		35
37	MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfumed.1 xfglob.1 xfgnome.1 \	36	MAN1= glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \
38	xfhelp.1 xflock.1 xfmountdev.1 xfmouse.1 xfpager.1 xfprint.1 \	37	xflock.1 xfmountdev.1 xfmouse.1 xfpager.1 xfprint.1 xfrun.1 \
39	xfrun.1 xfskin.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfwm.1	38	xfskin.1 xfsound.1 xfterm.1 xftrash.1 xftree.1 xfumed.1 xfwm.1
40		39
41	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
42		41
Lines 61-73 Link Here
61	@${REINPLACE_CMD} -e 's\|=aclocal\|=${TRUE}\|g ; \	60	@${REINPLACE_CMD} -e 's\|=aclocal\|=${TRUE}\|g ; \
62	s\|=autoconf\|=${TRUE}\|g ; \	61	s\|=autoconf\|=${TRUE}\|g ; \
63	s\|=automake\|=${TRUE}\|g ; \	62	s\|=automake\|=${TRUE}\|g ; \
64	s\|=autoheader\|=${TRUE}\|g ; \	63	s\|=autoheader\|=${TRUE}\|g' ${WRKSRC}/configure
65	s\|DATADIRNAME=lib\|DATADIRNAME=share\|g' ${WRKSRC}/configure
66	@${REINPLACE_CMD} -e 's\|gtk-config\|${GTK_CONFIG:T}\|g' ${WRKSRC}/xfce/setup.c
67	@${REINPLACE_CMD} -e 's\|xfplay\|internal\|g' ${WRKSRC}/other/xfsoundrc.in	64	@${REINPLACE_CMD} -e 's\|xfplay\|internal\|g' ${WRKSRC}/other/xfsoundrc.in
68		65	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|g' ${WRKSRC}/other/xinitrc.in
69	post-install:	66	@${REINPLACE_CMD} -e 's\|gtk-config\|${GTK_CONFIG:T}\|g' ${WRKSRC}/xfce/setup.c
70	@${LN} -sf ${PREFIX}/share/xfce/help/html/images \	67	@${REINPLACE_CMD} -e 's\|/opt/kde3\|${LOCALBASE}\|g ; \
71	${PREFIX}/share/xfce/help/images	68	s\|/opt/gnome\|${X11BASE}\|g' ${WRKSRC}/xfmenu/xfmenu.c
72		69
73	.include <bsd.port.post.mk>	70	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)x11-wm/xfce/files/patch-ltmain.sh (-10 / +26 lines)
1	--- ltmain.sh.orig Thu Nov 22 05:43:58 2001	1	--- ltmain.sh.orig Mon Jun 10 05:25:37 2002
2	+++ ltmain.sh Fri Dec 7 07:18:03 2001	2	+++ ltmain.sh Tue Nov 12 03:09:05 2002
3	@@ -944,6 +944,7 @@	3	@@ -962,6 +962,7 @@
4	;;	4	;;
5		5
6	-avoid-version)	6	-avoid-version)
Lines 8-24 Link Here
8	avoid_version=yes	8	avoid_version=yes
9	continue	9	continue
10	;;	10	;;
11	@@ -2408,6 +2409,9 @@	11	@@ -1054,14 +1055,14 @@
		12	# These systems don't actually have a C library (as such)
		13	test "X$arg" = "X-lc" && continue
		14	;;
		15	- --openbsd*)
		16	+ --openbsd* \| --freebsd*)
		17	# Do not include libc due to us having libc/libc_r.
		18	test "X$arg" = "X-lc" && continue
		19	;;
		20	esac
		21	elif test "X$arg" = "X-lc_r"; then
		22	case $host in
		23	- --openbsd*)
		24	+ --openbsd* \| --freebsd*)
		25	# Do not include libc_r directly, use -pthread flag.
		26	continue
		27	;;
		28	@@ -2471,7 +2472,7 @@
12	--netbsd*)	29	--netbsd*)
13	# Don't link with libc until the a.out ld.so is fixed.	30	# Don't link with libc until the a.out ld.so is fixed.
14	;;	31	;;
15	+ --freebsd*)	32	- --openbsd*)
16	+ # FreeBSD doesn't need this...	33	+ --openbsd* \| --freebsd*)
17	+ ;;	34	# Do not include libc due to us having libc/libc_r.
		35	;;
18	*)	36	*)
19	# Add libc to deplibs on all other systems if necessary.	37	@@ -4258,10 +4259,12 @@
20	if test $build_libtool_need_lc = "yes"; then
21	@@ -4175,10 +4179,12 @@
22	fi	38	fi
23		39
24	# Install the pseudo-library for information purposes.	40	# Install the pseudo-library for information purposes.

Line 0 Link Here

(-)x11-wm/xfce/files/patch-other::xinitrc.in (+14 lines)
	1	--- other/xinitrc.in.orig Thu May 23 06:24:35 2002
	2	+++ other/xinitrc.in Tue Nov 19 04:22:00 2002
	3	@@ -41,7 +41,10 @@
	4	# fi
	5
	6	# Launch xscreensaver (if available)
	7	-xscreensaver -no-splash &
	8	+XBINDIR=%%X11BASE%%/bin
	9	+if [ -x $XBINDIR/xscreensaver ]; then
	10	+ xscreensaver -no-splash &
	11	+fi
	12
	13	# Finally, launch XFce window manager
	14	exec xfwm

Lines 31-36 Link Here

(-)x11-wm/xfce/pkg-plist (-32 / +35 lines)
31	etc/xfce/Xclients	31	etc/xfce/Xclients
32	etc/xfce/fvwm2rc	32	etc/xfce/fvwm2rc
33	etc/xfce/fvwmrc	33	etc/xfce/fvwmrc
		34	etc/xfce/taskbarrc
34	etc/xfce/xfbdrc	35	etc/xfce/xfbdrc
35	etc/xfce/xfce3rc	36	etc/xfce/xfce3rc
36	etc/xfce/xfce3rc.cs	37	etc/xfce/xfce3rc.cs
Lines 64-69 Link Here
64	share/locale/fi/LC_MESSAGES/xfce.mo	65	share/locale/fi/LC_MESSAGES/xfce.mo
65	share/locale/fr/LC_MESSAGES/xfce.mo	66	share/locale/fr/LC_MESSAGES/xfce.mo
66	share/locale/gl/LC_MESSAGES/xfce.mo	67	share/locale/gl/LC_MESSAGES/xfce.mo
		68	share/locale/he/LC_MESSAGES/xfce.mo
67	share/locale/hu/LC_MESSAGES/xfce.mo	69	share/locale/hu/LC_MESSAGES/xfce.mo
68	share/locale/it/LC_MESSAGES/xfce.mo	70	share/locale/it/LC_MESSAGES/xfce.mo
69	share/locale/ja/LC_MESSAGES/xfce.mo	71	share/locale/ja/LC_MESSAGES/xfce.mo
Lines 264-290 Link Here
264	share/xfce/help/html/fileman.html	266	share/xfce/help/html/fileman.html
265	share/xfce/help/html/gpl.html	267	share/xfce/help/html/gpl.html
266	share/xfce/help/html/help.html	268	share/xfce/help/html/help.html
267	share/xfce/help/html/images/buttons.jpg
268	share/xfce/help/html/images/xfbd.jpg
269	share/xfce/help/html/images/xfbdmgr.jpg
270	share/xfce/help/html/images/xfce_panel.jpg
271	share/xfce/help/html/images/xfce_popup.jpg
272	share/xfce/help/html/images/xfce_setup1.jpg
273	share/xfce/help/html/images/xfce_setup2.jpg
274	share/xfce/help/html/images/xfce_setup3.jpg
275	share/xfce/help/html/images/xfce_setup4.jpg
276	share/xfce/help/html/images/xfce_slogan.jpg
277	share/xfce/help/html/images/xfce_snap.jpg
278	share/xfce/help/html/images/xfclock.jpg
279	share/xfce/help/html/images/xfdiff.jpg
280	share/xfce/help/html/images/xfglob.jpg
281	share/xfce/help/html/images/xfmouse.jpg
282	share/xfce/help/html/images/xfpager.jpg
283	share/xfce/help/html/images/xfrun.jpg
284	share/xfce/help/html/images/xfsamba.jpg
285	share/xfce/help/html/images/xfsound.jpg
286	share/xfce/help/html/images/xftree.jpg
287	share/xfce/help/html/images/xfumed.jpg
288	share/xfce/help/html/install.html	269	share/xfce/help/html/install.html
289	share/xfce/help/html/intro.html	270	share/xfce/help/html/intro.html
290	share/xfce/help/html/license.html	271	share/xfce/help/html/license.html
Lines 324-329 Link Here
324	share/xfce/help/html/utils-xfumed.html	305	share/xfce/help/html/utils-xfumed.html
325	share/xfce/help/html/wm-examples-2.html	306	share/xfce/help/html/wm-examples-2.html
326	share/xfce/help/html/wm.html	307	share/xfce/help/html/wm.html
		308	share/xfce/help/images/buttons.jpg
		309	share/xfce/help/images/xfbd.jpg
		310	share/xfce/help/images/xfbdmgr.jpg
		311	share/xfce/help/images/xfce_panel.jpg
		312	share/xfce/help/images/xfce_popup.jpg
		313	share/xfce/help/images/xfce_setup1.jpg
		314	share/xfce/help/images/xfce_setup2.jpg
		315	share/xfce/help/images/xfce_setup3.jpg
		316	share/xfce/help/images/xfce_setup4.jpg
		317	share/xfce/help/images/xfce_slogan.jpg
		318	share/xfce/help/images/xfce_snap.jpg
		319	share/xfce/help/images/xfclock.jpg
		320	share/xfce/help/images/xfdiff.jpg
		321	share/xfce/help/images/xfglob.jpg
		322	share/xfce/help/images/xfmouse.jpg
		323	share/xfce/help/images/xfpager.jpg
		324	share/xfce/help/images/xfrun.jpg
		325	share/xfce/help/images/xfsamba.jpg
		326	share/xfce/help/images/xfsound.jpg
		327	share/xfce/help/images/xftree.jpg
		328	share/xfce/help/images/xfumed.jpg
327	share/xfce/icons/3dpaint.xpm	329	share/xfce/icons/3dpaint.xpm
328	share/xfce/icons/ABC.xpm	330	share/xfce/icons/ABC.xpm
329	share/xfce/icons/AZ.xpm	331	share/xfce/icons/AZ.xpm
Lines 490-495 Link Here
490	share/xfce/palettes/KStyle2	492	share/xfce/palettes/KStyle2
491	share/xfce/palettes/KXfce	493	share/xfce/palettes/KXfce
492	share/xfce/palettes/Kdetheme	494	share/xfce/palettes/Kdetheme
		495	share/xfce/palettes/Kindaker
493	share/xfce/palettes/LightBulb	496	share/xfce/palettes/LightBulb
494	share/xfce/palettes/LightBulb2	497	share/xfce/palettes/LightBulb2
495	share/xfce/palettes/LightBulb3	498	share/xfce/palettes/LightBulb3
Lines 522-527 Link Here
522	share/xfce/palettes/PruneDark	525	share/xfce/palettes/PruneDark
523	share/xfce/palettes/Quartz	526	share/xfce/palettes/Quartz
524	share/xfce/palettes/Reader	527	share/xfce/palettes/Reader
		528	share/xfce/palettes/Redmond
525	share/xfce/palettes/Salmon	529	share/xfce/palettes/Salmon
526	share/xfce/palettes/Salmon2	530	share/xfce/palettes/Salmon2
527	share/xfce/palettes/SaltLake	531	share/xfce/palettes/SaltLake
Lines 559-564 Link Here
559	share/xfce/palettes/XLight	563	share/xfce/palettes/XLight
560	share/xfce/palettes/Xfce-1	564	share/xfce/palettes/Xfce-1
561	share/xfce/palettes/Xfce-2	565	share/xfce/palettes/Xfce-2
		566	share/xfce/palettes/Xfce-light
562	share/xfce/sounds/alert01.wav	567	share/xfce/sounds/alert01.wav
563	share/xfce/sounds/beep01.wav	568	share/xfce/sounds/beep01.wav
564	share/xfce/sounds/beep02.wav	569	share/xfce/sounds/beep02.wav
Lines 641-658 Link Here
641	share/xfce/textures/paper.xpm	646	share/xfce/textures/paper.xpm
642	share/xfce/textures/silver.xpm	647	share/xfce/textures/silver.xpm
643	share/xfce/textures/stripe.xpm	648	share/xfce/textures/stripe.xpm
644	@exec ln -s %D/share/xfce/help/html/images %D/share/xfce/help/images	649	@dirrm share/xfce/textures
645	@unexec rm %D/share/xfce/help/images	650	@dirrm share/xfce/sounds
646	@dirrm etc/xfce	651	@dirrm share/xfce/palettes
647	@dirrm share/xfce/backdrops	652	@dirrm share/xfce/icons
648	@dirrm share/xfce/cursors
649	@dirrm share/xfce/fonts
650	@dirrm share/xfce/help/html/images
651	@dirrm share/xfce/help/html/stylesheet-images	653	@dirrm share/xfce/help/html/stylesheet-images
652	@dirrm share/xfce/help/html	654	@dirrm share/xfce/help/html
		655	@dirrm share/xfce/help/images
653	@dirrm share/xfce/help	656	@dirrm share/xfce/help
654	@dirrm share/xfce/icons	657	@dirrm share/xfce/fonts
655	@dirrm share/xfce/palettes	658	@dirrm share/xfce/cursors
656	@dirrm share/xfce/sounds	659	@dirrm share/xfce/backdrops
657	@dirrm share/xfce/textures
658	@dirrm share/xfce	660	@dirrm share/xfce
		661	@dirrm etc/xfce