- Update to 1.2.2

PR:		155822
Submitted by:	Ports Fury

4 files changed, 68 insertions, 66 deletions

diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 5f786867d0a7..061a566a5d65 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pyching
-PORTVERSION=	1.2.1
-PORTREVISION=	2
+PORTVERSION=	1.2.2
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/pyChing/${PORTVERSION}
 
@@ -16,34 +15,38 @@ COMMENT=	Consult a I Ching, an ancient Chinese book of wisdom
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
-USE_XORG=	x11
-
-PLIST_SUB+=	LIB_TARGET=${LIB_TARGET:S,^${PREFIX}/,,g} \
-		DOC_TARGET=${DOC_TARGET:S,^${PREFIX}/,,g}
 
-EXEC_FILENAME=	${PORTNAME}
-LIB_FILES=	pyching_*.py* smg*.py* icon.xbm
-DOC_FILES=	[A-Z]*
-LIB_TARGET=	${PREFIX}/lib/${PORTNAME}
-DOC_TARGET=	${PREFIX}/share/doc/${PORTNAME}
+MAN1=		${PORTNAME}.1
 
 post-patch:
-	${SED} 's@^\(import sys\)$$@\1; sys.path.append("${LIB_TARGET}")@' \
-		${WRKSRC}/pyching.py >${WRKSRC}/${EXEC_FILENAME}
+	@cd ${WRKSRC}; ${SED} 's|/usr/share/|${PYTHON_SITELIBDIR}/|g' \
+		< ${PORTNAME}.sh > ${PORTNAME}
 
 do-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${EXEC_FILENAME} ${PREFIX}/bin
