Update to 3.7 from PR #30804.

Rhialto is the new MAINTAINER. Thank you!
Enable pkgviews.
Installs some example configurations. (Should CONF_FILES also be used?)
Now depend on jpeg too.


Remove patch-aa, patch-ab and patch-ad.

According to CHANGES file, there are 50 changes.
(I see it includes some bug fixes from pkgsrc users.)

6 files changed, 47 insertions, 80 deletions

diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index d9382e8edcb..b7472b4717f 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,17 +1,31 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/10/06 17:28:41 reed Exp $
 #
 
-DISTNAME=	ctwm-3.6
+DISTNAME=	ctwm-3.7
 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
+MAINTAINER=	rhialto@falu.nl
 HOMEPAGE=	http://ctwm.free.lp.se/
-COMMENT=	Window manager with support for multiple virtual screens and GNOME 1.x
+COMMENT=	Window manager with support for multiple virtual screens and Gnome 1.x
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_IMAKE=	YES
 
+pre-configure:
+	( ${ECHO} 'USER_JPEGLIBDIR = -L${BUILDLINK_PREFIX.jpeg}/lib -Wl,-rpath,${BUILDLINK_PREFIX.jpeg}/lib'; \
+	  ${ECHO} 'USER_JPEGINCDIR = -I${BUILDLINK_PREFIX.jpeg}/include'; \
+	  ${CAT} ${WRKSRC}/Imakefile.local-template; \
+	) >${WRKSRC}/Imakefile.local
+
+EXAMPLEDIR=${PREFIX}/share/examples/ctwm
+
+pre-install:
+	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
+.for f in example.ctwmrc levitte.ctwmrc peterc.ctwmrc system.ctwmrc system.ctwmrc.gnome
+	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLEDIR}
+.endfor
+
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ctwm/PLIST b/wm/ctwm/PLIST
index 8ff5bad47d7..15e2fef7766 100644
--- a/wm/ctwm/PLIST
+++ b/wm/ctwm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/25 05:01:21 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/06 17:28:42 reed Exp $
 bin/ctwm
 lib/X11/twm/images/3D_Expand15.xpm
 lib/X11/twm/images/3D_Iconify15.xpm
@@ -6,13 +6,29 @@ lib/X11/twm/images/3D_Lightning15.xpm
 lib/X11/twm/images/3D_Menu15.xpm
 lib/X11/twm/images/3D_Resize15.xpm
 lib/X11/twm/images/3D_Zoom15.xpm
+lib/X11/twm/images/3dcircle.xpm
+lib/X11/twm/images/3ddimple.xpm
+lib/X11/twm/images/3ddot.xpm
+lib/X11/twm/images/3dfeet.xpm
+lib/X11/twm/images/3dleopard.xpm
+lib/X11/twm/images/3dpie.xpm
+lib/X11/twm/images/3dpyramid.xpm
+lib/X11/twm/images/3dslant.xpm
 lib/X11/twm/images/IslandD.xpm
 lib/X11/twm/images/IslandW.xpm
 lib/X11/twm/images/LRom.xpm
 lib/X11/twm/images/LRom1.xpm
 lib/X11/twm/images/arthur.xpm
 lib/X11/twm/images/audio_editor.xpm
+lib/X11/twm/images/background1.xpm
+lib/X11/twm/images/background2.xpm
+lib/X11/twm/images/background3.xpm
+lib/X11/twm/images/background4.xpm
+lib/X11/twm/images/background5.xpm
+lib/X11/twm/images/background6.xpm
+lib/X11/twm/images/background7.xpm
 lib/X11/twm/images/background8.xpm
+lib/X11/twm/images/background9.xpm
 lib/X11/twm/images/ball1.xpm
 lib/X11/twm/images/ball10.xpm
 lib/X11/twm/images/ball11.xpm
@@ -31,13 +47,6 @@ lib/X11/twm/images/clipboard.xpm
 lib/X11/twm/images/datebook.xpm
 lib/X11/twm/images/emacs.xpm
 lib/X11/twm/images/ghostview.xpm
-lib/X11/twm/images/gnu-emacs1.xpm
-lib/X11/twm/images/gnu-emacs2.xpm
-lib/X11/twm/images/gnu-emacs3.xpm
-lib/X11/twm/images/gnu-emacs4.xpm
-lib/X11/twm/images/gnu-emacs5.xpm
-lib/X11/twm/images/gnu-emacs6.xpm
-lib/X11/twm/images/gnu-emacs7.xpm
 lib/X11/twm/images/hpterm.xpm
 lib/X11/twm/images/mail0.xpm
 lib/X11/twm/images/mail1.xpm
