From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 3 00:40:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2271516A420 for ; Thu, 3 Jan 2008 00:40:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EC64713C4CC for ; Thu, 3 Jan 2008 00:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m030e2QA025910 for ; Thu, 3 Jan 2008 00:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m030e2Rm025898; Thu, 3 Jan 2008 00:40:02 GMT (envelope-from gnats) Resent-Date: Thu, 3 Jan 2008 00:40:02 GMT Resent-Message-Id: <200801030040.m030e2Rm025898@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7906816A41B for ; Thu, 3 Jan 2008 00:35:01 +0000 (UTC) (envelope-from daniel@roe.ch) Received: from hobbes.roe.ch (hobbes.roe.ch [213.144.141.27]) by mx1.freebsd.org (Postfix) with ESMTP id E72C913C4D1 for ; Thu, 3 Jan 2008 00:35:00 +0000 (UTC) (envelope-from daniel@roe.ch) Received: from roe by hobbes.roe.ch (envelope-from ) with LOCAL id 1JADtD-0007dz-00 for FreeBSD-gnats-submit@freebsd.org; Thu, 03 Jan 2008 01:24:51 +0100 Received: from calvin.roe.ch ([213.144.141.26]) by hobbes.roe.ch (envelope-from ) with ESMTP (TLSv1:AES256-SHA:256) id 1JADjY-0007cO-00 for daniel@roe.ch; Thu, 03 Jan 2008 01:14:52 +0100 Received: from marvin.roe ([10.23.42.11]) by calvin.roe.ch (envelope-from ) with ESMTPS (TLSv1:AES256-SHA:256) id 1JADiY-0002L2-An ; Thu, 03 Jan 2008 01:13:50 +0100 Received: from marvin.roe (localhost [127.0.0.1]) by marvin.roe (8.13.8/8.13.8) with ESMTP id m030DBhO067426; Thu, 3 Jan 2008 01:13:11 +0100 (CET) (envelope-from roe@marvin.roe) Received: (from roe@localhost) by marvin.roe (8.13.8/8.13.8/Submit) id m030DBh2067425; Thu, 3 Jan 2008 01:13:11 +0100 (CET) (envelope-from roe) Message-Id: <200801030013.m030DBh2067425@marvin.roe> Date: Thu, 3 Jan 2008 01:13:11 +0100 (CET) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: danfe@FreeBSD.org, infofarmer@FreeBSD.org, daniel@roe.ch Subject: ports/119283: [patch] Update x11-wm/wmii to 3.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2008 00:40:03 -0000 >Number: 119283 >Category: ports >Synopsis: [patch] Update x11-wm/wmii to 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: Thu Jan 03 00:40:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 6.2-RELEASE-p9 i386 >Organization: >Environment: System: FreeBSD marvin.roe 6.2-RELEASE-p9 FreeBSD 6.2-RELEASE-p9 #0: Thu Nov 29 04:07:33 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Update wmii to 3.6. Requires the devel/libixp update to 0.4. CENKES MASTER_SITES need to be updated with the tarball as well. >How-To-Repeat: >Fix: --- patch-wmii-3.6.diff begins here --- diff -ruN wmii.orig/Makefile wmii/Makefile --- wmii.orig/Makefile Fri Jun 8 19:47:08 2007 +++ wmii/Makefile Wed Jan 2 23:26:10 2008 @@ -6,33 +6,43 @@ # PORTNAME= wmii -DISTVERSION= 3.5.1 +DISTVERSION= 3.6 CATEGORIES= x11-wm MASTER_SITES= http://www.suckless.org/download/ CENKES MAINTAINER= danfe@FreeBSD.org COMMENT= A dynamic, minimalist window manager for X11 -LIB_DEPENDS= ixp.0:${PORTSDIR}/devel/libixp +LIB_DEPENDS= ixp.1:${PORTSDIR}/devel/libixp RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu \ ${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base -CONFLICTS= wmii-3.5.[2-9]* +CONFLICTS= wmii-3.5.* USE_XLIB= yes +USE_ICONV= yes -MAKE_ARGS= PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \ - X11INC="${X11BASE}/include" CC="${CC}" \ - MANPREFIX="${MANPREFIX}/man" +CFLAGS+= -I${LOCALBASE}/include -I${WRKSRC}/include -DIXPlint +LDFLAGS+= -L${LOCALBASE}/lib -L${WRKSRC}/lib +MAKE_ARGS= PREFIX="${PREFIX}" LIBX11="-L${X11BASE}/lib -lX11" \ + INCX11="-I${X11BASE}/include" LIBIXP="-lixp" STATIC="" \ + CC="${CC} -c" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + MAN="${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}|' \ + ${REINPLACE_CMD} -E 's|-Os|${CFLAGS}|g; \ + s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|g' \ ${WRKSRC}/config.mk - # Catch up with recent libixp - ${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \ - ${WRKSRC}/fs.c + ${REINPLACE_CMD} -E 's|\$${LINK} \$$@|$${LINK} $$@ -lfmt -lutf|g' \ + ${WRKSRC}/cmd/Makefile + ${REINPLACE_CMD} -E 's|^(LIB =.*)$$|\1 -lm -lXext -liconv -lregexp9 -lbio -lfmt -lutf|' \ + ${WRKSRC}/cmd/wmii/Makefile + ${REINPLACE_CMD} -E 's|VERSION|"${DISTVERSION}"|g' \ + ${WRKSRC}/cmd/*.c ${WRKSRC}/cmd/wmii/main.c +# # Catch up with recent libixp +# ${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \ +# ${WRKSRC}/cmd/wmii/fs.c .include diff -ruN wmii.orig/distinfo wmii/distinfo --- wmii.orig/distinfo Tue Jun 5 22:15:32 2007 +++ wmii/distinfo Wed Jan 2 16:44:37 2008 @@ -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 -ruN wmii.orig/pkg-plist wmii/pkg-plist --- wmii.orig/pkg-plist Tue Jun 5 22:15:32 2007 +++ wmii/pkg-plist Wed Jan 2 23:29:39 2008 @@ -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 +etc/wmii-3.5/rc.wmii etc/wmii-3.5/wmiirc +etc/wmii-3.5/welcome @dirrm etc/wmii-3.5 --- patch-wmii-3.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: