summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
Diffstat (limited to 'wm')
-rw-r--r--wm/fluxbox/distinfo3
-rw-r--r--wm/fluxbox/patches/patch-ab46
-rw-r--r--wm/icewm/Makefile4
-rw-r--r--wm/icewm/Makefile.common7
-rw-r--r--wm/icewm/PLIST5
-rw-r--r--wm/icewm/distinfo8
-rw-r--r--wm/icewm/patches/patch-ae10
-rw-r--r--wm/wmx/PLIST4
8 files changed, 67 insertions, 20 deletions
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 1e1487d74e1..a5676757e3e 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/04/22 18:39:19 wiz Exp $
+$NetBSD: distinfo,v 1.2.2.1 2002/08/25 21:21:51 jlam Exp $
SHA1 (fluxbox-0.1.8.tar.gz) = 48c010631d24ed3cf9620169cd1203c2cc7cb0b3
Size (fluxbox-0.1.8.tar.gz) = 437047 bytes
SHA1 (patch-aa) = 4d2360c918e6df49ab306fad67d43b1cc9a1020e
+SHA1 (patch-ab) = 6460c6170bef06511dcb8225869f9097fe4267f3
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
new file mode 100644
index 00000000000..4c6fb30473a
--- /dev/null
+++ b/wm/fluxbox/patches/patch-ab
@@ -0,0 +1,46 @@
+$NetBSD: patch-ab,v 1.3.2.2 2002/08/25 21:21:53 jlam Exp $
+
+--- src/Makefile.in.orig Sat Apr 20 06:11:45 2002
++++ src/Makefile.in
+@@ -152,6 +152,10 @@ fluxbox_LDADD = $(LDADD)
+ fluxbox_DEPENDENCIES =
+ fluxbox_LDFLAGS =
+ CXXFLAGS = @CXXFLAGS@
++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+@@ -171,9 +175,12 @@ GZIP_ENV = --best
+ SOURCES = $(fluxbox_SOURCES)
+ OBJECTS = $(fluxbox_OBJECTS)
+
++Image.o: Image.C
++Image.lo: Image.C
++
+ all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .cc .lo .o .obj .s
++.SUFFIXES: .S .c .cc .C .lo .o .obj .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+
+@@ -254,10 +261,16 @@ maintainer-clean-libtool:
+ fluxbox$(EXEEXT): $(fluxbox_OBJECTS) $(fluxbox_DEPENDENCIES)
+ @rm -f fluxbox$(EXEEXT)
+ $(CXXLINK) $(fluxbox_LDFLAGS) $(fluxbox_OBJECTS) $(fluxbox_LDADD) $(LIBS)
++.cc.C:
++ cp -f $< $@
++.C.o:
++ $(CXXCOMPILE_NOOPT) -c $<
+ .cc.o:
+ $(CXXCOMPILE) -c $<
+ .cc.obj:
+ $(CXXCOMPILE) -c `cygpath -w $<`
++.C.lo:
++ $(LTCXXCOMPILE_NOOPT) -c $<
+ .cc.lo:
+ $(LTCXXCOMPILE) -c $<
+
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 9a874ea97d7..d894e06f1c0 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11.2.1 2002/07/01 17:45:12 jlam Exp $
+# $NetBSD: Makefile,v 1.11.2.2 2002/08/25 21:21:53 jlam Exp $
-PKGNAME= ${DISTNAME:S/-2/.2/}
+PKGNAME= ${DISTNAME}
COMMENT= Small, fast and light-weight window manager
CONFLICTS+= icewm-gnome-[0-9]*
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a871392571c..0ec471b85f2 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2002/03/10 22:11:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13.2.1 2002/08/25 21:21:54 jlam Exp $
-DISTNAME= icewm-1.0.9-2
+DISTNAME= icewm-1.2.0
CATEGORIES= x11 wm
MASTER_SITES= http://download.sourceforge.net/icewm/
-EXTRACT_SUFX= .tar.bz2
-PKGREVISION= 1
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://icewm.sourceforge.net/
@@ -17,7 +15,6 @@ BUILD_USES_MSGFMT= # defined
DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
FILESDIR= ${.CURDIR}/../../wm/icewm/files
PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
-WRKSRC= ${WRKDIR}/icewm-1.0.9
.include "../../mk/bsd.prefs.mk"
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index aaf17617f10..fe48969b3a5 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/26 09:41:39 martti Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:54 jlam Exp $
bin/genpref
bin/icehelp
bin/icesh
@@ -283,6 +283,7 @@ share/doc/icewm/FAQ
share/doc/icewm/README
share/doc/icewm/TODO
share/locale/ca/LC_MESSAGES/icewm.mo
+share/locale/cs/LC_MESSAGES/icewm.mo
share/locale/de/LC_MESSAGES/icewm.mo
share/locale/en/LC_MESSAGES/icewm.mo
share/locale/es/LC_MESSAGES/icewm.mo
@@ -297,6 +298,8 @@ share/locale/pl/LC_MESSAGES/icewm.mo
share/locale/pt_BR/LC_MESSAGES/icewm.mo
share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/sv/LC_MESSAGES/icewm.mo
+share/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo
share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
@dirrm etc/X11/icewm
@dirrm lib/X11/icewm/icons
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index b05c221224e..11d2aecef2d 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/05/03 10:56:38 wiz Exp $
+$NetBSD: distinfo,v 1.6.2.1 2002/08/25 21:21:55 jlam Exp $
-SHA1 (icewm-1.0.9-2.tar.bz2) = f42d64996cde40f790247eb5428fb56dc2bfdb2f
-Size (icewm-1.0.9-2.tar.bz2) = 484612 bytes
+SHA1 (icewm-1.2.0.tar.gz) = bef4daba4bb94120f08f90755a9bc3518c254c21
+Size (icewm-1.2.0.tar.gz) = 684306 bytes
SHA1 (patch-aa) = 8dc74038552f8c9783622229981a9a83b3464512
SHA1 (patch-ab) = bd8501ef2606efecb8f603578e1e2f978e586923
SHA1 (patch-ac) = 5275f5e9b5dae569d8d01a1209c00f40490edcbc
-SHA1 (patch-ae) = edc66c096499df9a8b76d43376b3e40c408c99d3
+SHA1 (patch-ae) = e577de295c2024e51b0b571dc8eaaf5169ad57e4
SHA1 (patch-af) = 61a5060c95f9110b536c3312c1afc8d722af5226
SHA1 (patch-ag) = b6fb34262124dff0c33efe6f9c3261068af71c7d
diff --git a/wm/icewm/patches/patch-ae b/wm/icewm/patches/patch-ae
index 506b2f05f47..ad564bef033 100644
--- a/wm/icewm/patches/patch-ae
+++ b/wm/icewm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $
+$NetBSD: patch-ae,v 1.2.2.1 2002/08/25 21:21:56 jlam Exp $
---- src/wmtaskbar.cc.orig Tue Oct 9 16:54:04 2001
-+++ src/wmtaskbar.cc Tue Feb 26 08:48:08 2002
-@@ -287,7 +287,11 @@
+--- src/wmtaskbar.cc.orig Thu May 16 05:00:02 2002
++++ src/wmtaskbar.cc Sat May 25 09:41:09 2002
+@@ -288,7 +288,11 @@
} else
fClock = 0;
#ifdef CONFIG_APPLET_APM
@@ -12,5 +12,5 @@ $NetBSD: patch-ae,v 1.2 2002/02/26 09:41:40 martti Exp $
+ if (taskBarShowApm && access(APMDEV, 0) == 0) {
+#endif
fApm = new YApm(this);
- if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
+ if (fApm->height() > ht) ht = fApm->height();
} else
diff --git a/wm/wmx/PLIST b/wm/wmx/PLIST
index e43104aa94a..95fdeb0ef94 100644
--- a/wm/wmx/PLIST
+++ b/wm/wmx/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2002/08/25 21:21:57 jlam Exp $
bin/wmx
share/doc/wmx/README
share/doc/wmx/README.contrib
@dirrm share/doc/wmx
-@exec ${MKDIR} -p %D/etc/wmx
+@exec ${MKDIR} %D/etc/wmx
@unexec ${RMDIR} -p %D/etc/wmx 2>/dev/null || true
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 11:21:39 +0000