From owner-freebsd-bugs@FreeBSD.ORG Tue Apr 12 10:20:09 2011 Return-Path: Delivered-To: freebsd-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 8BF681065670 for ; Tue, 12 Apr 2011 10:20:09 +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 6BA9B8FC0C for ; Tue, 12 Apr 2011 10:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p3CAK9Dw027796 for ; Tue, 12 Apr 2011 10:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3CAK93I027795; Tue, 12 Apr 2011 10:20:09 GMT (envelope-from gnats) Resent-Date: Tue, 12 Apr 2011 10:20:09 GMT Resent-Message-Id: <201104121020.p3CAK93I027795@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jakub Lach Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93D76106566B for ; Tue, 12 Apr 2011 10:11:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 7B7388FC14 for ; Tue, 12 Apr 2011 10:11:27 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p3CABQ7L039764 for ; Tue, 12 Apr 2011 10:11:26 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p3CABQx5039763; Tue, 12 Apr 2011 10:11:26 GMT (envelope-from nobody) Message-Id: <201104121011.p3CABQx5039763@red.freebsd.org> Date: Tue, 12 Apr 2011 10:11:26 GMT From: Jakub Lach To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/156349: [maintainer update] x11-wm/mcwm to 20110412 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2011 10:20:09 -0000 >Number: 156349 >Category: misc >Synopsis: [maintainer update] x11-wm/mcwm to 20110412 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Apr 12 10:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jakub Lach >Release: 8-STABLE amd64 >Organization: - >Environment: >Description: Update to 20110412. Now you can use flags for basic configuration. See NEWS file in ${DOCSDIR} for full changelog. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -rupN /usr/ports/x11-wm/mcwm.orig/Makefile /usr/ports/x11-wm/mcwm/Makefile --- /usr/ports/x11-wm/mcwm.orig/Makefile 2011-04-12 10:33:21.000000000 +0200 +++ /usr/ports/x11-wm/mcwm/Makefile 2011-04-12 11:14:38.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= mcwm -PORTVERSION= 20110308 +PORTVERSION= 20110412 CATEGORIES= x11-wm MASTER_SITES= http://hack.org/mc/hacks/mcwm/ @@ -26,7 +26,7 @@ USE_BZIP2= yes MAN1= mcwm.1 PLIST_FILES= bin/mcwm -PORTDOCS= LICENSE README +PORTDOCS= LICENSE README NEWS pre-everything:: @${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:" @@ -44,6 +44,7 @@ post-install: @${MKDIR} ${DOCSDIR} @${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR} @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} + @${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} diff -rupN /usr/ports/x11-wm/mcwm.orig/distinfo /usr/ports/x11-wm/mcwm/distinfo --- /usr/ports/x11-wm/mcwm.orig/distinfo 2011-04-12 10:33:21.000000000 +0200 +++ /usr/ports/x11-wm/mcwm/distinfo 2011-04-12 10:34:32.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (mcwm-20110308.tar.bz2) = 871d78eccfdbe00af17551436a886cc352874839c2adae963e83b25fcd770406 -SIZE (mcwm-20110308.tar.bz2) = 23392 +SHA256 (mcwm-20110412.tar.bz2) = 9784354061b87521d1fe252972959429fadf58ba6507a28b01d9e4fc5d9d3b41 +SIZE (mcwm-20110412.tar.bz2) = 24570 diff -rupN /usr/ports/x11-wm/mcwm.orig/files/patch-Makefile /usr/ports/x11-wm/mcwm/files/patch-Makefile --- /usr/ports/x11-wm/mcwm.orig/files/patch-Makefile 2011-04-12 10:33:21.000000000 +0200 +++ /usr/ports/x11-wm/mcwm/files/patch-Makefile 2011-04-12 11:53:50.000000000 +0200 @@ -1,29 +1,36 @@ ---- Makefile.orig 2011-03-16 18:19:22.000000000 +0100 -+++ Makefile 2011-03-16 18:23:04.000000000 +0100 -@@ -3,12 +3,12 @@ DIST=mcwm-$(VERSION) +--- Makefile.orig 2011-04-12 11:25:25.000000000 +0200 ++++ Makefile 2011-04-12 11:34:56.000000000 +0200 +@@ -3,12 +3,11 @@ SRC=mcwm.c list.c config.h events.h list.h DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man $(SRC) -CC=gcc -CFLAGS=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include #-DDEBUG #-DDMALLOC --LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom # -ldmalloc -+CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include +-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom #-ldmalloc ++CFLAGS+=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include +LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom RM=/bin/rm -PREFIX=/usr/local +PREFIX?=/usr/local -+MANPREFIX = ${PREFIX}/man TARGETS=mcwm OBJS=mcwm.o list.o -@@ -28,6 +28,9 @@ list.o: list.c list.h Makefile +@@ -27,12 +26,13 @@ + list.o: list.c list.h Makefile install: $(TARGETS) - install -m 755 mcwm $(PREFIX)/bin -+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 -+ @mkdir -p ${DESTDIR}${MANPREFIX}/man1 -+ @sed "s/VERSION/${VERSION}/g" < mcwm.man > ${DESTDIR}${MANPREFIX}/man1/mcwm.1 +- install -m 755 mcwm $(PREFIX)/bin +- install -m 644 mcwm.man $(PREFIX)/man/man1/mcwm.1 ++ install -m 755 mcwm ${DESTDIR}$(PREFIX)/bin ++ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1 ++ @mkdir -p ${DESTDIR}${MANPREFIX}/man/man1 ++ install -m 644 mcwm.man ${DESTDIR}$(MANPREFIX)/man/man1/mcwm.1 deinstall: - $(RM) $(PREFIX)/bin/mcwm +- $(RM) $(PREFIX)/bin/mcwm +- $(RM) $(PREFIX)/man/man1/mcwm.1 ++ $(RM) ${DESTDIR}$(PREFIX)/bin/mcwm + + $(DIST).tar.bz2: + mkdir $(DIST) diff -rupN /usr/ports/x11-wm/mcwm.orig/pkg-message /usr/ports/x11-wm/mcwm/pkg-message --- /usr/ports/x11-wm/mcwm.orig/pkg-message 2011-04-12 10:33:21.000000000 +0200 +++ /usr/ports/x11-wm/mcwm/pkg-message 2011-04-12 11:05:32.000000000 +0200 @@ -1,7 +1,11 @@ -*************************************************** +**************************************************** -With default config.h mcwm uses urxvt as terminal, -recompile with MCWM_CONF=/path/to/mcwm/config.h for -custom configuration. +With default config.h mcwm uses urxvt as terminal. -*************************************************** +Since 20110412 you can define your own custom config +with MCWM_CONF=/path/to/mcwm/config.h or you can use +flags for basic configuration. + +See man mcwm(1) for details. + +**************************************************** >Release-Note: >Audit-Trail: >Unformatted: