From rafan@svm.csie.ntu.edu.tw  Thu Nov 30 17:02:23 2006
Return-Path: <rafan@svm.csie.ntu.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D179116A40F
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <rafan@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: freebsd-dr@durchnull.de
Subject: [PATCH] x11-wm/treewm: Respect X11BASE, use DATADIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify: freebsd-dr@durchnull.de

>Number:         106073
>Category:       ports
>Synopsis:       [PATCH] x11-wm/treewm: Respect X11BASE, use DATADIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 30 17:10:12 GMT 2006
>Closed-Date:    Wed Dec 06 13:51:19 GMT 2006
>Last-Modified:  Mon Dec 11 07:40:05 GMT 2006
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Nov 30 17:17:18 UTC 2006 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106073 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Nov 30 17:17:27 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106073 
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Wed Dec 6 13:51:12 UTC 2006 
State-Changed-Why:  
Committed with borrowed portmgr hat. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106073 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106073: commit references a PR
Date: Wed,  6 Dec 2006 13:51:38 +0000 (UTC)

 rafan       2006-12-06 13:50:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/vMac       Makefile pkg-plist 
     emulators/vMac/files patch-aa 
   Log:
   - Respect X11BASE
   - Respect PORTDOCS
   
   PR:             ports/106073
   Submitted by:   rafan
   Approved by:    portmgr (linimon)
   
   Revision  Changes    Path
   1.9       +10 -9     ports/emulators/vMac/Makefile
   1.2       +2 -2      ports/emulators/vMac/files/patch-aa
   1.2       +6 -6      ports/emulators/vMac/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106073: commit references a PR
Date: Mon, 11 Dec 2006 07:36:54 +0000 (UTC)

 rafan       2006-12-11 07:36:44 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11-wm/treewm        Makefile pkg-plist 
   Log:
   - Respect X11BASE
   
   PR:             ports/106073
   Submitted by:   rafan
   Approved by:    portmgr (linimon)
   
   Revision  Changes    Path
   1.7       +4 -4      ports/x11-wm/treewm/Makefile
   1.2       +10 -10    ports/x11-wm/treewm/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
