4 files changed, 35 insertions, 36 deletions

diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 9e72607b4d47..003b755bdd7b 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -6,27 +6,30 @@
 #
 
 PORTNAME=	sawfish2
-PORTVERSION=	2.0
-PORTEPOCH=	1
+PORTVERSION=	1.2
+PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/sawfish/2.0
-DISTNAME=	sawfish-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/sawfish/1.2
+DISTNAME=	sawfish-${PORTVERSION}-gtk2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft
 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
+PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=1.2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehier gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline \
 		--localstatedir=${PREFIX}/share \
@@ -42,10 +45,6 @@ pre-patch:
 		 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 ${REINPLACE_CMD} -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" \
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 6f4dabfb197e..13883a13b7b3 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/sawfish-2.0.tar.bz2) = 47f57179c50737992500dca7f2cab4b4
+MD5 (gnome2/sawfish-1.2-gtk2.tar.bz2) = e6cf994eb60f5e3ddbec9cf5a4d38587
diff --git a/x11-wm/sawfish2/files/patch-configure b/x11-wm/sawfish2/files/patch-configure
index 4a9b3bbe57aa..0ab207a9c96b 100644
--- a/x11-wm/sawfish2/files/patch-configure
+++ b/x11-wm/sawfish2/files/patch-configure
@@ -1,23 +1,20 @@
-
-$FreeBSD$
-
---- configure	2002/04/29 19:09:14	1.1
-+++ configure	2002/04/29 19:08:47
-@@ -4607,7 +4607,7 @@
+--- configure.orig	Tue Nov 12 16:10:53 2002
++++ configure	Tue Nov 12 16:12:11 2002
+@@ -2688,7 +2688,7 @@
+   (error
+     (throw 'quit 1)))
+ EOF
+-if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then
++if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
+   echo "$ac_t""yes" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+@@ -3387,7 +3387,7 @@
  if test "$enable_themer" = yes; then
-     echo "$as_me:4608: checking for rep-gtk libglade wrapper" >&5
- echo $ECHO_N "checking for rep-gtk libglade wrapper... $ECHO_C" >&6
--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l libglade 2>&5; then
-+  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then
-     echo "$as_me:4611: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+     echo $ac_n "checking for rep-gtk libglade wrapper""... $ac_c" 1>&6
+ echo "configure:3390: checking for rep-gtk libglade wrapper" >&5
+-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then 
++   if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then
+     echo "$ac_t""yes" 1>&6
      add_subdir "themer"
-@@ -4630,7 +4630,7 @@
- if test "$enable_gnome_widgets" != "no"; then
-   echo "$as_me:4631: checking for rep-gtk GNOME wrappers" >&5
- echo $ECHO_N "checking for rep-gtk GNOME wrappers... $ECHO_C" >&6
--  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gnomeui -l gdk-pixbuf -l gnome-canvas-pixbuf 2>&5; then
-+  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then
-     echo "$as_me:4634: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-     REP_GTK_GNOME=yes
+   else 
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 15ade8487f06..c61534a5f5bb 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -53,8 +53,11 @@ share/gnome/pixmaps/sawfish-placement.png
 share/gnome/pixmaps/sawfish-shortcuts.png
 share/gnome/pixmaps/sawfish-tooltips.png
 share/gnome/pixmaps/sawfish-workspaces.png
+share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
+share/locale/be/LC_MESSAGES/sawfish.mo
 share/locale/bg/LC_MESSAGES/sawfish.mo
+share/locale/bs/LC_MESSAGES/sawfish.mo
 share/locale/ca/LC_MESSAGES/sawfish.mo
 share/locale/cs/LC_MESSAGES/sawfish.mo
 share/locale/da/LC_MESSAGES/sawfish.mo
@@ -284,6 +287,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/tooltips.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/tooltips.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/window-history.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/window-history.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/workspace-grid.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/ext/workspace-grid.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/focus.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/focus.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/frames.jl
@@ -360,6 +365,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/display-wininfo.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/display-wininfo.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/edges.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/edges.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/font.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/font.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/groups.jl
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/groups.jlc
 share/sawfish/%%VERSION%%/lisp/sawfish/wm/util/gtkrc.jl
@@ -639,8 +646,6 @@ share/sawfish/%%VERSION%%/themes/smaker/close_inv.png
 share/sawfish/%%VERSION%%/themes/smaker/min.png
 share/sawfish/%%VERSION%%/themes/smaker/min_inv.png
 share/sawfish/%%VERSION%%/themes/smaker/theme.jl
-@dirrm share/sawfish/themes
-@dirrm share/sawfish/sounds
 @dirrm share/sawfish/%%VERSION%%/themes/smaker
 @dirrm share/sawfish/%%VERSION%%/themes/simple
 @dirrm share/sawfish/%%VERSION%%/themes/mono
@@ -670,11 +675,9 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
 @dirrm share/sawfish/%%VERSION%%/lisp/sawfish
 @dirrm share/sawfish/%%VERSION%%/lisp
 @dirrm share/sawfish/%%VERSION%%
-@dirrm share/sawfish
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish
 @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%
 @dirrm libexec/sawfish/%%VERSION%%
-@dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish