Update to sawfish 1.0.1, and put back the static libraries.

3 files changed, 18 insertions, 15 deletions

diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 75bc4bda8ce..0951ab8b033 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2001/10/21 21:19:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/10/22 02:34:38 mycroft Exp $
 
 DISTNAME=		sawfish-${SF_VERS}
-SF_VERS=		1.0
+SF_VERS=		1.0.1
 CATEGORIES=		x11 gnome wm
-MASTER_SITES=		ftp://mirror.capital-internet.net/pub/sawmill/sawfish/ \
-			ftp://eprom.dhs.org/pub/mirrors/sawmill/ \
-			http://ftp.fi.muni.cz/pub/linux/sawmill/ \
-			ftp://ftp.dcs.warwick.ac.uk/people/John.Harper/ \
-			ftp://ftp.du.se/pub/mirrors/sawfish/ \
-			ftp://sawmill.sourceforge.net/pub/sawmill/
+MASTER_SITES=		http://prdownloads.sourceforge.net/sawmill/
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://sawmill.sourceforge.net/
diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo
index a54fd705f5f..1e4e45a323e 100644
--- a/wm/sawfish/distinfo
+++ b/wm/sawfish/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/10/21 21:19:21 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/10/22 02:34:38 mycroft Exp $
 
-SHA1 (sawfish-1.0.tar.gz) = c04790e42a2aeb005f89cdd0282931ceeba83470
-Size (sawfish-1.0.tar.gz) = 1292902 bytes
+SHA1 (sawfish-1.0.1.tar.gz) = bd254134da79b66da431f4b61f9fb2f3b2cf378f
+Size (sawfish-1.0.1.tar.gz) = 1326727 bytes
 SHA1 (patch-aa) = 18f4912ef5ae1a5201643b90aaac3f5f0a0c1550
 SHA1 (patch-ab) = 20ffaa03c787c0edaee2cdeea5855395ebb57fdc
 SHA1 (patch-ac) = 0f9558d5c968074d5ecf76534952478f128c2c29
diff --git a/wm/sawfish/pkg/PLIST b/wm/sawfish/pkg/PLIST
index 85000c1e16e..e309bbea389 100644
--- a/wm/sawfish/pkg/PLIST
+++ b/wm/sawfish/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/10/21 21:19:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/10/22 02:34:39 mycroft Exp $
 bin/sawfish
 bin/sawfish-capplet
 bin/sawfish-client
@@ -14,23 +14,31 @@ info/sawfish.info-5
 @exec install-info --info-dir=%D/info %D/info/sawfish.info
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/DOC
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gradient.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/gtk-style
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish-about
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish-menu
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/flippers.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/gradient.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/gradient.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/gradient.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/play-sample.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/play-sample.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/play-sample.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/selection.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/sawfish/wm/util/x.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/selection.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/selection.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/selection.so
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/x.la
+libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/x.a
 libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/x.so
 share/control-center/Sawfish/.directory
 share/control-center/Sawfish/.order
@@ -78,8 +86,8 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sawfish.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/sawfish.mo
-${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/sawfish.mo
@@ -88,8 +96,8 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/sawfish.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/sawfish.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/sawfish.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/sawfish.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/sawfish.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/sawfish.mo
 share/pixmaps/sawfish-appearance.png
 share/pixmaps/sawfish-edgeflip.png
 share/pixmaps/sawfish-focus.png