svn commit: r381245 - in head/net/dshell: . files

[MANTANI Nobutaka]

Author: nobutaka
Date: Sat Mar 14 04:22:37 2015
New Revision: 381245
URL: https://svnweb.freebsd.org/changeset/ports/381245
QAT: https://qat.redports.org/buildarchive/r381245/

Log:
  Fix package building error.

Modified:
  head/net/dshell/Makefile
  head/net/dshell/files/patch-Makefile   (contents, props changed)

Modified: head/net/dshell/Makefile
==============================================================================
--- head/net/dshell/Makefile	Sat Mar 14 04:03:57 2015	(r381244)
+++ head/net/dshell/Makefile	Sat Mar 14 04:22:37 2015	(r381245)
@@ -28,11 +28,14 @@ GH_COMMIT=	46e691c
 
 OPTIONS_DEFINE=	DOCS
 
+MAKE_ENV+=	PYTHON_CMD=${PYTHON_CMD}
+
 .include <bsd.port.options.mk>
 
 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:

Modified: head/net/dshell/files/patch-Makefile
==============================================================================
--- head/net/dshell/files/patch-Makefile	Sat Mar 14 04:03:57 2015	(r381244)
+++ head/net/dshell/files/patch-Makefile	Sat Mar 14 04:22:37 2015	(r381245)
@@ -1,5 +1,14 @@
---- Makefile.orig	2015-02-04 22:30:21.000000000 +0900
-+++ Makefile	2015-02-04 22:30:50.000000000 +0900
+--- Makefile.orig	2015-02-20 03:44:33.000000000 +0900
++++ Makefile	2015-03-12 23:44:40.000000000 +0900
+@@ -6,7 +6,7 @@
+ 
+ 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 @@
  initpy:
  	find $(PWD)/decoders -type d -not -path \*.svn\* -print -exec touch {}/__init__.py \;