Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jul 2011 16:13:01 GMT
From:      Jakub Lach <jakub_lach@mailplus.pl>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/159142: [maintainer-update] x11-wm/mcwm 20110412 to 20110721
Message-ID:  <201107231613.p6NGD1sd094861@red.freebsd.org>
Resent-Message-ID: <201107231620.p6NGKANR059623@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         159142
>Category:       ports
>Synopsis:       [maintainer-update] x11-wm/mcwm 20110412 to 20110721
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 23 16:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jakub Lach
>Release:        8-STABLE
>Organization:
-
>Environment:
FreeBSD 8.2-STABLE #0 r224267M amd64
>Description:
- Multihead support via xrandr
- see NEWS in PORTDOCS 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-07-23 16:53:24.000000000 +0200
+++ /usr/ports/x11-wm/mcwm/Makefile	2011-07-23 17:43:40.000000000 +0200
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	mcwm
-PORTVERSION=	20110412
+PORTVERSION=	20110721
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://hack.org/mc/hacks/mcwm/
 
 MAINTAINER=	jakub_lach@mailplus.pl
 COMMENT=	A small window manager inspired by CTWM, evilwm, and tinywm
 
+LICENSE=        ISCL
+LICENSE_FILE=   ${WRKSRC}/LICENSE
+
 BUILD_DEPENDS=	xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
 RUN_DEPENDS=	xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
 
 MAKE_JOBS_SAFE=	yes
 
-LICENSE=	ISCL
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USE_XORG=	x11
+USE_XORG=	x11 xrandr
 USE_BZIP2=	yes
 
 MAN1=		mcwm.1
diff -rupN /usr/ports/x11-wm/mcwm.orig/distinfo /usr/ports/x11-wm/mcwm/distinfo
--- /usr/ports/x11-wm/mcwm.orig/distinfo	2011-07-23 16:53:24.000000000 +0200
+++ /usr/ports/x11-wm/mcwm/distinfo	2011-07-23 17:45:50.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (mcwm-20110412.tar.bz2) = 9784354061b87521d1fe252972959429fadf58ba6507a28b01d9e4fc5d9d3b41
-SIZE (mcwm-20110412.tar.bz2) = 24570
+SHA256 (mcwm-20110721.tar.bz2) = 9ca444a9826d197fafe4da06c869eb8e0c334a641ed1da049855cde9a6451f8a
+SIZE (mcwm-20110721.tar.bz2) = 26805
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-07-23 16:53:24.000000000 +0200
+++ /usr/ports/x11-wm/mcwm/files/patch-Makefile	2011-07-23 17:49:18.000000000 +0200
@@ -1,14 +1,16 @@
---- Makefile.orig	2011-04-12 11:25:25.000000000 +0200
-+++ Makefile	2011-04-12 11:34:56.000000000 +0200
-@@ -3,12 +3,11 @@
+--- Makefile.orig	2011-07-23 09:36:24.000000000 +0200
++++ Makefile	2011-07-23 17:19:30.000000000 +0200
+@@ -3,13 +3,12 @@ DIST=mcwm-$(VERSION)
  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 -O2 -I/usr/local/include 
-+LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom 
+-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
+-	-lxcb-atom #-ldmalloc
++CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include 
++LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
++	-lxcb-atom 
  
  RM=/bin/rm
 -PREFIX=/usr/local
@@ -16,7 +18,7 @@
  
  TARGETS=mcwm
  OBJS=mcwm.o list.o
-@@ -27,12 +26,13 @@
+@@ -28,13 +27,14 @@ mcwm.o: mcwm.c events.h list.h config.h 
  list.o: list.c list.h Makefile
  
  install: $(TARGETS)
@@ -30,7 +32,9 @@
  deinstall:
 -	$(RM) $(PREFIX)/bin/mcwm
 -	$(RM) $(PREFIX)/man/man1/mcwm.1
+-
 +	$(RM) ${DESTDIR}$(PREFIX)/bin/mcwm
- 
++	
  $(DIST).tar.bz2:
  	mkdir $(DIST)
+ 	cp $(DISTFILES) $(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-07-23 16:53:24.000000000 +0200
+++ /usr/ports/x11-wm/mcwm/pkg-message	2011-07-23 17:50:20.000000000 +0200
@@ -2,8 +2,8 @@
 
 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 
+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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107231613.p6NGD1sd094861>