[Midnightbsd-cvs] mports: x11-wm/wmii: Update to 3.6.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 3.6.  This might fix the failures on magus.

Modified Files:
--------------
    mports/x11-wm/wmii:
        Makefile (r1.9 -> r1.10)
        distinfo (r1.5 -> r1.6)
        pkg-plist (r1.4 -> r1.5)

Removed Files:
-------------
    mports/x11-wm/wmii/files:
        patch-config.mk

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-wm/wmii/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-wm/wmii/pkg-plist -L x11-wm/wmii/pkg-plist -u -r1.4 -r1.5
--- x11-wm/wmii/pkg-plist
+++ x11-wm/wmii/pkg-plist
@@ -1,10 +1,10 @@
+bin/wmii
 bin/wmii9menu
 bin/wmii9rc
 bin/wmiiloop
 bin/wmiir
 bin/wmiistartrc
-bin/wmii
 etc/wmii-3.5/rc.wmii
-etc/wmii-3.5/wmiirc
 etc/wmii-3.5/welcome
+etc/wmii-3.5/wmiirc
 @dirrm etc/wmii-3.5
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-wm/wmii/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L x11-wm/wmii/Makefile -L x11-wm/wmii/Makefile -u -r1.9 -r1.10
--- x11-wm/wmii/Makefile
+++ x11-wm/wmii/Makefile
@@ -7,21 +7,39 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	20070516
-PORTREVISION=	1
+DISTVERSION=	3.6
+PORTREVISION=	0
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.suckless.org/snaps/
-DISTFILES=	wmii+ixp-20070516.tgz
-WRKSRC=		${WRKDIR}/wmii+ixp-20070516
+MASTER_SITES=	http://www.suckless.org/download/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A dynamic, minimalist window manager for X11
 LICENSE=	x11
 
-USE_XORG=	xext
+USE_ICONV=	yes
+USE_XORG=	x11 xextproto xt xext
 
-BUILD_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
+MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
+		INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib" \
+		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
+		LIBICONV="-liconv" MAN="${FAKE_DESTDIR}${MANPREFIX}/man"
 
-MAN1=		wmii.1 wmiiloop.1 wmiir.1 wmiiwm.1
+FAKE_MAKEARGS+=	${MAKE_ARGS} PREFIX="${FAKE_DESTDIR}${PREFIX}"
+
+LIB_DEPENDS=	ixp.1:${PORTSDIR}/devel/libixp
+RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu \
+		${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
+BUILD_DEPENDS=	${RUN_DEPENDS}
+
+MAN1=		wmii.1 wmiiloop.1 wmiir.1
+
+post-patch: .SILENT
+	${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \
+		${WRKSRC}/cmd/Makefile
+# Strip debug build options
+	${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk
+# Make actual compile/link command appear in the build log
+	${REINPLACE_CMD} -e 's|^COMPILE=|& noisycc=yes | ; \
+		s|^LINK=|& noisycc=yes |' ${WRKSRC}/mk/hdr.mk
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-wm/wmii/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L x11-wm/wmii/distinfo -L x11-wm/wmii/distinfo -u -r1.5 -r1.6
--- x11-wm/wmii/distinfo
+++ x11-wm/wmii/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmii+ixp-20070516.tgz) = 2d0bd73870a4d3cd75c4454e04dbd3db
-SHA256 (wmii+ixp-20070516.tgz) = 8aec40731c7bf7827b5733af1da7787d02734ba56bbfe4598e9cbfe224469104
-SIZE (wmii+ixp-20070516.tgz) = 84114
+MD5 (wmii-3.6.tar.gz) = 9d17a09871fada998b4d989d9318bbf5
+SHA256 (wmii-3.6.tar.gz) = 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216
+SIZE (wmii-3.6.tar.gz) = 208249
--- x11-wm/wmii/files/patch-config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
---- config.mk.orig	Thu Mar 29 18:51:44 2007
-+++ config.mk	Sat Apr  7 11:39:56 2007
-@@ -1,15 +1,15 @@
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- BIN = ${PREFIX}/bin
--MAN = ${PREFIX}/share/man
-+MAN = ${PREFIX}/man
- ETC = ${PREFIX}/etc
- LIBDIR = ${PREFIX}/lib
- INCLUDE = ${PREFIX}/include
- 
- # Includes and libs
--INCS = -I. -I${ROOT}/include -I${INCLUDE} -I/usr/include
-+INCS = -I. -I${ROOT}/include -I${INCLUDE} -I/usr/include -I${LOCALBASE}/include
- LIBS = -L/usr/lib -lc
- 
- # Flags
-@@ -28,8 +28,8 @@
- AWKPATH = /usr/bin/awk
- P9PATHS = /usr/local/plan9 /usr/local/9 /opt/plan9 /opt/9 /usr/plan9 /usr/9
- 
--INCX11 = -I/usr/X11R6/include
--LIBX11 = -L/usr/X11R6/lib -lX11
-+INCX11 = -I${X11BASE}/include
-+LIBX11 = -L${X11BASE}/lib -lX11
- LIBIXP = ${ROOT}/libixp/libixp.a
- 
- # Solaris