@@ -81,14 +90,12 @@ lib/X11/twm/images/xrn.goodnews.xpm
 lib/X11/twm/images/xrn.nonews.xpm
 lib/X11/twm/images/xrn.xpm
 lib/X11/twm/images/xterm.xpm
-lib/X11/twm/images/3dcircle.xpm
-lib/X11/twm/images/3ddimple.xpm
-lib/X11/twm/images/3ddot.xpm
-lib/X11/twm/images/3dfeet.xpm
-lib/X11/twm/images/3dleopard.xpm
-lib/X11/twm/images/3dpie.xpm
-lib/X11/twm/images/3dpyramid.xpm
-lib/X11/twm/images/3dslant.xpm
 lib/X11/twm/system.ctwmrc
 ${IMAKE_MAN_DIR}/ctwm.${IMAKE_MANNEWSUFFIX}
+share/examples/ctwm/example.ctwmrc
+share/examples/ctwm/levitte.ctwmrc
+share/examples/ctwm/peterc.ctwmrc
+share/examples/ctwm/system.ctwmrc
+share/examples/ctwm/system.ctwmrc.gnome
+@dirrm share/examples/ctwm
 @dirrm lib/X11/twm/images
diff --git a/wm/ctwm/distinfo b/wm/ctwm/distinfo
index e1ae8612808..fed301dc067 100644
--- a/wm/ctwm/distinfo
+++ b/wm/ctwm/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/10/06 17:28:42 reed Exp $
 
-SHA1 (ctwm-3.6.tar.gz) = 8a8cefd2273c748fd7ceded4c3553e5ca7a994ec
-RMD160 (ctwm-3.6.tar.gz) = 83e6f770e58efb6dea5eacfcce345322ffdd416e
-Size (ctwm-3.6.tar.gz) = 370563 bytes
-SHA1 (ctwm-3.6-xpm.tar.gz) = dfe7331dba041eff70d561b728ca8d7a16f68ca6
-RMD160 (ctwm-3.6-xpm.tar.gz) = 94e1c995bd4059215b061000af2b6d52c3cd0e6b
-Size (ctwm-3.6-xpm.tar.gz) = 246505 bytes
-SHA1 (patch-aa) = f1feb6e3c932018669afac774397dae2f7b06b44
-SHA1 (patch-ab) = e03e595241ae1e1bc412772c6805ee115aad80d0
+SHA1 (ctwm-3.7.tar.gz) = 6140e82ec23499146eaab5bf3bd592f92e95683e
+RMD160 (ctwm-3.7.tar.gz) = 9809df2555b3eb2bf0c46c041df8c1c089b67255
+Size (ctwm-3.7.tar.gz) = 1139461 bytes
 SHA1 (patch-ac) = 99a28b20904207693a4f25aafaaac447dbcdca95
-SHA1 (patch-ad) = d455a80205f07baf3789a5e8b2506e5c42429b85
diff --git a/wm/ctwm/patches/patch-aa b/wm/ctwm/patches/patch-aa
deleted file mode 100644
index 4bf76cf8487..00000000000
--- a/wm/ctwm/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/05/09 14:36:27 grant Exp $
-
---- gram.y.orig	2001-12-12 02:38:52.000000000 +1100
-+++ gram.y
-@@ -419,7 +419,6 @@ stmt		: error
- 		| WINDOW_RING		{ list = &Scr->WindowRingL; }
- 		  win_list
- 		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
--		;
- 		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
- 		                              Scr->WindowRingAll = TRUE;
- 		                          list = &Scr->WindowRingExcludeL; }
-@@ -683,7 +682,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
deleted file mode 100644
index cc2fb4c75c3..00000000000
--- a/wm/ctwm/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$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-ad b/wm/ctwm/patches/patch-ad
deleted file mode 100644
index bbb95780e26..00000000000
--- a/wm/ctwm/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/07/30 05:42:15 simonb Exp $
-
---- util.c.orig	Wed Dec 12 02:38:52 2001
-+++ util.c
-@@ -3959,6 +3959,7 @@ Atom prop;
- 		     ProgramName, XGetAtomName(dpy, prop), w);
- 	    stringptr = NULL;
- 	}
-+	XFree (text_prop.value);
-     } else {
- 	stringptr = NULL;
-     }