update for x11/treewm

[William Yodlowsky <bsd_(_at_)_openbsd_(_dot_)_rutgers_(_dot_)_edu>]

The attached diff brings x11/treewm up to 0.4.2.  The author has 
reorganized the tarball somewhat, so files have moved around.

I also managed to eliminate the one patch it had.

Thanks

-- 
"There is a reason why some options are the default... we who set the
defaults know what we're doing." -- Artur Grabowski

diff -uNr --exclude=CVS treewm.old/Makefile treewm/Makefile
--- treewm.old/Makefile	Thu Mar 21 16:25:56 2002
+++ treewm/Makefile	Thu May  9 21:37:41 2002
@@ -1,9 +1,10 @@
 # $OpenBSD: Makefile,v 1.2 2002/03/21 21:25:56 espie Exp $
 
 COMMENT=		"tree window manager"
-DISTNAME=		treewm-0.3.3
+DISTNAME=		treewm-0.4.2
+DISTFILES=		treewm_0.4.2.tar.gz
 CATEGORIES=		x11
-NEED_VERSION=		1.515
+NEED_VERSION=		1.525
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			http://openbsd.rutgers.edu/
@@ -19,29 +20,28 @@
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WRKDIST=		${WRKDIR}/treewm/treewm
-
 USE_X11=		Yes
 
 NO_REGRESS=		Yes
 
 LDFLAGS+=		-L${X11BASE}/lib
 CPPFLAGS+=		-I${X11BASE}/include 
-CFLAGS+=		-DSHAPE ${CPPFLAGS}
+CFLAGS+=		-DSHAPE ${CPPFLAGS} -DPIXMAPS=\"${PREFIX}/share/treewm/pixmaps/\"
 MAKE_FLAGS+=		CCC='${CXX}' CC='${CC}' CFLAGS='${CFLAGS}' \
 			LDFLAGS='${LDFLAGS}'
+FAKE_FLAGS+=		PREFIX='${DESTDIR}${PREFIX}'
 
-DOCS	= README INSTALL COPYING AUTHORS ChangeLog TODO
+DOCS	= README INSTALL COPYING AUTHORS ChangeLog TODO PROBLEMS README.tiling
 SAMPLES	= default.cfg sample.cfg treewm.kdevprj
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/treewm
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKDIR}/treewm/${f} ${PREFIX}/share/doc/treewm
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/treewm
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/treewm
 .for f in ${SAMPLES}
-	${INSTALL_DATA} ${WRKDIR}/treewm/${f} ${PREFIX}/share/examples/treewm
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/treewm
 .endfor
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS treewm.old/distinfo treewm/distinfo
--- treewm.old/distinfo	Thu Mar 21 15:06:36 2002
+++ treewm/distinfo	Tue May  7 22:03:38 2002
@@ -1,3 +1,3 @@
-MD5 (treewm-0.3.3.tar.gz) = f10a42335f3ff60600cb6fdb8f6bc4d4
-RMD160 (treewm-0.3.3.tar.gz) = d6deb5abdd60a744e756f76943dd33595b8c718b
-SHA1 (treewm-0.3.3.tar.gz) = 4592fe72bcbec25c284a3a667d42998ed790e746
+MD5 (treewm_0.4.2.tar.gz) = d9bf97b88e70a83633d6adad6ed8fc68
+RMD160 (treewm_0.4.2.tar.gz) = 622908979304fa50ecf613bfd24c79ccaee6d0a1
+SHA1 (treewm_0.4.2.tar.gz) = 1fad92479eaf6a403aab91cc7f228484ea9764bb
diff -uNr --exclude=CVS treewm.old/patches/patch-Makefile treewm/patches/patch-Makefile
--- treewm.old/patches/patch-Makefile	Sat Nov 10 13:33:37 2001
+++ treewm/patches/patch-Makefile	Wed Dec 31 19:00:00 1969
@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2001/11/10 18:33:37 heko Exp $
---- Makefile.orig	Sat Aug 25 12:52:00 2001
-+++ Makefile	Sat Nov 10 14:16:32 2001
-@@ -1,3 +1,5 @@
-+PREFIX ?= /usr/X11R6
-+INSTALL_STRIP ?= -s
- LIBS	=  -L/usr/X11R6/lib -lXext -lXpm -lX11 #-static 
- #LIBS	=  -L/usr/X11R6/lib -lXext -lXpm -lX11 -lmpatrol -lbfd -liberty
- 
-@@ -17,15 +19,14 @@ all: treewm
- 
- treewm:	$(OBJECTS)
- 	$(CCC) -o treewm $(OBJECTS) $(LIBS)
--	strip -s treewm
- 
- depend:
- 	makedepend -- $(CFLAGS) -- -o o *.cc
- 
- install: all
--	install -s treewm /usr/X11R6/bin
--	install -d /usr/X11R6/share/treewm/pixmaps
--	install pixmaps/* /usr/X11R6/share/treewm/pixmaps
-+	install ${INSTALL_STRIP} treewm ${PREFIX}/bin
-+	install -d ${PREFIX}/share/treewm/pixmaps
-+	install pixmaps/* ${PREFIX}/share/treewm/pixmaps
- 
- uninstall:
- 	rm /usr/X11R6/bin/treewm
diff -uNr --exclude=CVS treewm.old/pkg/PLIST treewm/pkg/PLIST
--- treewm.old/pkg/PLIST	Sat Nov 10 13:33:37 2001
+++ treewm/pkg/PLIST	Wed May  8 17:28:41 2002
@@ -4,7 +4,9 @@
 share/doc/treewm/COPYING
 share/doc/treewm/ChangeLog
 share/doc/treewm/INSTALL
+share/doc/treewm/PROBLEMS
 share/doc/treewm/README
+share/doc/treewm/README.tiling
 share/doc/treewm/TODO
 share/examples/treewm/default.cfg
 share/examples/treewm/sample.cfg