Date: Fri, 1 Dec 2006 01:02:20 +0800 (CST) From: Rong-En Fan <rafan@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: freebsd-dr@durchnull.de Subject: ports/106073: [PATCH] x11-wm/treewm: Respect X11BASE, use DATADIR Message-ID: <200611301702.kAUH2KLK047304@svm.csie.ntu.edu.tw> Resent-Message-ID: <200611301710.kAUHACrR093354@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611301702.kAUH2KLK047304>