- Update 0.9.5

- Remove USE_X_PREFIX

PR:		ports/100561
Submitted by:	KATO Tsuguru

3 files changed, 79 insertions, 55 deletions

diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 86b757903ff3..eb29c3ba4e17 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glchess
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,43 +16,21 @@ COMMENT=	A 3D OpenGL based chess game
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
 
-USE_X_PREFIX=	yes
 USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
 USE_GETTEXT=	yes
 
 post-patch:
-.for file in src/scene/builtin_models.py src/scene/new_models.py \
-	src/scene/opengl.py src/ui/gtkui/dialogs.py src/ui/gtkui/gtkui.py
-	@${REINPLACE_CMD} -e \
-		's|/usr/share/games/glchess|${DATADIR}|g' ${WRKSRC}/${file}
-.endfor
-
-do-configure:
-	@${ECHO_CMD} -n > ${WRKSRC}/glchess
-	@${ECHO_CMD} '#!/bin/sh' >> ${WRKSRC}/glchess
-	@${ECHO_CMD} 'exec ${PYTHON_CMD} ${DATADIR}/glchess.py' >> ${WRKSRC}/glchess
+	@${GREP} -lR "/usr/share/games/glchess" ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -e 's|/usr/share/games/glchess|${DATADIR}|g'
+	@${REINPLACE_CMD} -e 's|share/games|share|g' ${WRKSRC}/setup.py
 
