diff options
| -rw-r--r-- | wm/ctwm/Makefile | 9 | ||||
| -rw-r--r-- | wm/ctwm/distinfo | 12 | ||||
| -rw-r--r-- | wm/ctwm/patches/patch-aa | 23 | ||||
| -rw-r--r-- | wm/ctwm/patches/patch-ab | 15 | ||||
| -rw-r--r-- | wm/ctwm/patches/patch-ac | 16 |
5 files changed, 56 insertions, 19 deletions
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile index df1736a3433..1c5bc93e87d 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.10 2003/06/04 04:49:01 simonb Exp $ +# $NetBSD: Makefile,v 1.11 2003/06/10 07:40:52 wiz Exp $ # -DISTNAME= ctwm-3.5.2 -PKGREVISION= 1 +DISTNAME= ctwm-3.6 CATEGORIES= x11 wm MASTER_SITES= http://ctwm.free.lp.se/dist/ +# XXX: 3.6 didn't include the XPMs, XPM tarball generated from 3.5.2 manually +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xpm${EXTRACT_SUFX} MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://ctwm.free.lp.se/ -COMMENT= Window manager with support for multiple virtual screens +COMMENT= Window manager with support for multiple virtual screens and GNOME 1.x USE_BUILDLINK2= YES USE_IMAKE= YES diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo index 34c6847ec0c..e6012f70cf3 100644 --- a/wm/ctwm/distinfo +++ b/wm/ctwm/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.4 2003/06/04 04:36:56 simonb Exp $ +$NetBSD: distinfo,v 1.5 2003/06/10 07:40:52 wiz Exp $ -SHA1 (ctwm-3.5.2.tar.gz) = 938750b798b53262f00436f7cd2228b414ce3057 -Size (ctwm-3.5.2.tar.gz) = 598142 bytes -SHA1 (patch-aa) = ad06698a5d0694a98c808685b5dbec8ccf47442f +SHA1 (ctwm-3.6.tar.gz) = 8a8cefd2273c748fd7ceded4c3553e5ca7a994ec +Size (ctwm-3.6.tar.gz) = 370563 bytes +SHA1 (ctwm-3.6-xpm.tar.gz) = dfe7331dba041eff70d561b728ca8d7a16f68ca6 +Size (ctwm-3.6-xpm.tar.gz) = 246505 bytes +SHA1 (patch-aa) = 4b86b9d19e89b4b53415356c9ee9d4d21a0dd038 +SHA1 (patch-ab) = e03e595241ae1e1bc412772c6805ee115aad80d0 +SHA1 (patch-ac) = 99a28b20904207693a4f25aafaaac447dbcdca95 diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa index 75ea9587cb5..ba33ce49f8e 100644 --- a/wm/ctwm/patches/patch-aa +++ b/wm/ctwm/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2003/06/04 04:36:56 simonb Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/10 07:40:53 wiz Exp $ ---- util.c.orig Tue Sep 14 23:26:02 1999 -+++ util.c -@@ -3897,6 +3897,7 @@ Atom prop; - ProgramName, XGetAtomName(dpy, prop), w); - stringptr = NULL; - } -+ XFree (text_prop.value); - } else { - stringptr = NULL; - } +--- gram.y.orig Tue Dec 11 16:38:52 2001 ++++ gram.y +@@ -683,7 +683,7 @@ wingeom_entries : /* Empty */ + | wingeom_entries wingeom_entry + ; + +-wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2) } ++wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2); } + + + diff --git a/wm/ctwm/patches/patch-ab b/wm/ctwm/patches/patch-ab new file mode 100644 index 00000000000..cc2fb4c75c3 --- /dev/null +++ b/wm/ctwm/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2003/06/10 07:40:53 wiz Exp $ + +Enable use of I18N as in other versions. + +--- Imakefile.orig Tue Dec 11 16:38:52 2001 ++++ Imakefile +@@ -12,7 +12,7 @@ XCOMM + #define XPM + #define USEM4 + #undef X11R6 +-#undef I18N ++#define I18N + + YFLAGS = -d + DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB) diff --git a/wm/ctwm/patches/patch-ac b/wm/ctwm/patches/patch-ac new file mode 100644 index 00000000000..a75066ffe91 --- /dev/null +++ b/wm/ctwm/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1 2003/06/10 07:40:53 wiz Exp $ + +Remove -s option from call to m4. + +--- parse.c.dist Tue Dec 11 16:38:52 2001 ++++ parse.c Sat Mar 8 13:34:59 2003 +@@ -2097,7 +2097,8 @@ + dup2(fids[1], 1); /* stdout = pipe to parent */ + /* get_defs("m4", dpy, display_name) */ + tmp_file = m4_defs(dpy, display_name); +- execlp("m4", "m4", "-s", tmp_file, "-", NULL); ++ /* Not all m4s know about -s */ ++ execlp("m4", "m4", tmp_file, "-", NULL); + /* If we get here we are screwed... */ + perror("Can't execlp() m4"); + exit(124); |