From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 25 18:20:24 2012 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 AEDB0106567C for ; Tue, 25 Sep 2012 18:20:24 +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 8ABB78FC15 for ; Tue, 25 Sep 2012 18:20:24 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8PIKOEi035962 for ; Tue, 25 Sep 2012 18:20:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8PIKOlL035957; Tue, 25 Sep 2012 18:20:24 GMT (envelope-from gnats) Resent-Date: Tue, 25 Sep 2012 18:20:24 GMT Resent-Message-Id: <201209251820.q8PIKOlL035957@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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C80BC1065670 for ; Tue, 25 Sep 2012 18:12:10 +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 6EDD08FC19 for ; Tue, 25 Sep 2012 18:12:10 +0000 (UTC) Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 897DE50036 for ; Wed, 26 Sep 2012 03:12:06 +0900 (JST) Message-Id: <20120926022723.44f4c89ba1dd5bbb7051d055@yahoo.com> Date: Wed, 26 Sep 2012 02:27:23 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/172073: x11-wm/treewm: Support CFLAGS properly 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: Tue, 25 Sep 2012 18:20:24 -0000 >Number: 172073 >Category: ports >Synopsis: x11-wm/treewm: Support CFLAGS properly >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: Tue Sep 25 18:20:24 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Add LICENSE - Support CFLAGS properly - Support SUB_FILES - Support PORTEXAMPLES - Add MAKE_JOBS_SAFE New file: files/patch-xprop__xprop.c files/pkg-message.in Remove file: pkg-message >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/treewm/Makefile x11-wm/treewm/Makefile --- /usr/ports/x11-wm/treewm/Makefile 2008-04-20 02:56:00.000000000 +0900 +++ x11-wm/treewm/Makefile 2012-09-25 03:43:58.000000000 +0900 @@ -1,46 +1,55 @@ -# New ports collection makefile for: treewm -# Date created: 09 Sep 2003 -# Whom: Rudolf Polzer -# +# Created by: Rudolf Polzer # $FreeBSD: ports/x11-wm/treewm/Makefile,v 1.10 2008/04/19 17:56:00 miwi Exp $ -# PORTNAME= treewm PORTVERSION= 0.4.5 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Window Manager that arranges the windows in a tree +LICENSE= GPLv2 + BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake +OPTIONS_DEFINE= DOCS EXAMPLES + USE_BZIP2= yes -USE_GMAKE= yes USE_XORG= x11 ice sm xext xmu xpm xt xxf86vm +USE_GMAKE= yes +MAKE_JOBS_SAFE= yes -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message -PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO default.cfg sample.cfg +PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO +PORTEXAMPLES= default.cfg sample.cfg -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile +.include -post-build: - @${SED} 's|%%D%%|${DOCSDIR}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} +post-patch: + @${REINPLACE_CMD} -e \ + '/^PREFIX/s| =| ?=| ; \ + /^CXXFLAGS/s| =| ?=| ; \ + s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile do-install: - ${MKDIR} ${DATADIR} - ${MKDIR} ${DATADIR}/pixmaps ${INSTALL_PROGRAM} ${WRKSRC}/src/treewm ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/xprop/xprop ${PREFIX}/bin/xprop-treewm ${INSTALL_PROGRAM} ${WRKSRC}/xkill/xkill ${PREFIX}/bin/xkill-treewm + @${MKDIR} ${DATADIR}/pixmaps ${INSTALL_DATA} ${WRKSRC}/src/pixmaps/*.xpm ${DATADIR}/pixmaps -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for FILE in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} +.for F in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR} +.endfor +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${EXAMPLESDIR} +.for F in ${PORTEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/${F} ${EXAMPLESDIR} .endfor .endif @${CAT} ${PKGMESSAGE} diff -urN /usr/ports/x11-wm/treewm/files/patch-xprop__xprop.c x11-wm/treewm/files/patch-xprop__xprop.c --- /usr/ports/x11-wm/treewm/files/patch-xprop__xprop.c 1970-01-01 09:00:00.000000000 +0900 +++ x11-wm/treewm/files/patch-xprop__xprop.c 2012-09-13 15:22:29.000000000 +0900 @@ -0,0 +1,49 @@ +--- xprop/xprop.c.orig 2002-03-14 21:14:47.000000000 +0900 ++++ xprop/xprop.c 2012-09-13 15:21:40.000000000 +0900 +@@ -586,7 +586,7 @@ + { + if (--_buf_len<0) { + _buf_ptr[0]='\0'; +- return; ++ return 0; + } + _buf_ptr++[0] = c; + } +@@ -1357,10 +1357,10 @@ + if (id == None) { + fprintf (stderr, "%s: no such property \"%s\"\n", + program_name, propname); +- return; ++ return 0; + } + XDeleteProperty (dpy, w, id); +- return; ++ return 0; + } + + thunk *Handle_Prop_Requests(argc, argv) +@@ -1514,13 +1514,13 @@ + printf("%s", prop); + if (!(atom = Parse_Atom(prop, True))) { + printf(": no such atom on any window.\n"); +- return; ++ return 0; + } + + data = Get_Property_Data_And_Type(atom, &length, &type, &size); + if (!size) { + puts(": not found."); +- return; ++ return 0; + } + + if (!notype && type) +@@ -1535,7 +1535,7 @@ + if (fsize!=size && fsize!=0) { + printf(": Type mismatch: assumed size %d bits, actual size %d bits.\n", + fsize, size); +- return; ++ return 0; + } + + thunks = Break_Down_Property(data, (int)length, format, size); diff -urN /usr/ports/x11-wm/treewm/files/pkg-message.in x11-wm/treewm/files/pkg-message.in --- /usr/ports/x11-wm/treewm/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900 +++ x11-wm/treewm/files/pkg-message.in 2012-07-06 05:05:35.000000000 +0900 @@ -0,0 +1,14 @@ +-------------------------------------------------------------------------- + +The treewm package has been successfully installed. + +NB: Sample configuration files have been installed to +%%EXAMPLESDIR%% as "default.cfg" and "sample.cfg". +Users can look at them as well as the README in the same directory to +write their .treewmrc in their homedir. Also, please take a look at + + WWW: http://www.informatik.uni-frankfurt.de/~polzer/treewmdurchnull/downloads/treewm-examples-en.tar.bz2 + +for further hints and examples about configuring treewm. + +-------------------------------------------------------------------------- diff -urN /usr/ports/x11-wm/treewm/pkg-message x11-wm/treewm/pkg-message --- /usr/ports/x11-wm/treewm/pkg-message 2004-01-12 05:54:14.000000000 +0900 +++ x11-wm/treewm/pkg-message 1970-01-01 09:00:00.000000000 +0900 @@ -1,14 +0,0 @@ --------------------------------------------------------------------------- - -The treewm package has been successfully installed. - -NB: Sample configuration files have been installed to -%%D%% as "default.cfg" and "sample.cfg". -Users can look at them as well as the README in the same directory to -write their .treewmrc in their homedir. Also, please take a look at - - WWW: http://www.informatik.uni-frankfurt.de/~polzer/treewmdurchnull/downloads/treewm-examples-en.tar.bz2 - -for further hints and examples about configuring treewm. - --------------------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: