Subject: pkg/14157: Update for wm/windowmaker (0.65.1->0.70.0)
To: None <gnats-bugs@gnats.netbsd.org>
From: Geoff C.Wing <gcw@primenet.com.au>
List: netbsd-bugs
Date: 10/05/2001 14:50:11
>Number:         14157
>Category:       pkg
>Synopsis:       pkg update for wm/windowmaker (0.65.1->0.70.0)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 04 21:51:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Geoff C. Wing
>Release:        2001/10/04
>Organization:
>Environment:
System: NetBSD c.primenet.com.au 1.5Y NetBSD 1.5Y (C) #0: Thu Oct 4 12:40:43 EST 2001 gcw@c.primenet.com.au:/usr/netbsd/src/sys/arch/i386/compile/C i386
Architecture: i386
Machine: i386
>Description:
	Appended patch for update of windowmaker 0.65.1 to 0.70.0
	Dependence upon devel/libproplist no longer needed
	New feature: copy/paste into dock
	Other stuff: see top 34 lines of WindowMaker-0.70.0/ChangeLog

>How-To-Repeat:

>Fix:

Index: wm/windowmaker/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	2001/10/02 08:48:02	1.19
+++ Makefile	2001/10/05 04:42:23
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.19 2001/10/02 08:48:02 wiz Exp $
 
-DISTNAME=		WindowMaker-0.65.1
-PKGNAME=		windowmaker-0.65.1
+DISTNAME=		WindowMaker-0.70.0
+PKGNAME=		windowmaker-0.70.0
 CATEGORIES=		x11 wm
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/source/release/ \
 			ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -85,7 +85,6 @@
 		${PREFIX}/share/doc/WindowMaker
 
 .include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/libproplist/buildlink.mk"
 .include "../../graphics/hermes/buildlink.mk"
 .include "../../graphics/libungif/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
Index: wm/windowmaker/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	2001/08/29 22:41:25	1.12
+++ distinfo	2001/10/05 04:42:23
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.12 2001/08/29 22:41:25 jlam Exp $
 
-SHA1 (WindowMaker-0.65.1.tar.bz2) = 2600498e72ba3fc5a8fd9fb27ac1261b89c42826
-Size (WindowMaker-0.65.1.tar.bz2) = 1916105 bytes
-SHA1 (patch-aa) = 3d0ee91d9c7a98be2ff49614567c2af96178445a
-SHA1 (patch-ab) = 5fdc12fc8b4f30d484bf2882ca6392cbf6d24482
+SHA1 (WindowMaker-0.70.0.tar.bz2) = 3cea3598232c65beaf79f7825e1e3a00dc6fb032
+Size (WindowMaker-0.70.0.tar.bz2) = 2027797 bytes
+SHA1 (patch-aa) = 778dc650d52ef788c1c79cdec348f1776bf9020f
+SHA1 (patch-ab) = 3fb6b2b7a2f6738c6649076eac12786e5d1f26d5
 SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591
-SHA1 (patch-ad) = f2ef4b942be333deb7f5f00e00653beb3081888e
+SHA1 (patch-ad) = 8744eea4e2bcc619a6bc2fcd9933545b830b2521
 SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0
 SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253
Index: wm/windowmaker/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patch-aa	2001/08/18 18:13:28	1.4
+++ patch-aa	2001/10/05 04:42:23
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.4 2001/08/18 18:13:28 tron Exp $
-
---- doc/Makefile.am.orig	Wed Jun  6 22:22:55 2001
-+++ doc/Makefile.am	Sat Aug 18 18:24:27 2001
-@@ -3,16 +3,16 @@
+--- doc/Makefile.am.orig	Thu Sep 13 00:11:05 2001
++++ doc/Makefile.am	Fri Oct  5 14:01:28 2001
+@@ -3,17 +3,17 @@
  SUBDIRS = sk
  
  man_MANS = \
 -	geticonset.1x \
--	setstyle.1x \
--	wxpaste.1x \
 -	getstyle.1x \
+-	seticons.1x \
+-	setstyle.1x \
+-	wcopy.1x \
 -	wdwrite.1x \
+-	wmaker.1x \
 -	wmsetbg.1x \
 -	wsetfont.1x \
--	seticons.1x \
--	wmaker.1x \
--	wxcopy.1x
+-	wxcopy.1x \
+-	wxpaste.1x
 +	geticonset.1 \
-+	setstyle.1 \
-+	wxpaste.1 \
 +	getstyle.1 \
++	seticons.1 \
++	setstyle.1 \
++	wcopy.1 \
 +	wdwrite.1 \
++	wmaker.1 \
 +	wmsetbg.1 \
 +	wsetfont.1 \
-+	seticons.1 \
-+	wmaker.1 \
-+	wxcopy.1
++	wxcopy.1 \
++	wxpaste.1
  
  EXTRA_DIST = $(man_MANS)
  
Index: wm/windowmaker/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-ab,v
retrieving revision 1.7
diff -u -r1.7 patch-ab
--- patch-ab	2001/08/29 22:41:25	1.7
+++ patch-ab	2001/10/05 04:42:23
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $
-
---- configure.in.orig	Mon Jul 23 21:43:34 2001
-+++ configure.in	Sat Aug 18 19:57:49 2001
-@@ -220,43 +220,18 @@
+--- configure.in.orig	Fri Oct  5 10:52:05 2001
++++ configure.in	Fri Oct  5 13:59:51 2001
+@@ -244,43 +244,18 @@
  
  dnl List of supported locales
  dnl -------------------------
@@ -55,7 +53,7 @@
  done
  
  
-@@ -732,8 +707,8 @@
+@@ -706,8 +681,8 @@
      fi
  fi
  
Index: wm/windowmaker/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/patches/patch-ad,v
retrieving revision 1.6
diff -u -r1.6 patch-ad
--- patch-ad	2001/08/18 18:13:28	1.6
+++ patch-ad	2001/10/05 04:42:23
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.6 2001/08/18 18:13:28 tron Exp $
-
---- src/main.c.orig	Mon Jul 23 20:04:13 2001
-+++ src/main.c	Sat Aug 18 19:31:43 2001
+--- src/main.c.orig	Thu Oct  4 13:39:18 2001
++++ src/main.c	Fri Oct  5 14:02:59 2001
 @@ -28,6 +28,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -10,7 +8,7 @@
  
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-@@ -218,6 +219,12 @@
+@@ -235,6 +236,12 @@
  {
      char *tmp, *ptr;
      char buf[16];
Index: wm/windowmaker/pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/windowmaker/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- PLIST	2001/08/18 18:13:28	1.7
+++ PLIST	2001/10/05 04:42:24
@@ -95,6 +95,7 @@
 include/WINGs/WINGs.h
 include/WINGs/WINGsP.h
 include/WINGs/WUtil.h
+include/WINGs/proplist-compat.h
 include/WINGs/wtabledelegates.h
 include/WINGs/wtableview.h
 include/WMaker.h
@@ -289,6 +290,7 @@
 share/WindowMaker/plmenu.ro
 share/WindowMaker/plmenu.sk
 share/WindowMaker/plmenu.zh_CN
+share/WindowMaker/plmenu.zh_TW.Big5
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
 share/doc/WindowMaker/FAQ
>Release-Note:
>Audit-Trail:
>Unformatted: