From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 18 18:10:14 2010 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 61B011065698 for ; Mon, 18 Oct 2010 18:10:14 +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 3F5E28FC21 for ; Mon, 18 Oct 2010 18:10:14 +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 o9IIAEdd070334 for ; Mon, 18 Oct 2010 18:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o9IIAEfm070330; Mon, 18 Oct 2010 18:10:14 GMT (envelope-from gnats) Resent-Date: Mon, 18 Oct 2010 18:10:14 GMT Resent-Message-Id: <201010181810.o9IIAEfm070330@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5567B1065672 for ; Mon, 18 Oct 2010 18:03:25 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id DC0EB8FC16 for ; Mon, 18 Oct 2010 18:03:24 +0000 (UTC) Received: from localhost.localdomain (ZT047146.ppp.dion.ne.jp [59.128.47.146]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 4AA9D50036 for ; Tue, 19 Oct 2010 03:03:20 +0900 (JST) Message-Id: <20101019030108.ea6b4e37.tkato432@yahoo.com> Date: Tue, 19 Oct 2010 03:01:08 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/151560: Update port: x11-wm/pawm to 2.3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2010 18:10:14 -0000 >Number: 151560 >Category: ports >Synopsis: Update port: x11-wm/pawm to 2.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 18 18:10:13 UTC 2010 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.3-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 2.3.0 New file: files/patch-src__pawm.c Remove file: files/patch-src__button.c files/patch-src__pafont.c files/patch-src__paicon.c files/patch-src__pawindow.cc files/patch-src__wm.c >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/pawm/Makefile x11-wm/pawm/Makefile --- /usr/ports/x11-wm/pawm/Makefile 2008-04-20 10:22:29.000000000 +0900 +++ x11-wm/pawm/Makefile 2010-09-22 01:32:35.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= pawm -PORTVERSION= 2.2.9 -PORTREVISION= 2 +PORTVERSION= 2.3.0 CATEGORIES= x11-wm MASTER_SITES= http://www.pleyades.net/pawm/files/ @@ -15,49 +14,30 @@ COMMENT= The Puto Amo Window Manager USE_BZIP2= yes -USE_XORG= x11 xrandr xrender xpm -USE_GMAKE= yes -MAKEFILE= Makefile.in -MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o" - -CFLAGS+= -I. -I${LOCALBASE}/include -DNDEBUG -LDFLAGS= -lm -L${LOCALBASE}/lib -lXpm - -.include - -LDFLAGS+= -lXrandr -.if defined(WITHOUT_XFT) -CFLAGS+= -DDISABLE_XFT -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -CFLAGS+= `pkg-config --cflags xft` -LDFLAGS+= `pkg-config --libs xft` -.endif +USE_XORG= x11 xft xrandr xrender xpm +USE_CMAKE= yes +CMAKE_ARGS= -DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \ + -DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib" .if defined(WITH_SN) LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification CFLAGS+= -DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \ - `pkg-config --cflags libstartup-notification-1.0` -LDFLAGS+= `pkg-config --libs libstartup-notification-1.0` + `pkg-config --cflags --libs libstartup-notification-1.0` .endif -do-configure: - @${ECHO_CMD} -n > ${WRKSRC}/config.h - @${ECHO_CMD} '#define PROJECT "${PORTNAME}"' >> ${WRKSRC}/config.h - @${ECHO_CMD} '#define VERSION "${PORTVERSION}"' >> ${WRKSRC}/config.h - @${ECHO_CMD} '#define CONFDIR "${PREFIX}/etc"' >> ${WRKSRC}/config.h - @${ECHO_CMD} '#define DATADIR "${DATADIR}"' >> ${WRKSRC}/config.h - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/pawm ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc - @${MKDIR} ${DATADIR}/icons - ${INSTALL_DATA} ${WRKSRC}/data/icons/*.xpm ${DATADIR}/icons +post-patch: + @${REINPLACE_CMD} -e \ + '/"\/etc"/s|^|#| ; \ + /"-O2"/s|^|#| ; \ + /LINK_DIRECTORIES/s|\.|| ; \ + /INSTALL/s| /etc| etc|' ${WRKSRC}/CMakeLists.txt + +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for ii in AUTHORS Changelog GPL INSTALL README +.for ii in AUTHORS Changelog.old GPL INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} .endfor .endif -.include +.include diff -urN /usr/ports/x11-wm/pawm/distinfo x11-wm/pawm/distinfo --- /usr/ports/x11-wm/pawm/distinfo 2006-09-12 13:33:24.000000000 +0900 +++ x11-wm/pawm/distinfo 2010-05-19 01:11:57.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (pawm-2.2.9.tar.bz2) = 0d1a649ec5bc0bf70a50dddeadb813a2 -SHA256 (pawm-2.2.9.tar.bz2) = af6cfb77a008cc5face1a9fd8c17b2942a8d530d811d36be3d5289062693d93d -SIZE (pawm-2.2.9.tar.bz2) = 133437 +MD5 (pawm-2.3.0.tar.bz2) = 1f4e7da972d8c328bb72137797640b05 +SHA256 (pawm-2.3.0.tar.bz2) = 5de0706ecd2f6251a3672305c8d32a6fd0e0a3176191d806f47926dae28945f2 +SIZE (pawm-2.3.0.tar.bz2) = 115648 diff -urN /usr/ports/x11-wm/pawm/files/patch-src__button.c x11-wm/pawm/files/patch-src__button.c --- /usr/ports/x11-wm/pawm/files/patch-src__button.c 2006-07-20 04:42:39.000000000 +0900 +++ x11-wm/pawm/files/patch-src__button.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,22 +0,0 @@ ---- src/button.c.orig Tue Jul 4 03:19:55 2006 -+++ src/button.c Mon Jul 17 03:28:20 2006 -@@ -247,6 +247,9 @@ - XSetWindowAttributes attributes; - Button button=NULL; - -+ XSetWindowAttributes wattr; -+ unsigned long wmask; -+ - ASSERT(parent!=None); - ASSERT(nface!=None); - ASSERT(hface!=None); -@@ -269,9 +272,6 @@ - - - /** Window creation and basic setup **/ -- -- XSetWindowAttributes wattr; -- unsigned long wmask; - - wattr.border_pixel=0; - wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone); diff -urN /usr/ports/x11-wm/pawm/files/patch-src__paicon.c x11-wm/pawm/files/patch-src__paicon.c --- /usr/ports/x11-wm/pawm/files/patch-src__paicon.c 2006-07-20 04:42:39.000000000 +0900 +++ x11-wm/pawm/files/patch-src__paicon.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,22 +0,0 @@ ---- src/paicon.c.orig Tue Jul 4 03:19:55 2006 -+++ src/paicon.c Mon Jul 17 03:27:59 2006 -@@ -263,6 +263,9 @@ - { - PAIcon icon=NULL; - -+ XSetWindowAttributes wattr; -+ unsigned long wmask; -+ - ASSERT(image); - - icon=malloc(PAIconBytes); -@@ -273,9 +276,6 @@ - #endif - - icon->image=image; -- -- XSetWindowAttributes wattr; -- unsigned long wmask; - - wattr.border_pixel=0; - wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone); diff -urN /usr/ports/x11-wm/pawm/files/patch-src__pawindow.cc x11-wm/pawm/files/patch-src__pawindow.cc --- /usr/ports/x11-wm/pawm/files/patch-src__pawindow.cc 2006-03-16 19:32:54.000000000 +0900 +++ x11-wm/pawm/files/patch-src__pawindow.cc 1970-01-01 09:00:00.000000000 +0900 @@ -1,32 +0,0 @@ ---- src/pawindow.c.orig Sun Mar 5 10:14:06 2006 -+++ src/pawindow.c Wed Mar 8 13:29:48 2006 -@@ -787,10 +787,12 @@ - - static void canvas_KeyPress(XKeyPressedEvent *event, PAWindow pawindow) - { -+ XEvent *e; -+ - ASSERT(event); - ASSERT(pawindow); - -- XEvent *e = (XEvent *) event; -+ e = (XEvent *) event; - - /* Replay the event if it isn't a pawm keybinding */ - if (!keyboard_binding_key(event)) { -@@ -1633,6 +1635,7 @@ - int num_rows=1; - int firsticonx, lasticonx, iconx, icony; - bool forward= (strcmp((char *)data, "forward")==0 ? 1 : 0); -+ KeySym testkeysym; KeyCode testkeycode; - - - /* TODO: Support both rotate method: w/wout popup window*/ -@@ -1665,7 +1668,6 @@ - None, CurrentTime); - current_pw=tab_window_draw_all(num_windows, num_rows); - -- KeySym testkeysym; KeyCode testkeycode; - testkeysym=XStringToKeysym("Tab"); - testkeycode=XKeysymToKeycode(display, testkeysym); - XGrabKey(display, testkeycode, Mod1Mask, ROOT, False, GrabModeAsync, GrabModeAsync); diff -urN /usr/ports/x11-wm/pawm/files/patch-src__pawm.c x11-wm/pawm/files/patch-src__pawm.c --- /usr/ports/x11-wm/pawm/files/patch-src__pawm.c 1970-01-01 09:00:00.000000000 +0900 +++ x11-wm/pawm/files/patch-src__pawm.c 2010-09-22 01:28:01.000000000 +0900 @@ -0,0 +1,11 @@ +--- src/pawm.c.orig 2010-05-03 11:36:18.000000000 +0900 ++++ src/pawm.c 2010-09-22 01:27:38.000000000 +0900 +@@ -114,7 +114,7 @@ + + int main (int argc, char *argv[]) + { +- struct sigaction sa_term, sa_chld; ++ struct sigaction sa_term, sa_chld, sa_alrm; + + /* Command line parameters */ + if (argc > 1) { diff -urN /usr/ports/x11-wm/pawm/files/patch-src__wm.c x11-wm/pawm/files/patch-src__wm.c --- /usr/ports/x11-wm/pawm/files/patch-src__wm.c 2006-03-16 19:32:54.000000000 +0900 +++ x11-wm/pawm/files/patch-src__wm.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,20 +0,0 @@ ---- src/wm.c.orig Fri Feb 24 05:12:18 2006 -+++ src/wm.c Sun Feb 26 03:10:37 2006 -@@ -355,6 +355,9 @@ - CARD32 tmpdata[20]; - unsigned long length; - int (*olderrorhandler) (Display *, XErrorEvent *); -+#ifndef DISABLE_XRANDR -+ int major, minor,errbase; -+#endif - - SAY ("Initializing window manager..."); - -@@ -373,7 +376,6 @@ - - #ifndef DISABLE_XRANDR - /* Check for XRandr extension */ -- int major, minor,errbase; - XRRQueryVersion(display, &major, &minor); - XRRQueryExtension(display, &(class.randr_base), &errbase); - SAY("Using XRandr %d.%d extension. Event base: %d Error base %d", major, minor, class.randr_base, errbase); diff -urN /usr/ports/x11-wm/pawm/pkg-plist x11-wm/pawm/pkg-plist --- /usr/ports/x11-wm/pawm/pkg-plist 2006-03-16 19:32:54.000000000 +0900 +++ x11-wm/pawm/pkg-plist 2010-05-19 01:35:36.000000000 +0900 @@ -1,10 +1,11 @@ bin/pawm etc/pawm.conf %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/Changelog +%%PORTDOCS%%%%DOCSDIR%%/Changelog.old %%PORTDOCS%%%%DOCSDIR%%/GPL %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO %%DATADIR%%/icons/close_d.xpm %%DATADIR%%/icons/close_d_256.xpm %%DATADIR%%/icons/close_h.xpm >Release-Note: >Audit-Trail: >Unformatted: