4 files changed, 47 insertions, 40 deletions

diff --git a/games/ninix-aya/Makefile b/games/ninix-aya/Makefile
index f5b13347df8f..2197281f8a8f 100644
--- a/games/ninix-aya/Makefile
+++ b/games/ninix-aya/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ninix-aya
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	ninix-aya/46821
+MASTER_SITE_SUBDIR=	ninix-aya/47201
 DISTNAME=	ninix-aya-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
@@ -32,4 +32,32 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/ninix
+.endif
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.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 defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/docdir)$$/d' \
+		${WRKSRC}/Makefile
+.endif
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e '/localedir/d' \
+		${WRKSRC}/Makefile
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/games/ninix-aya/distinfo b/games/ninix-aya/distinfo
index 69db3c7b6f61..5a2051fc3680 100644
--- a/games/ninix-aya/distinfo
+++ b/games/ninix-aya/distinfo
@@ -1,3 +1,3 @@
-MD5 (ninix-aya-4.0.4.tgz) = e3d16893d5e40444cfe0bca348f2dec7
-SHA256 (ninix-aya-4.0.4.tgz) = 6a197c2cab6ec99539f3ca56e4f4975eec00e0cf78d45d338c73683cfda2dcc1
-SIZE (ninix-aya-4.0.4.tgz) = 295337
+MD5 (ninix-aya-4.0.5.tgz) = ffc4d76fbcfca8e48baebeefe86cbae0
+SHA256 (ninix-aya-4.0.5.tgz) = de3eacc64b9321f3ff64f83afd09ae5936559cba7ab979f8fba447c37c50530c
+SIZE (ninix-aya-4.0.5.tgz) = 298340
diff --git a/games/ninix-aya/files/patch-aa b/games/ninix-aya/files/patch-aa
deleted file mode 100644
index 954a62af2257..000000000000
--- a/games/ninix-aya/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	Fri Jul 18 11:00:52 2003
-+++ Makefile	Sat Dec  6 20:01:12 2003
-@@ -4,14 +4,14 @@
- #  $Id: Makefile,v 1.6 2003/07/18 02:00:52 shy Exp $
- #
- 
--prefix = /opt/ninix-aya
-+prefix = $(PREFIX)
- 
--exec_libdir = $(prefix)/lib/ninix
-+exec_libdir = $(prefix)/libexec/ninix
- 
--bindir = $(DESTDIR)$(prefix)/bin
--docdir = $(DESTDIR)$(prefix)/doc
--libdir = $(DESTDIR)$(exec_libdir)
--localedir = $(DESTDIR)$(prefix)/share/locale
-+bindir = $(prefix)/bin
-+docdir = $(prefix)/share/doc/ninix
-+libdir = $(exec_libdir)
-+localedir = $(prefix)/share/locale
- 
- python = python
- 
diff --git a/games/ninix-aya/pkg-plist b/games/ninix-aya/pkg-plist
index 0853e43a6fb2..b32600ea6d4a 100644
--- a/games/ninix-aya/pkg-plist
+++ b/games/ninix-aya/pkg-plist
@@ -52,6 +52,7 @@ libexec/ninix/ninix/menu.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
@@ -75,6 +76,7 @@ libexec/ninix/ninix/makoto.pyc
 libexec/ninix/ninix/nekodorif.pyc
 libexec/ninix/ninix/ngm.pyc
 libexec/ninix/ninix/pix.pyc
+libexec/ninix/ninix/plugin.pyc
 libexec/ninix/ninix/prefs.pyc
 libexec/ninix/ninix/sakura.pyc
 libexec/ninix/ninix/seriko.pyc
@@ -88,17 +90,17 @@ libexec/ninix/sstplib.py
 libexec/ninix/ninix-install.py
 libexec/ninix/ninix-install.pyc
 libexec/ninix/sstplib.pyc
-share/locale/ja/LC_MESSAGES/ninix.mo
-share/locale/zh_TW/LC_MESSAGES/ninix.mo
-share/doc/ninix/README
-share/doc/ninix/COPYING
-share/doc/ninix/saori.txt
-share/doc/ninix/kawari.txt
-share/doc/ninix/extension.txt
-share/doc/ninix/TODO.ninix
-share/doc/ninix/README.ninix
-share/doc/ninix/ChangeLog
-@dirrm share/doc/ninix
+%%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%%@dirrm %%DOCSDIR%%
 @dirrm libexec/ninix/ninix/dll
 @dirrm libexec/ninix/ninix
 @dirrm libexec/ninix