diff options
-rw-r--r-- | wm/windowmaker/Makefile | 7 | ||||
-rw-r--r-- | wm/windowmaker/buildlink.mk | 5 | ||||
-rw-r--r-- | wm/windowmaker/distinfo | 12 | ||||
-rw-r--r-- | wm/windowmaker/patches/patch-aa | 30 | ||||
-rw-r--r-- | wm/windowmaker/patches/patch-ab | 10 | ||||
-rw-r--r-- | wm/windowmaker/patches/patch-ad | 8 | ||||
-rw-r--r-- | wm/windowmaker/pkg/PLIST | 9 |
7 files changed, 44 insertions, 37 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 6f8b51cde5d..6a6c998a052 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2001/10/02 08:48:02 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2001/10/05 12:18:57 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 @@ post-install: ${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" diff --git a/wm/windowmaker/buildlink.mk b/wm/windowmaker/buildlink.mk index d1868e74d76..6fd79d84133 100644 --- a/wm/windowmaker/buildlink.mk +++ b/wm/windowmaker/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/10/03 20:56:53 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/10/05 12:18:57 wiz Exp $ # # This Makefile fragment is included by packages that use windowmaker. # @@ -17,7 +17,7 @@ WINDOWMAKER_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.windowmaker?= windowmaker>=0.65.0 +BUILDLINK_DEPENDS.windowmaker?= windowmaker>=0.70.0 DEPENDS+= ${BUILDLINK_DEPENDS.windowmaker}:../../wm/windowmaker EVAL_PREFIX+= BUILDLINK_PREFIX.windowmaker=windowmaker @@ -32,7 +32,6 @@ BUILDLINK_FILES.windowmaker+= lib/libWUtil.a BUILDLINK_FILES.windowmaker+= lib/libwraster.* .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" diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index f42f74decf2..005fc9332b3 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.12 2001/08/29 22:41:25 jlam Exp $ +$NetBSD: distinfo,v 1.13 2001/10/05 12:18:58 wiz 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) = 69d14c2f32b89c8dde871f4690cebf4b714f70e2 +SHA1 (patch-ab) = 11a3a88a81b8b9fad0456152ebe8da82b0c3c4ec SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591 -SHA1 (patch-ad) = f2ef4b942be333deb7f5f00e00653beb3081888e +SHA1 (patch-ad) = 040d603c789987f18c6622e12f6044cfae172e15 SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0 SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253 diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa index 8c357e5a223..978e3f0a8e8 100644 --- a/wm/windowmaker/patches/patch-aa +++ b/wm/windowmaker/patches/patch-aa @@ -1,31 +1,33 @@ -$NetBSD: patch-aa,v 1.4 2001/08/18 18:13:28 tron Exp $ +$NetBSD: patch-aa,v 1.5 2001/10/05 12:18:58 wiz 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) diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab index 71e768f8cc1..4c7df5606e6 100644 --- a/wm/windowmaker/patches/patch-ab +++ b/wm/windowmaker/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $ +$NetBSD: patch-ab,v 1.8 2001/10/05 12:18:58 wiz 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 +55,7 @@ $NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $ done -@@ -732,8 +707,8 @@ +@@ -706,8 +681,8 @@ fi fi diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-ad index d257dd45843..d4cb04a6aa5 100644 --- a/wm/windowmaker/patches/patch-ad +++ b/wm/windowmaker/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.6 2001/08/18 18:13:28 tron Exp $ +$NetBSD: patch-ad,v 1.7 2001/10/05 12:18:58 wiz 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 +10,7 @@ $NetBSD: patch-ad,v 1.6 2001/08/18 18:13:28 tron Exp $ #include <X11/Xlib.h> #include <X11/Xutil.h> -@@ -218,6 +219,12 @@ +@@ -235,6 +236,12 @@ { char *tmp, *ptr; char buf[16]; diff --git a/wm/windowmaker/pkg/PLIST b/wm/windowmaker/pkg/PLIST index 35227244987..7de7770a2b1 100644 --- a/wm/windowmaker/pkg/PLIST +++ b/wm/windowmaker/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2001/08/18 18:13:28 tron Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/10/05 12:18:58 wiz Exp $ GNUstep/Apps/WPrefs.app/WPrefs GNUstep/Apps/WPrefs.app/WPrefs.tiff GNUstep/Apps/WPrefs.app/WPrefs.xpm @@ -74,6 +74,7 @@ bin/geticonset bin/getstyle bin/seticons bin/setstyle +bin/wcopy bin/wdread bin/wdwrite bin/wkdemenu.pl @@ -84,6 +85,7 @@ bin/wmaker.inst bin/wmchlocale bin/wmsetbg bin/wmsetup +bin/wpaste bin/wsetfont bin/wxcopy bin/wxpaste @@ -95,6 +97,7 @@ etc/WindowMaker/WindowMaker 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 @@ -112,6 +115,7 @@ man/man1/geticonset.1 man/man1/getstyle.1 man/man1/seticons.1 man/man1/setstyle.1 +man/man1/wcopy.1 man/man1/wdwrite.1 man/man1/wmaker.1 man/man1/wmsetbg.1 @@ -289,6 +293,7 @@ share/WindowMaker/plmenu.pl 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 @@ -350,6 +355,8 @@ ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo @dirrm share/WindowMaker/Backgrounds @dirrm share/WindowMaker @dirrm share/WINGs +@dirrm man/sk/man1 +@dirrm man/sk @dirrm include/WINGs @dirrm etc/WindowMaker @dirrm GNUstep/Apps/WPrefs.app/xpm |