From rafan@svm.csie.ntu.edu.tw  Wed Feb 21 04:49:07 2007
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 2EDEA16A664
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Feb 2007 04:49:07 +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 BC17313C46B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Feb 2007 04:49:06 +0000 (UTC)
	(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 l1L4n09B047856;
	Wed, 21 Feb 2007 12:49:00 +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 l1L4mxY8025423;
	Wed, 21 Feb 2007 12:48:59 +0800 (CST)
	(envelope-from rafan)
Message-Id: <200702210448.l1L4mxY8025423@svm.csie.ntu.edu.tw>
Date: Wed, 21 Feb 2007 12:48:59 +0800 (CST)
From: Rong-En Fan <rafan@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mi@aldan.algebra.com
Subject: [PATCH] devel/tkp4: use DOCSDIR, DATADIR
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mi@aldan.algebra.com

>Number:         109376
>Category:       ports
>Synopsis:       [PATCH] devel/tkp4: use DOCSDIR, 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:   Wed Feb 21 04:50:00 GMT 2007
>Closed-Date:    Sat Mar 03 21:34:39 GMT 2007
>Last-Modified:  Sat Mar  3 21:40:02 GMT 2007
>Originator:     Rong-En Fan
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
NTU CSIE
>Environment:
>Description:
- Use bsd.port.mk's DOCSDIR and DATADIR, so we don't need to do it our own.
  Therefore, we don't need to write after post.mk
- Traditionally, we put custom make target below bsd.port.pre.mk

Port maintainer (mi@aldan.algebra.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- tkp4-1.12.patch begins here ---
Index: Makefile
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/tkp4/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	4 May 2006 21:41:09 -0000	1.7
+++ Makefile	21 Feb 2007 04:47:04 -0000
@@ -21,14 +21,6 @@
 TCL_VER=	8.4
 TCL_DVER=	${TCL_VER:S/.//}
 
-do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.tcl ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/tkp4 ${PREFIX}/bin
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/P4WINdifferences \
-		${WRKSRC}/UsingTkP4 ${DOCSDIR}
-
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -38,8 +30,14 @@
 		`${GREP} -Fl /usr/local ${WRKSRC}/*`
 .endif
 
-.include <bsd.port.post.mk>
+do-install:
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.tcl ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/tkp4 ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/P4WINdifferences \
+		${WRKSRC}/UsingTkP4 ${DOCSDIR}
+.endif
 
-SCRIPTS	!=	d=${DATADIR}; p=${PREFIX}; echo $${d\#\#$${p%%/}/}
-DOCS	!=	d=${DOCSDIR}; p=${PREFIX}; echo $${d\#\#$${p%%/}/}
-PLIST_SUB+=	SCRIPTS=${SCRIPTS} DOCS=${DOCS}
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /big/freebsd-cvsup/ncvs/ports/devel/tkp4/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	26 May 2002 00:07:00 -0000	1.3
+++ pkg-plist	21 Feb 2007 04:47:04 -0000
@@ -1,10 +1,10 @@
 bin/tkp4
-%%SCRIPTS%%/combobox.tcl
-%%SCRIPTS%%/mclistbox.tcl
-%%SCRIPTS%%/tkp4.tcl
-%%SCRIPTS%%/tree.tcl
-@dirrm %%SCRIPTS%%
-%%DOCS%%/CHANGES
-%%DOCS%%/P4WINdifferences
-%%DOCS%%/UsingTkP4
-@dirrm %%DOCS%%
+%%DATADIR%%/combobox.tcl
+%%DATADIR%%/mclistbox.tcl
+%%DATADIR%%/tkp4.tcl
+%%DATADIR%%/tree.tcl
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/P4WINdifferences
+%%PORTDOCS%%%%DOCSDIR%%/UsingTkP4
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- tkp4-1.12.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 21 04:50:11 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109376 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Feb 21 04:50:19 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109376 
State-Changed-From-To: feedback->closed 
State-Changed-By: mi 
State-Changed-When: Sat Mar 3 21:33:53 UTC 2007 
State-Changed-Why:  
Committed (with minor changes), thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109376: commit references a PR
Date: Sat,  3 Mar 2007 21:33:47 +0000 (UTC)

 mi          2007-03-03 21:33:33 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/tkp4           Makefile pkg-plist 
   Log:
   Switch to USE_TK=yes and put in place other simplifications suggested
   by the PR. Nice and neat now -- no need even for dual parsing of
   bsd.port.mk any more.
   
   PR:     ports/109376
   Submitted by:   rafan
   
   Revision  Changes    Path
   1.8       +5 -11     ports/devel/tkp4/Makefile
   1.4       +9 -9      ports/devel/tkp4/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:
