Index: head/x11-wm/sawfish2/Makefile
===================================================================
--- head/x11-wm/sawfish2/Makefile	(revision 60002)
+++ head/x11-wm/sawfish2/Makefile	(revision 60003)
@@ -1,54 +1,55 @@
 # New ports collection makefile for:   sawfish
 # Date created:        13 September 1999
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sawfish2
 PORTVERSION=	2002.05.02
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
 DISTNAME=	sawfish-${PORTVERSION:S/./-/g}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	rep.11:${PORTSDIR}/lang/librep2
 BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 GNUHOST=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=2.0.pre1
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_IMLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline \
 		--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share \
 		--enable-capplet \
 		--disable-themer
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
 pre-patch:
 	@${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
 		 s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \
 		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
 	install-info --section="X11 window manager" \
 	--entry="* sawfish: (sawfish).           sawfish programming manual" \
 	${PREFIX}/info/sawfish.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>

Property changes on: head/x11-wm/sawfish2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.57
\ No newline at end of property
+1.58
\ No newline at end of property
Index: head/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
===================================================================
--- head/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl	(nonexistent)
+++ head/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl	(revision 60003)
@@ -0,0 +1,29 @@
+--- lisp/sawfish/wm/gnome/integration.jl.orig	Sat May 25 15:55:29 2002
++++ lisp/sawfish/wm/gnome/integration.jl	Sat May 25 15:55:31 2002
+@@ -19,8 +19,6 @@
+ ;; along with sawmill; see the file COPYING.  If not, write to
+ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-(eval-when-compile (require 'sawfish.wm.commands.xterm))
+-
+ (define-structure sawfish.wm.gnome.integration ()
+ 
+     (open rep
+@@ -28,7 +26,8 @@
+ 	  sawfish.wm.gnome.menus
+ 	  sawfish.wm.menus
+ 	  sawfish.wm.custom
+-	  sawfish.wm.commands.help)
++	  sawfish.wm.commands.help
++	  sawfish.wm.commands.xterm)
+ 
+   (define-structure-alias gnome-int sawfish.wm.gnome.integration)
+ 
+@@ -46,6 +45,7 @@
+   (put 'gnome-use-capplet 'custom-obsolete t)
+ 
+   ;; invoke the GNOME terminal instead of xterm
++  (eval-when-compile (require 'sawfish.wm.commands.xterm))
+   (unless (variable-customized-p 'xterm-program)
+     (setq xterm-program "gnome-terminal"))
+ 

Property changes on: head/x11-wm/sawfish2/files/patch-lisp_sawfish_wm_gnome_integration.jl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property