Index: head/net/dshell/Makefile =================================================================== --- head/net/dshell/Makefile (revision 485116) +++ head/net/dshell/Makefile (revision 485117) @@ -1,73 +1,74 @@ # Created by: Nobutaka Mantani # $FreeBSD$ PORTNAME= dshell -PORTVERSION= 3.0.20171116 +PORTVERSION= 3.0.20180914 CATEGORIES= net MAINTAINER= nobutaka@FreeBSD.org COMMENT= Extensible network forensic analysis framework LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GITHUB= yes USES= python:-2.7 shebangfix +USE_GITHUB= yes + NO_ARCH= yes SHEBANG_FILES= bin/*.py GH_ACCOUNT= USArmyResearchLab GH_PROJECT= Dshell -GH_TAGNAME= 5850adf +GH_TAGNAME= 709d087 OPTIONS_DEFINE= DOCS MAKE_ENV+= PYTHON_CMD=${PYTHON_CMD} post-patch: .for f in bin/generate-dshellrc.py doc/generate-doc.sh ${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/${f} ${REINPLACE_CMD} -e 's|pydoc|${LOCALBASE}/bin/pydoc${PYTHON_VER}|' ${WRKSRC}/${f} .endfor post-build: ${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION} ${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode ${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \ -e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \ -e 's|DATAPATH=${WRKSRC}/share|DATAPATH=${DATADIR}|' \ -e 's|DECODERPATH=${WRKSRC}/decoders|DECODERPATH=${PYTHON_SITELIBDIR}/dshell/decoders|' \ -e 's|LIBPATH=${WRKSRC}/lib|LIBPATH=${PYTHON_SITELIBDIR}/dshell|' \ ${WRKSRC}/.dshellrc (cd ${WRKSRC}/doc; ${REINPLACE_CMD} -e 's|${WRKSRC}|${PYTHON_SITELIBDIR}/dshell|g' *.html) do-install: .for f in dshell dshell-decode ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${PREFIX}/bin .endfor ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/dshell .for f in decode.py pcapanon.py ${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}/${PREFIX}/libexec/dshell .endfor (cd ${STAGEDIR}/${PREFIX}/libexec/dshell; \ ${LN} -sf decode.py decode) ${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dshell ${INSTALL_DATA} ${WRKSRC}/.dshellrc ${STAGEDIR}/${PREFIX}/etc/dshell (cd ${WRKSRC}/lib; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell) (cd ${WRKSRC}/decoders; ${COPYTREE_SHARE} . ${STAGEDIR}/${PYTHON_SITELIBDIR}/dshell/decoders) ${MKDIR} ${STAGEDIR}/${DATADIR}/GeoIP do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR} (cd ${WRKSRC}/doc; ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR} "-name *\.html") .include Index: head/net/dshell/distinfo =================================================================== --- head/net/dshell/distinfo (revision 485116) +++ head/net/dshell/distinfo (revision 485117) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523795973 -SHA256 (USArmyResearchLab-Dshell-3.0.20171116-5850adf_GH0.tar.gz) = 1f9fca1435409b34d6d52b2100f010a1affefb7cdf07113927585cd98cfba94b -SIZE (USArmyResearchLab-Dshell-3.0.20171116-5850adf_GH0.tar.gz) = 716609 +TIMESTAMP = 1542435016 +SHA256 (USArmyResearchLab-Dshell-3.0.20180914-709d087_GH0.tar.gz) = c5ce6bafdd1b09cd70a3dfe1ab9fb3abc4e2204f8596bfbd5a2f7dfd3fb1a8bb +SIZE (USArmyResearchLab-Dshell-3.0.20180914-709d087_GH0.tar.gz) = 716622 Index: head/net/dshell/files/patch-Makefile =================================================================== --- head/net/dshell/files/patch-Makefile (revision 485116) +++ head/net/dshell/files/patch-Makefile (revision 485117) @@ -1,20 +1,20 @@ ---- Makefile.orig 2015-02-20 03:44:33.000000000 +0900 -+++ Makefile 2015-03-12 23:44:40.000000000 +0900 -@@ -6,7 +6,7 @@ +--- Makefile.orig 2018-09-13 18:19:05 UTC ++++ Makefile +@@ -6,7 +6,7 @@ dshell: rc initpy pydoc rc: # Generating .dshellrc and dshell files - python $(PWD)/bin/generate-dshellrc.py $(PWD) + $(PYTHON_CMD) $(PWD)/bin/generate-dshellrc.py $(PWD) chmod 755 $(PWD)/dshell chmod 755 $(PWD)/dshell-decode chmod 755 $(PWD)/bin/decode.py -@@ -15,7 +15,7 @@ +@@ -15,7 +15,7 @@ rc: initpy: find $(PWD)/decoders -type d -not -path \*.svn\* -print -exec touch {}/__init__.py \; -pydoc: +pydoc: rc (cd $(PWD)/doc && ./generate-doc.sh $(PWD) ) clean: clean_pyc