-do-build:
+post-build:
 .for lang in de en en_AU en_NZ en_US
 	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt ${lang}.po -o ${lang}.mo
 .endfor
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/glchess ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/*.py ${DATADIR}
-	@${MKDIR} ${DATADIR}/chess
-	${INSTALL_DATA} ${WRKSRC}/src/chess/*.py ${DATADIR}/chess
-	@${MKDIR} ${DATADIR}/scene
-	${INSTALL_DATA} ${WRKSRC}/src/scene/*.py ${DATADIR}/scene
-	@${MKDIR} ${DATADIR}/ui
-	${INSTALL_DATA} ${WRKSRC}/src/ui/*.py ${DATADIR}/ui
-	@${MKDIR} ${DATADIR}/ui/gtkui
-	${INSTALL_DATA} ${WRKSRC}/src/ui/gtkui/*.py ${DATADIR}/ui/gtkui
-	@${MKDIR} ${DATADIR}/gui
-	${INSTALL_DATA} ${WRKSRC}/src/ui/gtkui/*.glade ${DATADIR}/gui
-	@${MKDIR} ${DATADIR}/textures
-	${INSTALL_DATA} ${WRKSRC}/textures/*.* ${DATADIR}/textures
+post-install:
 .for lang in de en en_AU en_NZ en_US
 	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
diff --git a/games/glchess/distinfo b/games/glchess/distinfo
index c968b0d3f420..f0d7ede85f89 100644
--- a/games/glchess/distinfo
+++ b/games/glchess/distinfo
@@ -1,3 +1,3 @@
-MD5 (glchess-0.9.4.tar.gz) = 0b4c96b2642851eace5115164661e607
-SHA256 (glchess-0.9.4.tar.gz) = 6c61ed463e8dc175b8ae97888a664c343e5dee7251e0c47ff3f5f7f70a461154
-SIZE (glchess-0.9.4.tar.gz) = 171527
+MD5 (glchess-0.9.5.tar.gz) = 1bb12f351e4c685ee50ca177ccbf49ff
+SHA256 (glchess-0.9.5.tar.gz) = 929d84960342227802b825197c2bf1c371b5ccc7f30acb1e8640bcf28b2d0437
+SIZE (glchess-0.9.5.tar.gz) = 171600
diff --git a/games/glchess/pkg-plist b/games/glchess/pkg-plist
index 668efabd4adb..297673977d3c 100644
--- a/games/glchess/pkg-plist
+++ b/games/glchess/pkg-plist
@@ -1,15 +1,68 @@
 bin/glchess
+%%PYTHON_SITELIBDIR%%/glchess/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ai.py
+%%PYTHON_SITELIBDIR%%/glchess/ai.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ai.pyo
+%%PYTHON_SITELIBDIR%%/glchess/cecp.py
+%%PYTHON_SITELIBDIR%%/glchess/cecp.pyc
+%%PYTHON_SITELIBDIR%%/glchess/cecp.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/board.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/pgn.pyo
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.py
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.pyc
+%%PYTHON_SITELIBDIR%%/glchess/chess/san.pyo
+%%PYTHON_SITELIBDIR%%/glchess/game.py
+%%PYTHON_SITELIBDIR%%/glchess/game.pyc
+%%PYTHON_SITELIBDIR%%/glchess/game.pyo
+%%PYTHON_SITELIBDIR%%/glchess/glchess.py
+%%PYTHON_SITELIBDIR%%/glchess/glchess.pyc
+%%PYTHON_SITELIBDIR%%/glchess/glchess.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/dialogs.pyo
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.py
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyc
+%%PYTHON_SITELIBDIR%%/glchess/gtkui/gtkui.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/builtin_models.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/builtin_models.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/builtin_models.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/new_models.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/new_models.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/new_models.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/opengl.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/scene.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/scene.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/scene.pyo
+%%PYTHON_SITELIBDIR%%/glchess/scene/texture.py
+%%PYTHON_SITELIBDIR%%/glchess/scene/texture.pyc
+%%PYTHON_SITELIBDIR%%/glchess/scene/texture.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.py
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.pyc
+%%PYTHON_SITELIBDIR%%/glchess/ui/ui.pyo
+share/applications/glchess.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DATADIR%%/ai.py
-%%DATADIR%%/cecp.py
-%%DATADIR%%/chess/__init__.py
-%%DATADIR%%/chess/board.py
-%%DATADIR%%/chess/pgn.py
-%%DATADIR%%/chess/san.py
-%%DATADIR%%/game.py
-%%DATADIR%%/glchess.py
 %%DATADIR%%/gui/chess_view.glade
 %%DATADIR%%/gui/error_dialog.glade
 %%DATADIR%%/gui/glchess.glade
@@ -19,22 +72,11 @@ bin/glchess
 %%DATADIR%%/gui/new_game_simple.glade
 %%DATADIR%%/gui/save_game.glade
 %%DATADIR%%/gui/splashscreen.glade
-%%DATADIR%%/scene/__init__.py
-%%DATADIR%%/scene/builtin_models.py
-%%DATADIR%%/scene/new_models.py
-%%DATADIR%%/scene/opengl.py
-%%DATADIR%%/scene/scene.py
-%%DATADIR%%/scene/texture.py
 %%DATADIR%%/textures/black_board_texture.jpg
 %%DATADIR%%/textures/black_piece_texture.jpg
 %%DATADIR%%/textures/white_board_texture.jpg
 %%DATADIR%%/textures/white_piece_texture.jpg
 %%DATADIR%%/textures/wood_43.jpg
-%%DATADIR%%/ui/__init__.py
-%%DATADIR%%/ui/gtkui/__init__.py
-%%DATADIR%%/ui/gtkui/dialogs.py
-%%DATADIR%%/ui/gtkui/gtkui.py
-%%DATADIR%%/ui/ui.py
 share/locale/de/LC_MESSAGES/glchess.mo
 share/locale/en/LC_MESSAGES/glchess.mo
 share/locale/en_AU/LC_MESSAGES/glchess.mo
@@ -44,11 +86,15 @@ share/locale/en_US/LC_MESSAGES/glchess.mo
 @dirrmtry share/locale/en_US
 @dirrmtry share/locale/en_NZ/LC_MESSAGES
 @dirrmtry share/locale/en_NZ
-@dirrm %%DATADIR%%/ui/gtkui
-@dirrm %%DATADIR%%/ui
+@dirrmtry share/locale/en_AU/LC_MESSAGES
+@dirrmtry share/locale/en_AU
 @dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/scene
 @dirrm %%DATADIR%%/gui
-@dirrm %%DATADIR%%/chess
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/ui
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/scene
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/gtkui
+@dirrm %%PYTHON_SITELIBDIR%%/glchess/chess
+@dirrm %%PYTHON_SITELIBDIR%%/glchess