aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/Makefile1
-rw-r--r--lang/librep2/Makefile18
-rw-r--r--lang/librep2/distinfo2
-rw-r--r--lang/librep2/files/patch-aa20
-rw-r--r--lang/librep2/pkg-plist4
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/rep-gtk2/Makefile37
-rw-r--r--x11-toolkits/rep-gtk2/distinfo2
-rw-r--r--x11-toolkits/rep-gtk2/pkg-plist55
-rw-r--r--x11-wm/Makefile1
-rw-r--r--x11-wm/sawfish2/Makefile42
-rw-r--r--x11-wm/sawfish2/distinfo2
-rw-r--r--x11-wm/sawfish2/files/patch-ae21
-rw-r--r--x11-wm/sawfish2/files/patch-configure23
-rw-r--r--x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl13
-rw-r--r--x11-wm/sawfish2/pkg-plist57
16 files changed, 125 insertions, 174 deletions
diff --git a/lang/Makefile b/lang/Makefile
index 35f3170172ff..b2755287bde7 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -88,6 +88,7 @@
SUBDIR += kawa
SUBDIR += klone
SUBDIR += librep
+ SUBDIR += librep2
SUBDIR += libutils
SUBDIR += linux-j
SUBDIR += logo
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 685d222848b5..630dc923d4d6 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -5,27 +5,29 @@
# $FreeBSD$
#
-PORTNAME= librep
-PORTVERSION= 0.15.2
-PORTREVISION= 1
+PORTNAME= librep2
+PORTVERSION= 2002.05.02
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/librep
-#DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+DISTNAME= librep-${PORTVERSION:S/./-/g}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
intl.2:${PORTSDIR}/devel/gettext
-PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
+PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} \
+ VERSION=0.15.2
-USE_NEWGCC= yes
+USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
+ LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl" \
+ LOCALBASE="${LOCALBASE}"
CONFIGURE_ARGS= --with-aclocaldir=${PREFIX}/share/aclocal
CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
diff --git a/lang/librep2/distinfo b/lang/librep2/distinfo
index a09e2d089d66..7acf71a6f929 100644
--- a/lang/librep2/distinfo
+++ b/lang/librep2/distinfo
@@ -1 +1 @@
-MD5 (librep-0.15.2.tar.gz) = 0f009b208206e33bbb4754eba0a7d4d2
+MD5 (gnome2/librep-2002-05-02.tar.bz2) = 6ed777d23f73b2b1770d72d31c3fbe2a
diff --git a/lang/librep2/files/patch-aa b/lang/librep2/files/patch-aa
index 997a2290722a..5fae22d08bcc 100644
--- a/lang/librep2/files/patch-aa
+++ b/lang/librep2/files/patch-aa
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig Mon Oct 29 06:19:47 2001
-+++ configure Thu Jan 24 17:54:12 2002
-@@ -4659,7 +4659,7 @@
+--- configure.orig Sat Apr 20 00:42:14 2002
++++ configure Mon Apr 29 20:51:22 2002
+@@ -5622,7 +5622,7 @@
;;
esac
fi
@@ -12,12 +12,12 @@ $FreeBSD$
# The second clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -6136,7 +6136,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+@@ -7359,7 +7359,7 @@
+ echo "$as_me:7359: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
+ if test $ac_cv_lib_gdbm_gdbm_open = yes; then
- GDBM_LIBS="-lgdbm"
-+ GDBM_LIBS="-lgdbm $LIBS"
++ GDBM_LIBS="-L$LOCALBASE/lib -lgdbm"
else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: Cannot find GDBM library" 1>&2; exit 1; }
+ { { echo "$as_me:7364: error: Cannot find GDBM library" >&5
+ echo "$as_me: error: Cannot find GDBM library" >&2;}
diff --git a/lang/librep2/pkg-plist b/lang/librep2/pkg-plist
index 3a7aecae1e6f..b2b11c0e4033 100644
--- a/lang/librep2/pkg-plist
+++ b/lang/librep2/pkg-plist
@@ -106,6 +106,8 @@ share/rep/%%VERSION%%/lisp/rep/data/string-util.jl
share/rep/%%VERSION%%/lisp/rep/data/string-util.jlc
share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jl
share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jlc
+share/rep/%%VERSION%%/lisp/rep/data/trie.jl
+share/rep/%%VERSION%%/lisp/rep/data/trie.jlc
share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jl
share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jlc
share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jl
@@ -175,6 +177,8 @@ share/rep/%%VERSION%%/lisp/rep/threads/message-port.jl
share/rep/%%VERSION%%/lisp/rep/threads/message-port.jlc
share/rep/%%VERSION%%/lisp/rep/threads/mutex.jl
share/rep/%%VERSION%%/lisp/rep/threads/mutex.jlc
+share/rep/%%VERSION%%/lisp/rep/threads/proxy.jl
+share/rep/%%VERSION%%/lisp/rep/threads/proxy.jlc
share/rep/%%VERSION%%/lisp/rep/threads/utils.jl
share/rep/%%VERSION%%/lisp/rep/threads/utils.jlc
share/rep/%%VERSION%%/lisp/rep/user.jl
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 40241c32fb77..d9076b925ff0 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -114,6 +114,7 @@
SUBDIR += qt30
SUBDIR += qwt
SUBDIR += rep-gtk
+ SUBDIR += rep-gtk2
SUBDIR += ruby-fltk
SUBDIR += ruby-fox
SUBDIR += ruby-gtk
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index b0c03512acb8..33687c342f6d 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -5,44 +5,29 @@
# $FreeBSD$
#
-PORTNAME= rep-gtk
-PORTVERSION= 0.15
-PORTREVISION= 1
+PORTNAME= rep-gtk2
+PORTVERSION= 2002.05.02
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/rep-gtk
-#DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+DISTNAME= rep-gtk-${PORTVERSION:S/./-/g}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep
+LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep2 \
+ gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_GTK= yes
-WANT_GNOME= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-libglade \
+ --with-gnome
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_GNOME
-.undef WITHOUT_ALL
-WITH_GNOME= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
-CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \
- --with-gnome-canvas-pixbuf
-.else
-CONFIGURE_ARGS= --without-libglade --without-gnome --without-gdk-pixbuf \
- --without-gnome-canvas-pixbuf
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo
index b546220d4a47..e896ea4099d9 100644
--- a/x11-toolkits/rep-gtk2/distinfo
+++ b/x11-toolkits/rep-gtk2/distinfo
@@ -1 +1 @@
-MD5 (rep-gtk-0.15.tar.gz) = e351980234c3220ed2ad031c9ad9448f
+MD5 (gnome2/rep-gtk-2002-05-02.tar.bz2) = 79ee1c8dca2179a7c6748293cadcdc26
diff --git a/x11-toolkits/rep-gtk2/pkg-plist b/x11-toolkits/rep-gtk2/pkg-plist
index 4ae4e3e25f02..67beac4f3519 100644
--- a/x11-toolkits/rep-gtk2/pkg-plist
+++ b/x11-toolkits/rep-gtk2/pkg-plist
@@ -1,43 +1,14 @@
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gdk-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gdk-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.so
-libexec/rep/%%GNUHOST%%/gtk.la
-libexec/rep/%%GNUHOST%%/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/lib.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/lib.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/libglade.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/ui.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/ui.so
-libexec/rep/%%GNUHOST%%/gui/gtk.la
-libexec/rep/%%GNUHOST%%/gui/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/gdk-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/gdk-pixbuf.so
-libexec/rep/%%GNUHOST%%/gui/gtk/gtk.la
-libexec/rep/%%GNUHOST%%/gui/gtk/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/libglade.so
-libexec/rep/%%GNUHOST%%/gui/gtk/types.la
-libexec/rep/%%GNUHOST%%/gui/gtk/types.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.so
-libexec/rep/%%GNUHOST%%/sgtk-types.la
-libexec/rep/%%GNUHOST%%/sgtk-types.so
-@dirrm libexec/rep/%%GNUHOST%%/gui/gnome
-@dirrm libexec/rep/%%GNUHOST%%/gui/gtk
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/types.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/types.so
+@dirrm libexec/rep/%%GNUHOST%%/gui/gtk-2
@dirrm libexec/rep/%%GNUHOST%%/gui
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index d810e885880d..870cabe928d3 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -67,6 +67,7 @@
SUBDIR += sapphire
SUBDIR += sapphire-themes
SUBDIR += sawfish
+ SUBDIR += sawfish2
SUBDIR += scwm
SUBDIR += spager
SUBDIR += swm
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 09dda05b532f..f9b5ec4fd492 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -5,51 +5,37 @@
# $FreeBSD$
#
-PORTNAME= sawfish
-PORTVERSION= 1.0.1
+PORTNAME= sawfish2
+PORTVERSION= 2002.05.02
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/sawfish
-#DIST_SUBDIR= gnome
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+DISTNAME= sawfish-${PORTVERSION:S/./-/g}
+DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep
-BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
-RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk
+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=${PORTVERSION}
+PLIST_SUB= GNUHOST=${GNUHOST} VERSION=2.0.pre1
+USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_IMLIB= yes
-WANT_GNOME= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-readline \
--localstatedir=${PREFIX}/share \
- --datadir=${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/\..*//}
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_GNOME
-.undef WITHOUT_ALL
-WITH_GNOME= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_GNOME)
-USE_GNOME= yes
-CONFIGURE_ARGS+=--enable-capplet
-.else
-CONFIGURE_ARGS+=--disable-capplet \
- --disable-gnome-widgets \
- --without-gdk-pixbuf
-.endif
-
pre-patch:
@${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
@@ -65,4 +51,4 @@ post-install:
--entry="* sawfish: (sawfish). sawfish programming manual" \
${PREFIX}/info/sawfish.info ${PREFIX}/info/dir
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo
index 705cfda9c8f6..46cef6cfd163 100644
--- a/x11-wm/sawfish2/distinfo
+++ b/x11-wm/sawfish2/distinfo
@@ -1 +1 @@
-MD5 (sawfish-1.0.1.tar.gz) = b1587ea76cca08ec951f2536c17a307e
+MD5 (gnome2/sawfish-2002-05-02.tar.bz2) = bb3b6a5dc19257bcbbdf3d8cd97eb8fd
diff --git a/x11-wm/sawfish2/files/patch-ae b/x11-wm/sawfish2/files/patch-ae
index de7e1b297997..07d12436ab5d 100644
--- a/x11-wm/sawfish2/files/patch-ae
+++ b/x11-wm/sawfish2/files/patch-ae
@@ -1,13 +1,16 @@
---- capplet/Makefile.in.orig Wed Apr 26 21:12:29 2000
-+++ capplet/Makefile.in Tue Jun 13 16:02:14 2000
-@@ -29,9 +29,9 @@
- override CFLAGS += $(GNOME_CC_CFLAGS)
- override LIBS += $(GNOME_CC_LIBS)
+
+$FreeBSD$
+
+--- capplet/Makefile.in.orig Mon Apr 29 21:43:11 2002
++++ capplet/Makefile.in Mon Apr 29 21:44:12 2002
+@@ -26,8 +26,8 @@
+ srcdir=@srcdir@
+ VPATH=@srcdir@:@top_srcdir@
--G_CC_DIR = $(GNOMEDIR)/share/control-center
-+G_CC_DIR = $(GNOMEDIR)/share/gnome/control-center
- G_MENU_DIR = $(GNOMEDIR)/share/gnome/apps/Settings
+-G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets
-G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
++G_CC_DIR = $(GNOMEDIR)/share/gnome/control-center-2.0/capplets
+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps
- all : sawfish-capplet
+ all :
+
diff --git a/x11-wm/sawfish2/files/patch-configure b/x11-wm/sawfish2/files/patch-configure
new file mode 100644
index 000000000000..4a9b3bbe57aa
--- /dev/null
+++ b/x11-wm/sawfish2/files/patch-configure
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- configure 2002/04/29 19:09:14 1.1
++++ configure 2002/04/29 19:08:47
+@@ -4607,7 +4607,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
+ 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
diff --git a/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
new file mode 100644
index 000000000000..46e326127409
--- /dev/null
+++ b/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:16:50 1.1
++++ lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:17:07
+@@ -28,7 +28,6 @@
+ (open rep
+ gui.gtk-2.gtk
+ gui.gtk-2.gnome-canvas
+- gui.gtk-2.gdk-pixbuf
+ rep.io.files
+ sawfish.gtk.widget
+ sawfish.ui.layout)
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index 13d7f3060fea..e79c4a82d6f2 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -1,7 +1,5 @@
bin/sawfish
-%%GNOME:%%bin/sawfish-capplet
bin/sawfish-client
-%%GNOME:%%bin/sawfish-themer
bin/sawfish-ui
@unexec install-info --delete %D/info/sawfish.info %D/info/dir
info/sawfish.info
@@ -11,8 +9,8 @@ info/sawfish.info-3
info/sawfish.info-4
info/sawfish.info-5
@exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish). sawfish programming manual" %D/info/sawfish.info %D/info/dir
-libexec/rep/%%GNUHOST%%/sawfish/client.so
libexec/rep/%%GNUHOST%%/sawfish/client.la
+libexec/rep/%%GNUHOST%%/sawfish/client.so
libexec/sawfish/%%VERSION%%/%%GNUHOST%%/DOC
libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.la
libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.so
@@ -33,46 +31,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
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/.directory
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/.order
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/appearance-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/bindings-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/focus-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/match-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/maximize-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/meta-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/misc-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/move-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/placement-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/sound-properties.desktop
-%%GNOME:%%share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/.directory
-%%GNOME:%%share/gnome/control-center/Sawfish/.order
-%%GNOME:%%share/gnome/control-center/Sawfish/appearance-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/bindings-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/focus-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/match-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/maximize-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/meta-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/misc-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/move-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/placement-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/sound-properties.desktop
-%%GNOME:%%share/gnome/control-center/Sawfish/workspace-properties.desktop
-%%GNOME:%%share/gnome/pixmaps/sawfish-appearance.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-edgeflip.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-focus.png
share/gnome/pixmaps/sawfish-logo.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-matched.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-minmax.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-misc.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-moveresize.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-placement.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-shortcuts.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-tooltips.png
-%%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png
-%%GNOME:%%share/gnome/wm-properties/Sawfish.desktop
share/locale/az/LC_MESSAGES/sawfish.mo
+share/locale/bg/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
@@ -80,6 +41,8 @@ share/locale/de/LC_MESSAGES/sawfish.mo
share/locale/el/LC_MESSAGES/sawfish.mo
share/locale/en_GB/LC_MESSAGES/sawfish.mo
share/locale/es/LC_MESSAGES/sawfish.mo
+share/locale/et/LC_MESSAGES/sawfish.mo
+share/locale/eu/LC_MESSAGES/sawfish.mo
share/locale/fi/LC_MESSAGES/sawfish.mo
share/locale/fr/LC_MESSAGES/sawfish.mo
share/locale/ga/LC_MESSAGES/sawfish.mo
@@ -88,7 +51,10 @@ share/locale/hu/LC_MESSAGES/sawfish.mo
share/locale/it/LC_MESSAGES/sawfish.mo
share/locale/ja/LC_MESSAGES/sawfish.mo
share/locale/ko/LC_MESSAGES/sawfish.mo
+share/locale/lv/LC_MESSAGES/sawfish.mo
+share/locale/ms/LC_MESSAGES/sawfish.mo
share/locale/nl/LC_MESSAGES/sawfish.mo
+share/locale/nn/LC_MESSAGES/sawfish.mo
share/locale/no/LC_MESSAGES/sawfish.mo
share/locale/pl/LC_MESSAGES/sawfish.mo
share/locale/pt/LC_MESSAGES/sawfish.mo
@@ -187,6 +153,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jl
share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jl
share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jlc
+share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jl
+share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jl
share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/ui/config.jl
@@ -205,8 +173,6 @@ share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jl
share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jl
share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jlc
-share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jl
-share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jl
share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jlc
share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/event.jl
@@ -438,7 +404,6 @@ share/sawfish/%%VERSION%%/sounds/clicked.wav
share/sawfish/%%VERSION%%/sounds/gameover.wav
share/sawfish/%%VERSION%%/sounds/slide.wav
share/sawfish/%%VERSION%%/sounds/toggled.wav
-%%GNOME:%%share/sawfish/%%VERSION%%/themer.glade
share/sawfish/%%VERSION%%/themes/Crux/README
share/sawfish/%%VERSION%%/themes/Crux/README.gl
share/sawfish/%%VERSION%%/themes/Crux/active:bottom-left-border.png
@@ -682,10 +647,6 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl
@dirrm share/sawfish/%%VERSION%%/lisp
@dirrm share/sawfish/%%VERSION%%
@dirrm share/sawfish
-%%NOGNOME:%%@dirrm share/gnome/pixmaps
-%%GNOME:%%@dirrm share/gnome/control-center/Sawfish
-%%GNOME:%%@dirrm share/gnome/apps/Settings/Sawfish
-%%NOGNOME:%%@dirrm share/gnome
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm
@dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish