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: ports/109376: [PATCH] devel/tkp4: use DOCSDIR, DATADIR Message-ID: <200702210448.l1L4mxY8025423@svm.csie.ntu.edu.tw> Resent-Message-ID: <200702210450.l1L4o0fi014541@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109376
>Category: ports
>Synopsis: [PATCH] devel/tkp4: use DOCSDIR, 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: Wed Feb 21 04:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702210448.l1L4mxY8025423>