4 files changed, 15 insertions, 15 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index a51146d55d18..ad8b12e0d299 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	sawfish
-PORTVERSION=	1.5.0
-PORTREVISION=	3
+PORTVERSION=	1.5.2
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/sawmill/${PORTNAME}/${PORTVERSION}
diff --git a/x11-wm/sawfish/distinfo b/x11-wm/sawfish/distinfo
index 432cceca56cf..7fa6cd6f891f 100644
--- a/x11-wm/sawfish/distinfo
+++ b/x11-wm/sawfish/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sawfish-1.5.0.tar.bz2) = 40484ea4ae293860eeecd773f119f90b
-SHA256 (gnome2/sawfish-1.5.0.tar.bz2) = 09f7337bfd270dc8b96ca87be27627d350d5cfc15c669db401d85e68f23edda7
-SIZE (gnome2/sawfish-1.5.0.tar.bz2) = 3595897
+MD5 (gnome2/sawfish-1.5.2.tar.bz2) = a263c3e5428bfef7dee28698ec3f0aa3
+SHA256 (gnome2/sawfish-1.5.2.tar.bz2) = 3552deb2c46883a2d75aef28e85457035dc23736cfdded277c3486e80537d4b5
+SIZE (gnome2/sawfish-1.5.2.tar.bz2) = 3611940
diff --git a/x11-wm/sawfish/files/patch-Makefile.in b/x11-wm/sawfish/files/patch-Makefile.in
index 7cf19ce99102..b32b52b31d25 100644
--- a/x11-wm/sawfish/files/patch-Makefile.in
+++ b/x11-wm/sawfish/files/patch-Makefile.in
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
+--- Makefile.in.orig	2009-09-20 12:42:02.000000000 +0300
++++ Makefile.in	2009-10-15 19:38:06.000000000 +0300
 @@ -46,7 +46,6 @@
  	for f in ./DOC*; do \
  	  $(INSTALL_DATA) $$f $(DESTDIR)$(sawfishexecdir); \
@@ -11,21 +8,25 @@ $FreeBSD$
  	$(INSTALL_DATA) $(srcdir)/sawfish.desktop \
  		$(DESTDIR)$(datadir)/applications/
  	$(INSTALL_DATA) $(srcdir)/sawfish-wm.desktop \
-@@ -57,7 +56,7 @@
+@@ -57,18 +56,16 @@
  	    $(INSTALL_SCRIPT) $(srcdir)/moved $(DESTDIR)$(bindir)/$$f; \
  	  fi \
  	done
 -	$(INSTALL_DATA) $(top_srcdir)/sawfish.pc $(DESTDIR)$(libdir)/pkgconfig/
 +	$(INSTALL_DATA) $(top_srcdir)/sawfish.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/
  	$(INSTALL_DATA) $(top_srcdir)/sawfish-session.desktop $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
+-	$(INSTALL_DATA) $(top_srcdir)/sawfish-ksm.desktop $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/sawfish.desktop
  
  installdirs : mkinstalldirs
-@@ -65,7 +64,7 @@
+ 	$(SHELL) $< $(DESTDIR)$(sawfishdir)/$(version) \
  	  $(DESTDIR)$(bindir) $(DESTDIR)$(sawfishexecdir) \
  	  $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties \
  	  $(DESTDIR)$(datadir)/applications/ \
 -	  $(DESTDIR)$(libdir)/pkgconfig/ \
+-	  $(DESTDIR)$(datadir)/xsessions/ \
+-	  $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/
 +	  $(DESTDIR)$(prefix)/libdata/pkgconfig/ \
- 	  $(DESTDIR)$(datadir)/xsessions/
++	  $(DESTDIR)$(datadir)/xsessions/
  
  uninstall :
+ 	for dir in $(SUBDIRS); do \
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 68b202f3e0d6..0fae360f852d 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -24,7 +24,9 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
+share/applications/sawfish.desktop
 share/pixmaps/sawfish-logo.png
+share/xsessions/sawfish.desktop
 %%DATADIR%%/%%VERSION%%/lisp/anim-outline.jl
 %%DATADIR%%/%%VERSION%%/lisp/anim-outline.jlc
 %%DATADIR%%/%%VERSION%%/lisp/audio-events.jl
@@ -91,8 +93,6 @@ share/pixmaps/sawfish-logo.png
 %%DATADIR%%/%%VERSION%%/lisp/rects.jlc
 %%DATADIR%%/%%VERSION%%/lisp/sawfish-defaults.jl
 %%DATADIR%%/%%VERSION%%/lisp/sawfish-defaults.jlc
-%%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk/color-preview.jl
-%%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk/color-preview.jlc
 %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk/stock.jl
 %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk/stock.jlc
 %%DATADIR%%/%%VERSION%%/lisp/sawfish/gtk/widget-dialog.jl