2 files changed, 110 insertions, 100 deletions

diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index 076a22da2347..a2ea1eddbf14 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -3,57 +3,68 @@
 
 PORTNAME=	ninix-aya
 PORTVERSION=	4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	ninix-aya/58500
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SFJP/${PORTNAME}/58500
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Ninix-aya is a compatible with desktop mascot program "Ukagaka"
+COMMENT=	Desktop mascot program compatible with "Ukagaka"
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		${PYTHON_SITELIBDIR}/chardet/__init__.py:${PORTSDIR}/textproc/py-chardet \
-		${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/pygst.py:${PORTSDIR}/multimedia/py-gstreamer
+		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet \
+		${PYNUMPY}
 
-USE_PYTHON=	yes
+NO_ARCH=	yes
+
+USES=		gmake python tar:tgz
 USE_GNOME=	pygtk2
-USES=		gmake
+USE_GSTREAMER=	python
+
+DOCSDIR=	${PREFIX}/share/doc/ninix
 
 OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+NLS_USES=	gettext
 
-.if ${PORT_OPTIONS:MDOCS}
-DOCSDIR=	${PREFIX}/share/doc/ninix
-.endif
+.include <bsd.port.options.mk>
 
+do-build:
+	@(cd ${WRKSRC}/bin && ${SED} -e \
+		's|@python|${PYTHON_CMD}| ; \
+		 s|@libdir|${PREFIX}/libexec/ninix|' ninix.in > ninix)
 .if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
+.for i in ja zh_TW
+	(cd ${WRKSRC}/locale && ${LOCALBASE}/bin/msgfmt -o ${i}.mo ${i}.po)
+.endfor
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -E -e 's,\$$\(DESTDIR\)(.*),\1,' \
-		-e 's,/opt/ninix-aya,$$(PREFIX),' \
-		-e 's,lib/ninix,libexec/ninix,'	\
-		-e 's,/doc,/share/doc/ninix,' \
-		${WRKSRC}/Makefile
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/docdir)$$/d' \
-		${WRKSRC}/Makefile
-.endif
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e '/localedir/d' \
-		${WRKSRC}/Makefile
+do-install:
+	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ninix \
+		${STAGEDIR}${PREFIX}/bin)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ninix
+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${PREFIX}/libexec/ninix)
+	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+		-d ${PREFIX}/libexec/ninix -f libexec/ninix)
+.if ${PORT_OPTIONS:MNLS}
+.for i in ja zh_TW
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
+	(cd ${WRKSRC}/locale && ${INSTALL_DATA} ${i}.mo \
+		${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/ninix.mo)
+.endfor
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ChangeLog README README.ninix TODO.ninix KNOWN_ISSUES
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
+.for i in extension.txt kawari.txt saori.txt
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \
+		${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/games/ninix-aya/pkg-plist b/games/ninix-aya/pkg-plist
index a63751ebe543..7966845afd08 100644
--- a/games/ninix-aya/pkg-plist
+++ b/games/ninix-aya/pkg-plist
@@ -1,113 +1,112 @@
 bin/ninix
-libexec/ninix/ninix/dll/textcopy.py
+libexec/ninix/ninix/__init__.py
+libexec/ninix/ninix/__init__.pyc
+libexec/ninix/ninix/alias.py
+libexec/ninix/ninix/alias.pyc
+libexec/ninix/ninix/balloon.py
+libexec/ninix/ninix/balloon.pyc
+libexec/ninix/ninix/communicate.py
+libexec/ninix/ninix/communicate.pyc
+libexec/ninix/ninix/config.py
+libexec/ninix/ninix/config.pyc
+libexec/ninix/ninix/dll.py
+libexec/ninix/ninix/dll.pyc
 libexec/ninix/ninix/dll/aya.py
+libexec/ninix/ninix/dll/aya.pyc
+libexec/ninix/ninix/dll/aya5.py
+libexec/ninix/ninix/dll/aya5.pyc
 libexec/ninix/ninix/dll/bln.py
-libexec/ninix/ninix/dll/kawari.py
-libexec/ninix/ninix/dll/kawari8.py
-libexec/ninix/ninix/dll/mciaudio.py
-libexec/ninix/ninix/dll/mciaudior.py
-libexec/ninix/ninix/dll/misaka.py
-libexec/ninix/ninix/dll/niseshiori.py
-libexec/ninix/ninix/dll/satori.py
-libexec/ninix/ninix/dll/hanayu.py
 libexec/ninix/ninix/dll/bln.pyc
+libexec/ninix/ninix/dll/gomi.py
+libexec/ninix/ninix/dll/gomi.pyc
+libexec/ninix/ninix/dll/hanayu.py
+libexec/ninix/ninix/dll/hanayu.pyc
+libexec/ninix/ninix/dll/httpc.py
+libexec/ninix/ninix/dll/httpc.pyc
+libexec/ninix/ninix/dll/kawari.py
 libexec/ninix/ninix/dll/kawari.pyc
+libexec/ninix/ninix/dll/kawari8.py
 libexec/ninix/ninix/dll/kawari8.pyc
+libexec/ninix/ninix/dll/mciaudio.py
 libexec/ninix/ninix/dll/mciaudio.pyc
-libexec/ninix/ninix/dll/textcopy.pyc
-libexec/ninix/ninix/dll/wmove.py
-libexec/ninix/ninix/dll/wmove.pyc
-libexec/ninix/ninix/dll/aya.pyc
-libexec/ninix/ninix/dll/hanayu.pyc
+libexec/ninix/ninix/dll/mciaudior.py
 libexec/ninix/ninix/dll/mciaudior.pyc
+libexec/ninix/ninix/dll/misaka.py
 libexec/ninix/ninix/dll/misaka.pyc
+libexec/ninix/ninix/dll/niseshiori.py
 libexec/ninix/ninix/dll/niseshiori.pyc
-libexec/ninix/ninix/dll/satori.pyc
+libexec/ninix/ninix/dll/osuwari.py
+libexec/ninix/ninix/dll/osuwari.pyc
 libexec/ninix/ninix/dll/saori_cpuid.py
 libexec/ninix/ninix/dll/saori_cpuid.pyc
+libexec/ninix/ninix/dll/satori.py
+libexec/ninix/ninix/dll/satori.pyc
 libexec/ninix/ninix/dll/ssu.py
 libexec/ninix/ninix/dll/ssu.pyc
-libexec/ninix/ninix/dll/aya5.py
-libexec/ninix/ninix/dll/aya5.pyc
-libexec/ninix/ninix/dll/yaya.py
-libexec/ninix/ninix/dll/yaya.pyc
-libexec/ninix/ninix/dll/osuwari.py
-libexec/ninix/ninix/dll/osuwari.pyc
-libexec/ninix/ninix/dll/httpc.py
-libexec/ninix/ninix/dll/httpc.pyc
+libexec/ninix/ninix/dll/textcopy.py
+libexec/ninix/ninix/dll/textcopy.pyc
 libexec/ninix/ninix/dll/win_dll.py
 libexec/ninix/ninix/dll/win_dll.pyc
-libexec/ninix/ninix/dll/gomi.py
-libexec/ninix/ninix/dll/gomi.pyc
-libexec/ninix/ninix/__init__.py
-libexec/ninix/ninix/alias.py
-libexec/ninix/ninix/balloon.py
-libexec/ninix/ninix/communicate.py
-libexec/ninix/ninix/config.py
-libexec/ninix/ninix/dll.py
+libexec/ninix/ninix/dll/wmove.py
+libexec/ninix/ninix/dll/wmove.pyc
+libexec/ninix/ninix/dll/yaya.py
+libexec/ninix/ninix/dll/yaya.pyc
 libexec/ninix/ninix/entry_db.py
+libexec/ninix/ninix/entry_db.pyc
 libexec/ninix/ninix/home.py
-libexec/ninix/ninix/install.py
-libexec/ninix/ninix/keymap.py
-libexec/ninix/ninix/kinoko.py
-libexec/ninix/ninix/makoto.py
-libexec/ninix/ninix/menu.py
-libexec/ninix/ninix/metamagic.py
-libexec/ninix/ninix/nekodorif.py
-libexec/ninix/ninix/ngm.py
-libexec/ninix/ninix/pix.py
-libexec/ninix/ninix/plugin.py
-libexec/ninix/ninix/prefs.py
-libexec/ninix/ninix/sakura.py
-libexec/ninix/ninix/script.py
-libexec/ninix/ninix/seriko.py
-libexec/ninix/ninix/sstp.py
-libexec/ninix/ninix/sstplib.py
-libexec/ninix/ninix/surface.py
-libexec/ninix/ninix/update.py
-libexec/ninix/ninix/version.py
-libexec/ninix/ninix/__init__.pyc
-libexec/ninix/ninix/alias.pyc
-libexec/ninix/ninix/balloon.pyc
-libexec/ninix/ninix/communicate.pyc
-libexec/ninix/ninix/config.pyc
-libexec/ninix/ninix/dll.pyc
 libexec/ninix/ninix/home.pyc
+libexec/ninix/ninix/install.py
 libexec/ninix/ninix/install.pyc
+libexec/ninix/ninix/keymap.py
 libexec/ninix/ninix/keymap.pyc
+libexec/ninix/ninix/kinoko.py
 libexec/ninix/ninix/kinoko.pyc
 libexec/ninix/ninix/lock.py
 libexec/ninix/ninix/lock.pyc
+libexec/ninix/ninix/makoto.py
 libexec/ninix/ninix/makoto.pyc
+libexec/ninix/ninix/menu.py
 libexec/ninix/ninix/menu.pyc
+libexec/ninix/ninix/metamagic.py
 libexec/ninix/ninix/metamagic.pyc
+libexec/ninix/ninix/nekodorif.py
 libexec/ninix/ninix/nekodorif.pyc
+libexec/ninix/ninix/ngm.py
 libexec/ninix/ninix/ngm.pyc
+libexec/ninix/ninix/pix.py
 libexec/ninix/ninix/pix.pyc
+libexec/ninix/ninix/plugin.py
 libexec/ninix/ninix/plugin.pyc
+libexec/ninix/ninix/prefs.py
 libexec/ninix/ninix/prefs.pyc
+libexec/ninix/ninix/sakura.py
 libexec/ninix/ninix/sakura.pyc
+libexec/ninix/ninix/script.py
+libexec/ninix/ninix/script.pyc
+libexec/ninix/ninix/seriko.py
 libexec/ninix/ninix/seriko.pyc
+libexec/ninix/ninix/sstp.py
 libexec/ninix/ninix/sstp.pyc
+libexec/ninix/ninix/sstplib.py
 libexec/ninix/ninix/sstplib.pyc
+libexec/ninix/ninix/surface.py
 libexec/ninix/ninix/surface.pyc
+libexec/ninix/ninix/update.py
 libexec/ninix/ninix/update.pyc
-libexec/ninix/ninix/entry_db.pyc
-libexec/ninix/ninix/script.pyc
+libexec/ninix/ninix/version.py
 libexec/ninix/ninix/version.pyc
 libexec/ninix/ninix_main.py
 libexec/ninix/ninix_main.pyc
-%%NLS%%share/locale/ja/LC_MESSAGES/ninix.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ninix.mo
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/saori.txt
-%%PORTDOCS%%%%DOCSDIR%%/kawari.txt
-%%PORTDOCS%%%%DOCSDIR%%/extension.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.ninix
-%%PORTDOCS%%%%DOCSDIR%%/README.ninix
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN_ISSUES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.ninix
+%%PORTDOCS%%%%DOCSDIR%%/TODO.ninix
+%%PORTDOCS%%%%DOCSDIR%%/extension.txt
+%%PORTDOCS%%%%DOCSDIR%%/kawari.txt
+%%PORTDOCS%%%%DOCSDIR%%/saori.txt
+%%NLS%%share/locale/ja/LC_MESSAGES/ninix.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ninix.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/ninix/ninix/dll
 @dirrm libexec/ninix/ninix