diff options
| -rw-r--r-- | wm/icewm/Makefile | 3 | ||||
| -rw-r--r-- | wm/icewm/Makefile.common | 4 | ||||
| -rw-r--r-- | wm/icewm/PLIST | 43 | ||||
| -rw-r--r-- | wm/icewm/distinfo | 16 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-aa | 10 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-ac | 16 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-ad | 12 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-aj | 10 | ||||
| -rw-r--r-- | wm/icewm/patches/patch-ak | 13 |
9 files changed, 26 insertions, 101 deletions
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 5d3eda8e341..076cf5f37b1 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.38 2007/08/25 15:41:32 obache Exp $ +# $NetBSD: Makefile,v 1.39 2008/06/16 10:17:56 hauke Exp $ -PKGREVISION= 1 COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 8af0ef01eef..6775f96b30f 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.60 2007/08/25 15:41:32 obache Exp $ +# $NetBSD: Makefile.common,v 1.61 2008/06/16 10:17:56 hauke Exp $ -DISTNAME= icewm-1.2.27 +DISTNAME= icewm-1.2.34 CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index 20c7edb95b6..fe98164411d 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2007/08/25 15:41:32 obache Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/06/16 10:17:56 hauke Exp $ bin/icehelp bin/icesh bin/icewm @@ -35,18 +35,6 @@ share/doc/icewm/html/icewm-9.html share/doc/icewm/html/icewm.html share/icewm/icons/app_16x16.xpm share/icewm/icons/app_32x32.xpm -share/icewm/icons/bomb_16x16.xpm -share/icewm/icons/bomb_32x32.xpm -share/icewm/icons/communicator-abook_16x16.xpm -share/icewm/icons/communicator-abook_32x32.xpm -share/icewm/icons/communicator-browser_16x16.xpm -share/icewm/icons/communicator-browser_32x32.xpm -share/icewm/icons/communicator-composer_16x16.xpm -share/icewm/icons/communicator-composer_32x32.xpm -share/icewm/icons/communicator-discussion_16x16.xpm -share/icewm/icons/communicator-discussion_32x32.xpm -share/icewm/icons/communicator-mail_16x16.xpm -share/icewm/icons/communicator-mail_32x32.xpm share/icewm/icons/emacs_16x16.xpm share/icewm/icons/emacs_32x32.xpm share/icewm/icons/file_16x16.xpm @@ -55,31 +43,13 @@ share/icewm/icons/folder_16x16.xpm share/icewm/icons/folder_32x32.xpm share/icewm/icons/fte_16x16.xpm share/icewm/icons/fte_32x32.xpm -share/icewm/icons/gimp_16x16.xpm -share/icewm/icons/gimp_32x32.xpm -share/icewm/icons/gnome_16x16.xpm share/icewm/icons/java_16x16.xpm share/icewm/icons/java_32x32.xpm -share/icewm/icons/kde_16x16.xpm -share/icewm/icons/koules_16x16.xpm -share/icewm/icons/koules_32x32.xpm -share/icewm/icons/navigator_16x16.xpm -share/icewm/icons/navigator_32x32.xpm -share/icewm/icons/netscape_16x16.xpm -share/icewm/icons/netscape_32x32.xpm -share/icewm/icons/pdf_16x16.xpm -share/icewm/icons/pdf_32x32.xpm share/icewm/icons/vim_16x16.xpm share/icewm/icons/vim_32x32.xpm share/icewm/icons/vim_48x48.xpm -share/icewm/icons/xisp_16x16.xpm -share/icewm/icons/xisp_32x32.xpm -share/icewm/icons/xload_16x16.xpm -share/icewm/icons/xload_32x32.xpm share/icewm/icons/xterm_16x16.xpm share/icewm/icons/xterm_32x32.xpm -share/icewm/icons/xv_16x16.xpm -share/icewm/icons/xv_32x32.xpm share/icewm/keys share/icewm/ledclock/a.xpm share/icewm/ledclock/colon.xpm @@ -108,17 +78,10 @@ share/icewm/menu share/icewm/preferences share/icewm/taskbar/bsd-daemon.xpm share/icewm/taskbar/collapse.xpm -share/icewm/taskbar/debian.xpm share/icewm/taskbar/desktop.xpm share/icewm/taskbar/expand.xpm -share/icewm/taskbar/icewm.xpm -share/icewm/taskbar/linux.xpm -share/icewm/taskbar/linux1.xpm -share/icewm/taskbar/linux2.xpm -share/icewm/taskbar/linux20.xpm share/icewm/taskbar/start.xpm share/icewm/taskbar/windows.xpm -share/icewm/taskbar/xfreeos2.xpm share/icewm/themes/Infadel2/Ergonomic.theme share/icewm/themes/Infadel2/Overloaded.theme share/icewm/themes/Infadel2/closeA.xpm @@ -161,7 +124,7 @@ share/icewm/themes/Infadel2/rolldownI.xpm share/icewm/themes/Infadel2/rollupA.xpm share/icewm/themes/Infadel2/rollupI.xpm share/icewm/themes/Infadel2/snap.pcf -share/icewm/themes/Infadel2/taskbar/linux.xpm +share/icewm/themes/Infadel2/taskbar/start.xpm share/icewm/themes/Infadel2/taskbar/windows.xpm share/icewm/themes/Infadel2/titleAB.xpm share/icewm/themes/Infadel2/titleAJ.xpm @@ -390,3 +353,5 @@ share/locale/zh_TW/LC_MESSAGES/icewm.mo @dirrm share/icewm @dirrm share/doc/icewm/html @dirrm share/doc/icewm +@exec ${MKDIR} %D/etc/icewm +@dirrm etc/icewm diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index 413eb70d72f..2017498c741 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.33 2006/11/28 15:26:18 rillig Exp $ +$NetBSD: distinfo,v 1.34 2008/06/16 10:17:56 hauke Exp $ -SHA1 (icewm-1.2.27.tar.gz) = bb5821dbe46833804197012aee176b2c191de392 -RMD160 (icewm-1.2.27.tar.gz) = a04feda8c04f6aa15be5160e58179802d5308a64 -Size (icewm-1.2.27.tar.gz) = 1065165 bytes -SHA1 (patch-aa) = ed3cd062a2d2cb741539e9ec6e26fa009fb611a9 -SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c -SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424 -SHA1 (patch-aj) = 63e57e67a4a450c3ff6a6aa1e467c35ccc66d42b -SHA1 (patch-ak) = 6f6dfa9a8310e3f6b05720c5190a02ffbd3b8377 +SHA1 (icewm-1.2.34.tar.gz) = 9cc7c47e47767eccf957561f1a166ffe631c3d42 +RMD160 (icewm-1.2.34.tar.gz) = f85a9332312134d22db19e806d9e7122ece76f07 +Size (icewm-1.2.34.tar.gz) = 830558 bytes +SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e +SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088 +SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2 diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa index 5949d78b392..a9bfd5718d4 100644 --- a/wm/icewm/patches/patch-aa +++ b/wm/icewm/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $ +$NetBSD: patch-aa,v 1.10 2008/06/16 10:17:56 hauke Exp $ ---- src/ylocale.cc.orig 2006-08-06 20:38:14.000000000 +0200 -+++ src/ylocale.cc 2006-11-28 14:19:44.455436536 +0100 -@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC - char * inbuf((char *) lStr), * outbuf((char *) uStr); +--- src/ylocale.cc.orig 2007-12-27 19:16:17.000000000 +0100 ++++ src/ylocale.cc 2008-06-08 15:43:51.000000000 +0200 +@@ -153,5 +153,9 @@ size_t inlen(lLen), outlen(4 * lLen); +#if defined(__NetBSD__) || defined(__sun) @@ -13,4 +12,3 @@ $NetBSD: patch-aa,v 1.9 2006/11/28 15:26:18 rillig Exp $ +#endif warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); - *((YUChar *) outbuf) = 0; diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac deleted file mode 100644 index fb52a0fdf26..00000000000 --- a/wm/icewm/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2006/02/09 21:36:41 ghen Exp $ - -Get icewm to look in the right place for START_PIXMAP - ---- src/wmtaskbar.cc.orig 2006-02-09 17:15:58.000000000 +0100 -+++ src/wmtaskbar.cc -@@ -90,7 +90,8 @@ static void initPixmaps() { - YResourcePaths subdirs(paths, base); - - if ((icewmImage = themedirs.loadImage(base, ICEWM_PIXMAP)) == null && -- (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null) -+ (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null && -+ (icewmImage = subdirs.loadImage(base, START_PIXMAP)) == null) - icewmImage = subdirs.loadImage(base, ICEWM_PIXMAP); - - windowsImage = subdirs.loadImage(base, "windows.xpm"); diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad index 745648f719a..9682c48a968 100644 --- a/wm/icewm/patches/patch-ad +++ b/wm/icewm/patches/patch-ad @@ -1,15 +1,11 @@ -$NetBSD: patch-ad,v 1.8 2004/06/26 23:56:21 xtraeme Exp $ +$NetBSD: patch-ad,v 1.9 2008/06/16 10:17:56 hauke Exp $ -Make IceWM look in the right place for help files - ---- src/Makefile.in.orig Sun May 23 07:18:19 2004 -+++ src/Makefile.in Tue Jun 22 22:29:11 2004 -@@ -31,7 +31,7 @@ - -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ +--- src/Makefile.in.orig 2007-12-27 19:16:17.000000000 +0100 ++++ src/Makefile.in 2008-06-08 15:48:05.000000000 +0200 +@@ -34,5 +34,5 @@ -DICESMEXE='"icewm-session$(EXEEXT)"' \ -DICEHELPEXE='"icehelp$(EXEEXT)"' \ - -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' + -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"' CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ - @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` diff --git a/wm/icewm/patches/patch-aj b/wm/icewm/patches/patch-aj index 29f30c74044..585c878a1f4 100644 --- a/wm/icewm/patches/patch-aj +++ b/wm/icewm/patches/patch-aj @@ -1,9 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $ +$NetBSD: patch-aj,v 1.3 2008/06/16 10:17:56 hauke Exp $ ---- src/aapm.cc.orig 2006-08-06 20:38:16.000000000 +0200 -+++ src/aapm.cc 2006-10-04 21:23:18.000000000 +0200 -@@ -38,8 +38,12 @@ - #include <sys/file.h> +--- src/aapm.cc.orig 2007-12-27 19:16:17.000000000 +0100 ++++ src/aapm.cc 2008-06-08 15:50:01.000000000 +0200 +@@ -39,6 +39,10 @@ #include <sys/ioctl.h> #include <sys/types.h> +#ifdef __sparcv9 @@ -14,4 +13,3 @@ $NetBSD: patch-aj,v 1.2 2006/10/04 19:38:06 rillig Exp $ +#endif YColor *YApm::apmBg = 0; - YColor *YApm::apmFg = 0; diff --git a/wm/icewm/patches/patch-ak b/wm/icewm/patches/patch-ak deleted file mode 100644 index 91cbca75cbe..00000000000 --- a/wm/icewm/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2006/10/04 19:38:06 rillig Exp $ - ---- configure.orig 2006-10-04 21:23:23.000000000 +0200 -+++ configure 2006-10-04 21:24:12.000000000 +0200 -@@ -10354,7 +10354,7 @@ else - echo "${ECHO_T}no" >&6 - fi - -- if test "${XFT_CONFIG}" == ""; then -+ if test "${XFT_CONFIG}" = ""; then - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo "$as_me:$LINENO: checking for $ac_word" >&5 |