Update port: devel/cut update from 2.4 to 2.6
Responsible Changed From-To: freebsd-ports-bugs->amdmi3 I'll take it.
State Changed From-To: open->feedback *.py scripts are installed with incorrect python shebangs. Also they don't really seem to belong to bin/, more likely to libexec/cut or something.
> Synopsis: Update port: devel/cut update from 2.4 to 2.6 > > State-Changed-From-To: open->feedback > State-Changed-By: amdmi3 > State-Changed-When: Thu Jul 16 02:19:04 UTC 2009 > State-Changed-Why: > *.py scripts are installed with incorrect python shebangs. Also they > don't really seem to belong to bin/, more likely to libexec/cut or > something. Thanks amdmi3@freebsd.org Now feedback is accepted. ports/136820: Update port: devel/cut update from 2.4 to 2.6 (was ports/136687) http://www.freebsd.org/cgi/query-pr.cgi?pr=136820 -- Kouki Hashimoto hsmtkk@gmail.com
> Also, what I meant with regard to *py files in bin/ - those have too > generic names (parser.py, lexer.py, common.py) and I think it'd be > better to install them not to ${PREFIX}/bin but to some dedicated > directory (like ${PREFIX}/libexec/cut). Are those scripts intended to be > run by user, or do they call each other? In the former case, you should > probably add pkg-message with a mention of it, in the latter just paths > in the scripts should be fixed. > > PS. Shebangs are better to be fixed by ${REINPLACE_CMD} instead of > patches. Thanks amdmi3@freebsd.org This is modified version. 1. upgrade PORTVERSION from 2.4 to 2.6 2. use ${REINPLACE_CMD} to replace shebangs 3. install parser.py as cutgen_parser.py, lexer.py as cutgen_lexer.py, etc. -- Kouki Hashimoto hsmtkk@gmail.com
Sorry. Attached file is corrupt. Send patch again. Kouki Hashimoto hsmtkk@gmail.com diff -r 53d6d737690f -r f80109a7d33e Makefile --- a/Makefile Sun Jul 12 20:48:15 2009 +0900 +++ b/Makefile Sat Jul 18 20:45:26 2009 +0900 @@ -6,38 +6,29 @@ # PORTNAME=3D cut -PORTVERSION=3D 2.4 +PORTVERSION=3D 2.6 CATEGORIES=3D devel -MASTER_SITES=3D http://www.falvotech.com/content/cut/2.4/downloads/ +MASTER_SITES=3D http://www.falvotech.com/content/cut/2.6/ MAINTAINER=3D ports@FreeBSD.org COMMENT=3D Unit Testing Framework for C, C++ and Objective-C -EXAMPLESDIR=3D ${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION} -DOCSDIR=3D ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} +RUN_DEPENDS=3D python:${PORTSDIR}/lang/python -WRKSRC=3D ${WRKDIR}/repo +ALL_TARGET=3D build -# related to build target -ALL_TARGET=3D bin/cutgen - -# cut interface is compatible at major version number -major=3D 2 +post-patch: +.for FILE in common.py cutgen.py options.py parser.py + @${REINPLACE_CMD} -e =C2=A5 + 's|/usr/bin/python|${PREFIX}/bin/python|' =C2=A5 + ${WRKSRC}/${FILE} +.endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/cutgen ${PREFIX}/bin/cutgen-${major} - ${CP} -R ${WRKSRC}/include/* ${PREFIX}/include/ -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/tutorial - ${CP} ${WRKSRC}/LICENSE ${WRKSRC}/docs/README ${WRKSRC}/CHANGELOG ${DOCSD= IR}/ - ${CP} -R ${WRKSRC}/docs/tutorials/sergei_gnezdov/*.c=C2=A5 - ${WRKSRC}/docs/tutorials/sergei_gnezdov/*.h=C2=A5 - ${WRKSRC}/docs/tutorials/sergei_gnezdov/*.dvi=C2=A5 - ${WRKSRC}/docs/tutorials/sergei_gnezdov/*.pdf=C2=A5 - ${WRKSRC}/docs/tutorials/sergei_gnezdov/*.ps=C2=A5 - ${DOCSDIR}/tutorial/ - ${MKDIR} ${EXAMPLESDIR}/ - ${CP} -R ${WRKSRC}/test/* ${EXAMPLESDIR}/ -.endif + ${CP} ${WRKSRC}/build/bin/cutgen ${PREFIX}/bin + ${CP} ${WRKSRC}/build/bin/cutgen.py ${PREFIX}/bin +.for FILE in common.py lexer.py options.py parser.py + ${CP} ${WRKSRC}/build/bin/${FILE} ${PREFIX}/bin/cutgen_${FILE} +.endfor .include <bsd.port.mk> diff -r 53d6d737690f -r f80109a7d33e distinfo --- a/distinfo Sun Jul 12 20:48:15 2009 +0900 +++ b/distinfo Sat Jul 18 20:45:26 2009 +0900 @@ -1,3 +1,3 @@ -MD5 (cut-2.4.tar.gz) =3D d517fccf99161b4190afa75e2a5eec09 -SHA256 (cut-2.4.tar.gz) =3D b8690e00ced7ae36efc955cd2a479dfeb3221ad90ad087093d302265706971f7 -SIZE (cut-2.4.tar.gz) =3D 120644 +MD5 (cut-2.6.tar.gz) =3D 8fa2a161a07ae0c7d8f453b2a8ecc8cf +SHA256 (cut-2.6.tar.gz) =3D ca1af2bfde22471f34c3f8852712983bac74150c7f7837367fece750d1ed793e +SIZE (cut-2.6.tar.gz) =3D 302932 diff -r 53d6d737690f -r f80109a7d33e files/patch-cutgen.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-cutgen.py Sat Jul 18 20:45:26 2009 +0900 @@ -0,0 +1,17 @@ +--- cutgen.py.orig 2009-07-17 07:01:40.000000000 +0900 ++++ cutgen.py 2009-07-17 07:02:05.000000000 +0900 +@@ -3,10 +3,10 @@ + + import sys + +-import common +-import lexer +-import options as o +-import parser ++import cutgen_common as common ++import cutgen_lexer as lexer ++import cutgen_options as o ++import cutgen_parser as parser + + + def singleParseTreeFor(files): diff -r 53d6d737690f -r f80109a7d33e files/patch-options.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-options.py Sat Jul 18 20:45:26 2009 +0900 @@ -0,0 +1,11 @@ +--- options.py.orig 2009-07-18 20:38:49.000000000 +0900 ++++ options.py 2009-07-18 20:38:57.000000000 +0900 +@@ -1,7 +1,7 @@ + #!/usr/bin/python + + +-import common ++import cutgen_common as common + + + def collatedArguments(args): diff -r 53d6d737690f -r f80109a7d33e files/patch-parser.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/files/patch-parser.py Sat Jul 18 20:45:26 2009 +0900 @@ -0,0 +1,13 @@ +--- parser.py.orig 2009-07-18 20:39:51.000000000 +0900 ++++ parser.py 2009-07-18 20:40:01.000000000 +0900 +@@ -1,8 +1,8 @@ + #!/usr/bin/python + + +-import common +-import lexer ++import cutgen_common as common ++import cutgen_lexer as lexer + + + class _GenericTest(object): diff -r 53d6d737690f -r f80109a7d33e pkg-plist --- a/pkg-plist Sun Jul 12 20:48:15 2009 +0900 +++ b/pkg-plist Sat Jul 18 20:45:26 2009 +0900 @@ -1,30 +1,6 @@ -bin/cutgen-2 -include/cut-2/cut.h -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Compute.c -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Compute.h -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Compute1.c -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Main.c -%%PORTDOCS%%%%DOCSDIR%%/tutorial/TestCompute.c -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Tutorial.dvi -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Tutorial.pdf -%%PORTDOCS%%%%DOCSDIR%%/tutorial/Tutorial.ps -%%PORTDOCS%%%%EXAMPLESDIR%%/all-pass/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/all-pass/cut-pass.c -%%PORTDOCS%%%%EXAMPLESDIR%%/bringup-failure/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/bringup-failure/cut-explode1.c -%%PORTDOCS%%%%EXAMPLESDIR%%/bringup-failure/cut-explode2.c -%%PORTDOCS%%%%EXAMPLESDIR%%/normal-failure/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/normal-failure/cut-explode.c -%%PORTDOCS%%%%EXAMPLESDIR%%/simple-demo-pass/Makefile -%%PORTDOCS%%%%EXAMPLESDIR%%/simple-demo-pass/cut-pass.c -@dirrm include/cut-2 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/all-pass -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bringup-failure -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/normal-failure -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/simple-demo-pass -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +bin/cutgen +bin/cutgen.py +bin/cutgen_common.py +bin/cutgen_lexer.py +bin/cutgen_options.py +bin/cutgen_parser.py
State Changed From-To: feedback->open Submitter has fixed.
State Changed From-To: open->closed Committed, with minor changes. Thanks!
amdmi3 2009-07-20 16:16:03 UTC FreeBSD ports repository Modified files: devel/cut Makefile distinfo pkg-plist Log: - Update to 2.6 PR: 136687 Submitted by: Kouki Hashimoto <hsmtkk@gmail.com> Revision Changes Path 1.5 +14 -25 ports/devel/cut/Makefile 1.4 +3 -3 ports/devel/cut/distinfo 1.2 +6 -30 ports/devel/cut/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"