cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.4.0.10

Browse Source 
- Remove dependency on Python 2.7
- Switch to Go modules
- Drop the Go unit tests from do-test, the dependencies are not available

PR:		249782
This commit is contained in:
Mateusz Piotrowski 2020-09-24 20:37:57 +00:00
parent 709aed8343
commit e23e1ee309
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=549950
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
textproc/pup/Makefile
View File

@ -2,10 +2,11 @@
PORTNAME= pup PORTNAME= pup
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 0.4.0-9 DISTVERSION= 0.4.0-10
DISTVERSIONSUFFIX= -g1c3cffd DISTVERSIONSUFFIX= -g681d7bb
PORTREVISION= 1
CATEGORIES= textproc CATEGORIES= textproc
PATCH_SITES= https://github.com/ericchiang/pup/pull/
PATCHFILES= 142.patch:-p1
MAINTAINER= 0mp@FreeBSD.org MAINTAINER= 0mp@FreeBSD.org
COMMENT= Command-line jq-like HTML parser using CSS selectors COMMENT= Command-line jq-like HTML parser using CSS selectors
@ -13,32 +14,38 @@ COMMENT= Command-line jq-like HTML parser using CSS selectors
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go python:2.7,test shebangfix TEST_DEPENDS= gdiff:textproc/diffutils
USES= go:modules python:test shebangfix
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= ericchiang GH_ACCOUNT= ericchiang
GH_TUPLE= fatih:color:v1.0.0:fatih_color/vendor/github.com/fatih/color \
golang:net:4d38db76854b:golang_net/vendor/golang.org/x/net \
golang:sys:a646d33e2ee3:golang_sys/vendor/golang.org/x/sys \
golang:text:0a5a09ee4409:golang_text/vendor/golang.org/x/text \
mattn:go-colorable:v0.0.5:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
mattn:go-isatty:56b76bdf51f7:mattn_go_isatty/vendor/github.com/mattn/go-isatty
SHEBANG_FILES= tests/run.py SHEBANG_FILES= tests/run.py
TEST_ENV= PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
PLIST_FILES= bin/pup PLIST_FILES= bin/pup
PORTDOCS= README.md PORTDOCS= README.md
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
pre-test: post-install-DOCS-on:
@${REINPLACE_CMD} 's|^python |${PYTHON_VERSION} |' ${WRKSRC}/tests/test @${MKDIR} ${STAGEDIR}${DOCSDIR}
@${REINPLACE_CMD} "s|pup |${STAGEDIR}/bin/pup |" ${WRKSRC}/tests/run.py ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
# Disable broken tests. pre-test:
@${REINPLACE_CMD} "/^json{}$$/d" ${WRKSRC}/tests/cmds.txt @${REINPLACE_CMD} "/^json{}$$/d" ${WRKSRC}/tests/cmds.txt
@${REINPLACE_CMD} "/ json{}$$/d" ${WRKSRC}/tests/expected_output.txt @${REINPLACE_CMD} "/ json{}$$/d" ${WRKSRC}/tests/expected_output.txt
@${REINPLACE_CMD} "/^#toc li + a json{}$$/d" ${WRKSRC}/tests/cmds.txt @${REINPLACE_CMD} "/^#toc li + a json{}$$/d" ${WRKSRC}/tests/cmds.txt
@${REINPLACE_CMD} "/ #toc li + a json{}$$/d" ${WRKSRC}/tests/expected_output.txt @${REINPLACE_CMD} "/ #toc li + a json{}$$/d" ${WRKSRC}/tests/expected_output.txt
do-test: do-test:
cd ${WRKSRC}/tests && ${SH} ./test cd ${WRKSRC}/tests && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run.py > test_results.txt
cd ${GO_WRKSRC} && ${SETENV} ${GO_ENV} ${GO_CMD} test cd ${WRKSRC}/tests && ${DIFF} expected_output.txt test_results.txt
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk> .include <bsd.port.mk>

20
textproc/pup/distinfo
View File

@ -1,3 +1,17 @@
TIMESTAMP = 1551261841 TIMESTAMP = 1600967195
SHA256 (ericchiang-pup-v0.4.0-9-g1c3cffd_GH0.tar.gz) = 7268df5ed3d87f7c64740918d0f55b8c1b46c50773498f6ddad8728e009e10e6 SHA256 (ericchiang-pup-v0.4.0-10-g681d7bb_GH0.tar.gz) = 72a4c6fcf915ae33f9522a649b52cb44a1b83e9e3f18f8702177d0c722b1d2f9
SIZE (ericchiang-pup-v0.4.0-9-g1c3cffd_GH0.tar.gz) = 2762078 SIZE (ericchiang-pup-v0.4.0-10-g681d7bb_GH0.tar.gz) = 1514776
SHA256 (fatih-color-v1.0.0_GH0.tar.gz) = 035f20ae3e9940416433ba4c3d9cb55511608a1ac3927e371be61fe5d6052590
SIZE (fatih-color-v1.0.0_GH0.tar.gz) = 7173
SHA256 (golang-net-4d38db76854b_GH0.tar.gz) = e233d26e844fd9de1d3b25f2d50a2f1cc08a03c2d602e1bd13546bb246188323
SIZE (golang-net-4d38db76854b_GH0.tar.gz) = 725194
SHA256 (golang-sys-a646d33e2ee3_GH0.tar.gz) = 52667de65a02cd102fc39372e4f65617ec392ec26559897f45ed5b7bf7ea8022
SIZE (golang-sys-a646d33e2ee3_GH0.tar.gz) = 596888
SHA256 (golang-text-0a5a09ee4409_GH0.tar.gz) = 2dee9f383cbc2cfae8cd84303c62a8fb01b1ab218f0bed4cccfb449e3ad11c5a
SIZE (golang-text-0a5a09ee4409_GH0.tar.gz) = 4082854
SHA256 (mattn-go-colorable-v0.0.5_GH0.tar.gz) = 8cd5edba9e942ee564359af89c735743046b01ca7c12d9ec45ef5e5c26bc076e
SIZE (mattn-go-colorable-v0.0.5_GH0.tar.gz) = 5856
SHA256 (mattn-go-isatty-56b76bdf51f7_GH0.tar.gz) = 665e8446874f1e8bf32048c5dea7c70350ad2af3ddf9f38587dccb2a7a41330a
SIZE (mattn-go-isatty-56b76bdf51f7_GH0.tar.gz) = 1958
SHA256 (142.patch) = c84d18fd1160267371aa47d47f8346c1ceb9210bd28af74df11bd9527185e628
SIZE (142.patch) = 612