-	${MKDIR} ${LIB_TARGET}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${LIB_FILES} ${LIB_TARGET}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
+.for ext in py pyc pyo xbm
+	${INSTALL_DATA} ${WRKSRC}/*.${ext} ${PYTHON_SITELIBDIR}/${PORTNAME}
+.endfor
+.for file in COPYING CREDITS
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PYTHON_SITELIBDIR}/${PORTNAME}
+.endfor
+	@${CHMOD} ${BINMODE} ${PYTHON_SITELIBDIR}/${PORTNAME}/${PORTNAME}.py
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOC_TARGET}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOC_TARGET}
+	@${MKDIR} ${DOCSDIR}
+.for file in BUGS CHANGES NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/pyching/distinfo b/games/pyching/distinfo
index 0abd10215d2c..d8566c3382da 100644
--- a/games/pyching/distinfo
+++ b/games/pyching/distinfo
@@ -1,3 +1,2 @@
-MD5 (pyching-1.2.1.tar.gz) = fc198a2b1900e5b11b891eb924d7bb55
-SHA256 (pyching-1.2.1.tar.gz) = 21f84f22224ea7cc3565b77eadb41cfdd6fb41491c9b84ce5c5ccade398e3550
-SIZE (pyching-1.2.1.tar.gz) = 137754
+SHA256 (pyching-1.2.2.tar.gz) = 4184f1f8ab1071f7d91d06dfb01078b7a7f365c5f3b56246651114a4ab428005
+SIZE (pyching-1.2.2.tar.gz) = 133900
diff --git a/games/pyching/pkg-descr b/games/pyching/pkg-descr
index 756010df6123..4febb574fbc0 100644
--- a/games/pyching/pkg-descr
+++ b/games/pyching/pkg-descr
@@ -1,6 +1,5 @@
-pyching is a program that allows you to 'consult'
-the I Ching, an ancient Chinese book of wisdom,
-using the coin oracle, and then to look up a brief
+pyching is a program that allows you to 'consult' the I Ching, an ancient 
+Chinese book of wisdom, using the coin oracle, and then to look up a brief
 interpretation.
 
-WWW: http://sourceforge.net/projects/pyching/
+WWW: http://pyching.sourceforge.net/
diff --git a/games/pyching/pkg-plist b/games/pyching/pkg-plist
index 428681ed536f..9aeccffd358b 100644
--- a/games/pyching/pkg-plist
+++ b/games/pyching/pkg-plist
@@ -1,42 +1,43 @@
 bin/pyching
-%%LIB_TARGET%%/icon.xbm
-%%LIB_TARGET%%/pyching_cimages.py
-%%LIB_TARGET%%/pyching_cimages.pyc
-%%LIB_TARGET%%/pyching_cimages.pyo
-%%LIB_TARGET%%/pyching_engine.py
-%%LIB_TARGET%%/pyching_engine.pyc
-%%LIB_TARGET%%/pyching_engine.pyo
-%%LIB_TARGET%%/pyching_hlhtx_data.py
-%%LIB_TARGET%%/pyching_hlhtx_data.pyc
-%%LIB_TARGET%%/pyching_hlhtx_data.pyo
-%%LIB_TARGET%%/pyching_idimage_data.py
-%%LIB_TARGET%%/pyching_idimage_data.pyc
-%%LIB_TARGET%%/pyching_idimage_data.pyo
-%%LIB_TARGET%%/pyching_int_data.py
-%%LIB_TARGET%%/pyching_int_data.pyc
-%%LIB_TARGET%%/pyching_int_data.pyo
-%%LIB_TARGET%%/pyching_interface_tkinter.py
-%%LIB_TARGET%%/pyching_interface_tkinter.pyc
-%%LIB_TARGET%%/pyching_interface_tkinter.pyo
-%%LIB_TARGET%%/smgAbout.py
-%%LIB_TARGET%%/smgAbout.pyc
-%%LIB_TARGET%%/smgAbout.pyo
-%%LIB_TARGET%%/smgAnimate.py
-%%LIB_TARGET%%/smgAnimate.pyc
-%%LIB_TARGET%%/smgAnimate.pyo
-%%LIB_TARGET%%/smgDialog.py
-%%LIB_TARGET%%/smgDialog.pyc
-%%LIB_TARGET%%/smgDialog.pyo
-%%LIB_TARGET%%/smgHtmlView.py
-%%LIB_TARGET%%/smgHtmlView.pyc
-%%LIB_TARGET%%/smgHtmlView.pyo
-@dirrm %%LIB_TARGET%%
-%%PORTDOCS%%%%DOC_TARGET%%/BUGS
-%%PORTDOCS%%%%DOC_TARGET%%/CHANGES
-%%PORTDOCS%%%%DOC_TARGET%%/COPYING
-%%PORTDOCS%%%%DOC_TARGET%%/COPYRIGHT
-%%PORTDOCS%%%%DOC_TARGET%%/CREDITS
-%%PORTDOCS%%%%DOC_TARGET%%/INSTALL
-%%PORTDOCS%%%%DOC_TARGET%%/NEWS
-%%PORTDOCS%%%%DOC_TARGET%%/README
-%%PORTDOCS%%@dirrm %%DOC_TARGET%%
+%%PYTHON_SITELIBDIR%%/pyching/COPYING
+%%PYTHON_SITELIBDIR%%/pyching/CREDITS
+%%PYTHON_SITELIBDIR%%/pyching/icon.xbm
+%%PYTHON_SITELIBDIR%%/pyching/pyching.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_cimages.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_cimages.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_cimages.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_engine.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_engine.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_engine.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_hlhtx_data.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_hlhtx_data.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_hlhtx_data.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_idimage_data.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_idimage_data.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_idimage_data.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_int_data.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_int_data.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_int_data.pyo
+%%PYTHON_SITELIBDIR%%/pyching/pyching_interface_tkinter.py
+%%PYTHON_SITELIBDIR%%/pyching/pyching_interface_tkinter.pyc
+%%PYTHON_SITELIBDIR%%/pyching/pyching_interface_tkinter.pyo
+%%PYTHON_SITELIBDIR%%/pyching/smgAbout.py
+%%PYTHON_SITELIBDIR%%/pyching/smgAbout.pyc
+%%PYTHON_SITELIBDIR%%/pyching/smgAbout.pyo
+%%PYTHON_SITELIBDIR%%/pyching/smgAnimate.py
+%%PYTHON_SITELIBDIR%%/pyching/smgAnimate.pyc
+%%PYTHON_SITELIBDIR%%/pyching/smgAnimate.pyo
+%%PYTHON_SITELIBDIR%%/pyching/smgDialog.py
+%%PYTHON_SITELIBDIR%%/pyching/smgDialog.pyc
+%%PYTHON_SITELIBDIR%%/pyching/smgDialog.pyo
+%%PYTHON_SITELIBDIR%%/pyching/smgHtmlView.py
+%%PYTHON_SITELIBDIR%%/pyching/smgHtmlView.pyc
+%%PYTHON_SITELIBDIR%%/pyching/smgHtmlView.pyo
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/pyching