From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 30 17:17:03 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 953B816A40F for ; Thu, 30 Nov 2006 17:17:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 704FC43F39 for ; Thu, 30 Nov 2006 17:10:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAUHACmX093355 for ; Thu, 30 Nov 2006 17:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAUHACrR093354; Thu, 30 Nov 2006 17:10:12 GMT (envelope-from gnats) Resent-Date: Thu, 30 Nov 2006 17:10:12 GMT Resent-Message-Id: <200611301710.kAUHACrR093354@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, Rong-En Fan Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D179116A40F for ; Thu, 30 Nov 2006 17:02:23 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3883F43CBC for ; Thu, 30 Nov 2006 17:02:13 +0000 (GMT) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1]) by svm.csie.ntu.edu.tw (8.13.8/8.13.8) with ESMTP id kAUH2KAK056754; Fri, 1 Dec 2006 01:02:20 +0800 (CST) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: (from rafan@localhost) by svm.csie.ntu.edu.tw (8.13.8/8.13.8/Submit) id kAUH2KLK047304; Fri, 1 Dec 2006 01:02:20 +0800 (CST) (envelope-from rafan) Message-Id: <200611301702.kAUH2KLK047304@svm.csie.ntu.edu.tw> Date: Fri, 1 Dec 2006 01:02:20 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: freebsd-dr@durchnull.de Subject: ports/106073: [PATCH] x11-wm/treewm: Respect X11BASE, use DATADIR 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: Thu, 30 Nov 2006 17:17:03 -0000 >Number: 106073 >Category: ports >Synopsis: [PATCH] x11-wm/treewm: Respect X11BASE, use DATADIR >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: Thu Nov 30 17:10:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Rong-En Fan >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: NTU CSIE >Environment: >Description: - Respect X11BASE - Use DATADIR Port maintainer (freebsd-dr@durchnull.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- treewm-0.4.5_3.patch begins here --- Index: Makefile =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/x11-wm/treewm/Makefile,v retrieving revision 1.6 diff -u -u -r1.6 Makefile --- Makefile 13 May 2006 05:00:44 -0000 1.6 +++ Makefile 30 Nov 2006 17:01:59 -0000 @@ -26,18 +26,18 @@ PORTDOCS= AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO default.cfg sample.cfg post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile post-build: @${SED} 's|%%D%%|${DOCSDIR}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE} do-install: - ${MKDIR} ${PREFIX}/share/treewm - ${MKDIR} ${PREFIX}/share/treewm/pixmaps + ${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 - ${INSTALL_DATA} ${WRKSRC}/src/pixmaps/*.xpm ${PREFIX}/share/treewm/pixmaps + ${INSTALL_DATA} ${WRKSRC}/src/pixmaps/*.xpm ${DATADIR}/pixmaps .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for FILE in ${PORTDOCS} Index: pkg-plist =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/x11-wm/treewm/pkg-plist,v retrieving revision 1.1 diff -u -u -r1.1 pkg-plist --- pkg-plist 11 Jan 2004 20:54:14 -0000 1.1 +++ pkg-plist 30 Nov 2006 17:01:59 -0000 @@ -1,13 +1,13 @@ bin/treewm bin/xprop-treewm bin/xkill-treewm -share/treewm/pixmaps/close.xpm -share/treewm/pixmaps/icon.xpm -share/treewm/pixmaps/max1.xpm -share/treewm/pixmaps/max2.xpm -share/treewm/pixmaps/move.xpm -share/treewm/pixmaps/none1.xpm -share/treewm/pixmaps/none2.xpm -share/treewm/pixmaps/resize.xpm -@dirrm share/treewm/pixmaps -@dirrm share/treewm +%%DATADIR%%/pixmaps/close.xpm +%%DATADIR%%/pixmaps/icon.xpm +%%DATADIR%%/pixmaps/max1.xpm +%%DATADIR%%/pixmaps/max2.xpm +%%DATADIR%%/pixmaps/move.xpm +%%DATADIR%%/pixmaps/none1.xpm +%%DATADIR%%/pixmaps/none2.xpm +%%DATADIR%%/pixmaps/resize.xpm +@dirrm %%DATADIR%%/pixmaps +@dirrm %%DATADIR%% --- treewm-0.4.5_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: