ports/120157: [PATCH] update wmii to version 3.6

[Toni Schmidbauer]

>Number:         120157
>Category:       ports
>Synopsis:       [PATCH] update wmii to version 3.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 30 15:40:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Toni Schmidbauer
>Release:        FreeBSD 6.3-RELEASE i386
>Organization:
stderror.at
>Environment:
System: FreeBSD murus 6.3-RELEASE FreeBSD 6.3-RELEASE #0: Sun Jan 20 12:44:24 CET 2008 root at murus:/usr/obj/usr/src/sys/MURUS i386



>Description:
	attached patch upgrades wmii to version 3.6. libixp 0.4 is a requirement, see the patch i've sent before
>How-To-Repeat:

>Fix:

diff -Nur wmii.orig/Makefile wmii/Makefile
--- wmii.orig/Makefile	2008-01-09 14:27:52.000000000 +0100
+++ wmii/Makefile	2008-01-30 15:59:24.000000000 +0100
@@ -6,33 +6,26 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ CENKES
 
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	A dynamic, minimalist window manager for X11
 
-LIB_DEPENDS=	ixp.0:${PORTSDIR}/devel/libixp
 RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu \
 		${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libixp.a:${PORTSDIR}/devel/libixp
+
 CONFLICTS=	wmii-3.5.[2-9]*
 
 USE_XLIB=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
-		X11INC="${X11BASE}/include" CC="${CC}" \
-		MANPREFIX="${MANPREFIX}/man"
-
-MAN1=		wmii.1 wmiir.1 wmiiwm.1
+MAN1=		wmii.1 wmiiloop.1 wmiir.1
 
 post-patch: .SILENT
-	${REINPLACE_CMD} -E 's|-Os|${CFLAGS}|; \
-		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
-		${WRKSRC}/config.mk
-	# Catch up with recent libixp
-	${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
-		${WRKSRC}/fs.c
+	@${REINPLACE_CMD} -e 's|^\(LIBICONV = \).*|\1-liconv|' ${WRKSRC}/config.mk
+	@${REINPLACE_CMD} -e 's|^\(MAN = \).*|\1$$\{PREFIX\}/man|' ${WRKSRC}/config.mk
 
 .include <bsd.port.mk>
diff -Nur wmii.orig/distinfo wmii/distinfo
--- wmii.orig/distinfo	2008-01-09 14:27:52.000000000 +0100
+++ wmii/distinfo	2008-01-30 14:33:22.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (wmii-3.5.1.tar.gz) = 26705a7b59945b7d269921b45ac15cdf
-SHA256 (wmii-3.5.1.tar.gz) = 6ce10c0805c2ff05952f7566b9af134ae76fdeb518dc7d9c413f0dd58635e6d1
-SIZE (wmii-3.5.1.tar.gz) = 41658
+MD5 (wmii-3.6.tar.gz) = 9d17a09871fada998b4d989d9318bbf5
+SHA256 (wmii-3.6.tar.gz) = 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216
+SIZE (wmii-3.6.tar.gz) = 208249
diff -Nur wmii.orig/pkg-plist wmii/pkg-plist
--- wmii.orig/pkg-plist	2008-01-09 14:27:52.000000000 +0100
+++ wmii/pkg-plist	2008-01-30 15:59:31.000000000 +0100
@@ -1,8 +1,10 @@
-bin/wmii
+bin/wmii9menu
+bin/wmii9rc
+bin/wmiiloop
 bin/wmiir
-bin/wmiiwm
-etc/wmii-3.5/quit
-etc/wmii-3.5/status
-etc/wmii-3.5/welcome
+bin/wmiistartrc
+bin/wmii
+etc/wmii-3.5/rc.wmii
 etc/wmii-3.5/wmiirc
+etc/wmii-3.5/welcome
 @dirrm etc/wmii-3.5
>Release-Note:
>Audit-Trail:
>Unformatted: