Attachment #194946 for bug #228241

Lines 2-11 Link Here

(-)Makefile (-54 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ninix-aya	4	PORTNAME= ninix-aya
5	PORTVERSION= 4.4	5	PORTVERSION= 5.0.6
6	PORTREVISION= 6
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= OSDN/${PORTNAME}/58500	7	MASTER_SITES= OSDN/${PORTNAME}/69796
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Desktop mascot program compatible with "Ukagaka"	10	COMMENT= Desktop mascot program compatible with "Ukagaka"
Lines 13-70 Link Here
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	LIB_DEPENDS= libpng.so:graphics/png	15	RUN_DEPENDS= rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \	16	rubygem-gstreamer>=3.1.8:multimedia/rubygem-gstreamer \
18	${PYNUMPY}	17	rubygem-gettext>=3.2.2:devel/rubygem-gettext \
		18	rubygem-gtk3>=3.1.8:x11-toolkits/rubygem-gtk3 \
		19	rubygem-narray>=0.6.1.1:math/rubygem-narray \
		20	rubygem-rubyzip>=1.2.1:archivers/rubygem-rubyzip
19		21
20	NO_ARCH= yes	22	NO_ARCH= yes
		23	PORTDOCS= COPYING ChangeLog README README.ninix SAORI
		24	USES= gettext tar:tgz
		25	USE_RUBY= yes
21		26
22	USES= gmake python:2.7 tar:tgz
23	USE_GNOME= pygtk2
24	USE_GSTREAMER= python
25
26	DOCSDIR= ${PREFIX}/share/doc/ninix
27
28	OPTIONS_DEFINE= DOCS NLS
29	OPTIONS_SUB= yes
30
31	NLS_USES= gettext
32
33	.include <bsd.port.options.mk>
34
35	do-build:
36	@(cd ${WRKSRC}/bin && ${SED} -e \
37	's\|@python\|${PYTHON_CMD}\| ; \
38	s\|@libdir\|${PREFIX}/libexec/ninix\|' ninix.in > ninix)
39	.if ${PORT_OPTIONS:MNLS}
40	.for i in ja zh_TW
41	(cd ${WRKSRC}/locale && ${LOCALBASE}/bin/msgfmt -o ${i}.mo ${i}.po)
42	.endfor
43	.endif
44
45	do-install:
46	(cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ninix \
47	${STAGEDIR}${PREFIX}/bin)
48	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ninix
49	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . \
50	${STAGEDIR}${PREFIX}/libexec/ninix)
51	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
52	-d ${PREFIX}/libexec/ninix -f libexec/ninix)
53	.if ${PORT_OPTIONS:MNLS}
54	.for i in ja zh_TW
55	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
56	(cd ${WRKSRC}/locale && ${INSTALL_DATA} ${i}.mo \
57	${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/ninix.mo)
58	.endfor
59	.endif
60	@${MKDIR} ${STAGEDIR}${DOCSDIR}
61	.for i in ChangeLog README README.ninix TODO.ninix KNOWN_ISSUES
62	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
63	${STAGEDIR}${DOCSDIR})
64	.endfor
65	.for i in extension.txt kawari.txt saori.txt
66	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} \
67	${STAGEDIR}${DOCSDIR})
68	.endfor
69
70	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (ninix-aya-4.4.tgz) = f6cdf0f540af52c31c8736df9e5dbca465131a89654190612fac7b24f5adefac	1	TIMESTAMP = 1531018180
2	SIZE (ninix-aya-4.4.tgz) = 335511	2	SHA256 (ninix-aya-5.0.6.tgz) = ca98e357c5be8764e640a6e3043b2a966a6316118de51e37c3a2c3813132b139
		3	SIZE (ninix-aya-5.0.6.tgz) = 323279




--- Makefile.orig	2018-01-07 07:10:36 UTC
+++ Makefile
@@ -2,22 +2,26 @@
 #  Makefile for ninix-aya
 #
 
-prefix = /opt/ninix-aya
+prefix ?= ${PREFIX}
 
 exec_libdir = $(prefix)/lib
 
 bindir = $(DESTDIR)$(prefix)/bin
-docdir = $(DESTDIR)$(prefix)/doc
-libdir = $(DESTDIR)$(exec_libdir)
-localedir = /usr/local/share/locale # system specific
+docdir = $(DESTDIR)$(prefix)/share/doc/ninix-aya
+libdir = $(DESTDIR)$(exec_libdir)/ninix
+localedir = $(DESTDIR)$(prefix)/share/locale # system specific
 
-shiori_so_dir = $(DESTDIR)$(prefix)/lib/kawari8:$(DESTDIR)$(prefix)/lib/yaya
+shiori_so_dir = $(prefix)/lib/kawari8:$(prefix)/lib/yaya
 
 ruby = ruby
 
 NINIX = ninix
 
+sed_dirs = sed -e "s,@ruby,$(ruby),g" -e "s,@libdir,$(libdir),g" -e "s,@so_path,$(shiori_so_dir),g"
+
 all:
+	$(sed_dirs) bin/ninix.in         > bin/ninix
+	msgfmt po/ja/ninix-aya.po -o po/ja/ninix-aya.mo
 
 install: install-lib install-bin install-doc
 
@@ -25,13 +29,10 @@ install-lib:
 	mkdir -p $(libdir)
 	cp -r lib/* $(libdir)
 	mkdir -p $(localedir)/ja/LC_MESSAGES
-	(cd po/ja ; msgfmt ninix-aya.po -o $(localedir)/ja/LC_MESSAGES/ninix-aya.mo)
-
-sed_dirs = sed -e "s,@ruby,$(ruby),g" -e "s,@libdir,$(libdir),g" -e "s,@so_path,$(shiori_so_dir),g"
+	cp po/ja/ninix-aya.mo $(localedir)/ja/LC_MESSAGES
 
 install-bin:
 	mkdir -p $(bindir)
-	$(sed_dirs) bin/ninix.in         > bin/ninix
 	install -m 755 bin/ninix         $(bindir)/$(NINIX)
 
 install-doc:




bin/ninix
lib/ninix/ninix/alias.rb
lib/ninix/ninix/balloon.rb
lib/ninix/ninix/communicate.rb
lib/ninix/ninix/config.rb
lib/ninix/ninix/dll.rb
lib/ninix/ninix/dll/aya.rb
lib/ninix/ninix/dll/aya5.rb
lib/ninix/ninix/dll/bln.rb
lib/ninix/ninix/dll/gomi.rb
lib/ninix/ninix/dll/hanayu.rb
lib/ninix/ninix/dll/httpc.rb
lib/ninix/ninix/dll/kawari.rb
lib/ninix/ninix/dll/kawari8.rb
lib/ninix/ninix/dll/mciaudio.rb
lib/ninix/ninix/dll/mciaudior.rb
lib/ninix/ninix/dll/misaka.rb
lib/ninix/ninix/dll/niseshiori.rb
lib/ninix/ninix/dll/osuwari.rb
lib/ninix/ninix/dll/saori_cpuid.rb
lib/ninix/ninix/dll/satori.rb
lib/ninix/ninix/dll/ssu.rb
lib/ninix/ninix/dll/textcopy.rb
lib/ninix/ninix/dll/wmove.rb
lib/ninix/ninix/dll/yaya.rb
lib/ninix/ninix/entry_db.rb
lib/ninix/ninix/home.rb
lib/ninix/ninix/install.rb
lib/ninix/ninix/keymap.rb
lib/ninix/ninix/kinoko.rb
lib/ninix/ninix/lock.rb
lib/ninix/ninix/logging.rb
lib/ninix/ninix/makoto.rb
lib/ninix/ninix/menu.rb
lib/ninix/ninix/metamagic.rb
lib/ninix/ninix/nekodorif.rb
lib/ninix/ninix/ngm.rb
lib/ninix/ninix/pix.rb
lib/ninix/ninix/prefs.rb
lib/ninix/ninix/sakura.rb
lib/ninix/ninix/script.rb
lib/ninix/ninix/seriko.rb
lib/ninix/ninix/sstp.rb
lib/ninix/ninix/sstplib.rb
lib/ninix/ninix/surface.rb
lib/ninix/ninix/update.rb
lib/ninix/ninix/version.rb
lib/ninix/ninix_main.rb
share/locale/ja/LC_MESSAGES/ninix-aya.mo
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/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/version.py
libexec/ninix/ninix/version.pyc
libexec/ninix/ninix_main.py
libexec/ninix/ninix_main.pyc
%%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

Return to bug 228241

Line 0 Link Here

(-)files/patch-Makefile (+49 lines)
	1	--- Makefile.orig 2018-01-07 07:10:36 UTC
	2	+++ Makefile
	3	@@ -2,22 +2,26 @@
	4	# Makefile for ninix-aya
	5	#
	6
	7	-prefix = /opt/ninix-aya
	8	+prefix ?= ${PREFIX}
	9
	10	exec_libdir = $(prefix)/lib
	11
	12	bindir = $(DESTDIR)$(prefix)/bin
	13	-docdir = $(DESTDIR)$(prefix)/doc
	14	-libdir = $(DESTDIR)$(exec_libdir)
	15	-localedir = /usr/local/share/locale # system specific
	16	+docdir = $(DESTDIR)$(prefix)/share/doc/ninix-aya
	17	+libdir = $(DESTDIR)$(exec_libdir)/ninix
	18	+localedir = $(DESTDIR)$(prefix)/share/locale # system specific
	19
	20	-shiori_so_dir = $(DESTDIR)$(prefix)/lib/kawari8:$(DESTDIR)$(prefix)/lib/yaya
	21	+shiori_so_dir = $(prefix)/lib/kawari8:$(prefix)/lib/yaya
	22
	23	ruby = ruby
	24
	25	NINIX = ninix
	26
	27	+sed_dirs = sed -e "s,@ruby,$(ruby),g" -e "s,@libdir,$(libdir),g" -e "s,@so_path,$(shiori_so_dir),g"
	28	+
	29	all:
	30	+ $(sed_dirs) bin/ninix.in > bin/ninix
	31	+ msgfmt po/ja/ninix-aya.po -o po/ja/ninix-aya.mo
	32
	33	install: install-lib install-bin install-doc
	34
	35	@@ -25,13 +29,10 @@ install-lib:
	36	mkdir -p $(libdir)
	37	cp -r lib/* $(libdir)
	38	mkdir -p $(localedir)/ja/LC_MESSAGES
	39	- (cd po/ja ; msgfmt ninix-aya.po -o $(localedir)/ja/LC_MESSAGES/ninix-aya.mo)
	40	-
	41	-sed_dirs = sed -e "s,@ruby,$(ruby),g" -e "s,@libdir,$(libdir),g" -e "s,@so_path,$(shiori_so_dir),g"
	42	+ cp po/ja/ninix-aya.mo $(localedir)/ja/LC_MESSAGES
	43
	44	install-bin:
	45	mkdir -p $(bindir)
	46	- $(sed_dirs) bin/ninix.in > bin/ninix
	47	install -m 755 bin/ninix $(bindir)/$(NINIX)
	48
	49	install-doc:

Lines 1-109 Link Here

(-)pkg-plist (-108 / +48 lines)
1	bin/ninix	1	bin/ninix
2	libexec/ninix/ninix/__init__.py	2	lib/ninix/ninix/alias.rb
3	libexec/ninix/ninix/__init__.pyc	3	lib/ninix/ninix/balloon.rb
4	libexec/ninix/ninix/alias.py	4	lib/ninix/ninix/communicate.rb
5	libexec/ninix/ninix/alias.pyc	5	lib/ninix/ninix/config.rb
6	libexec/ninix/ninix/balloon.py	6	lib/ninix/ninix/dll.rb
7	libexec/ninix/ninix/balloon.pyc	7	lib/ninix/ninix/dll/aya.rb
8	libexec/ninix/ninix/communicate.py	8	lib/ninix/ninix/dll/aya5.rb
9	libexec/ninix/ninix/communicate.pyc	9	lib/ninix/ninix/dll/bln.rb
10	libexec/ninix/ninix/config.py	10	lib/ninix/ninix/dll/gomi.rb
11	libexec/ninix/ninix/config.pyc	11	lib/ninix/ninix/dll/hanayu.rb
12	libexec/ninix/ninix/dll.py	12	lib/ninix/ninix/dll/httpc.rb
13	libexec/ninix/ninix/dll.pyc	13	lib/ninix/ninix/dll/kawari.rb
14	libexec/ninix/ninix/dll/aya.py	14	lib/ninix/ninix/dll/kawari8.rb
15	libexec/ninix/ninix/dll/aya.pyc	15	lib/ninix/ninix/dll/mciaudio.rb
16	libexec/ninix/ninix/dll/aya5.py	16	lib/ninix/ninix/dll/mciaudior.rb
17	libexec/ninix/ninix/dll/aya5.pyc	17	lib/ninix/ninix/dll/misaka.rb
18	libexec/ninix/ninix/dll/bln.py	18	lib/ninix/ninix/dll/niseshiori.rb
19	libexec/ninix/ninix/dll/bln.pyc	19	lib/ninix/ninix/dll/osuwari.rb
20	libexec/ninix/ninix/dll/gomi.py	20	lib/ninix/ninix/dll/saori_cpuid.rb
21	libexec/ninix/ninix/dll/gomi.pyc	21	lib/ninix/ninix/dll/satori.rb
22	libexec/ninix/ninix/dll/hanayu.py	22	lib/ninix/ninix/dll/ssu.rb
23	libexec/ninix/ninix/dll/hanayu.pyc	23	lib/ninix/ninix/dll/textcopy.rb
24	libexec/ninix/ninix/dll/httpc.py	24	lib/ninix/ninix/dll/wmove.rb
25	libexec/ninix/ninix/dll/httpc.pyc	25	lib/ninix/ninix/dll/yaya.rb
26	libexec/ninix/ninix/dll/kawari.py	26	lib/ninix/ninix/entry_db.rb
27	libexec/ninix/ninix/dll/kawari.pyc	27	lib/ninix/ninix/home.rb
28	libexec/ninix/ninix/dll/kawari8.py	28	lib/ninix/ninix/install.rb
29	libexec/ninix/ninix/dll/kawari8.pyc	29	lib/ninix/ninix/keymap.rb
30	libexec/ninix/ninix/dll/mciaudio.py	30	lib/ninix/ninix/kinoko.rb
31	libexec/ninix/ninix/dll/mciaudio.pyc	31	lib/ninix/ninix/lock.rb
32	libexec/ninix/ninix/dll/mciaudior.py	32	lib/ninix/ninix/logging.rb
33	libexec/ninix/ninix/dll/mciaudior.pyc	33	lib/ninix/ninix/makoto.rb
34	libexec/ninix/ninix/dll/misaka.py	34	lib/ninix/ninix/menu.rb
35	libexec/ninix/ninix/dll/misaka.pyc	35	lib/ninix/ninix/metamagic.rb
36	libexec/ninix/ninix/dll/niseshiori.py	36	lib/ninix/ninix/nekodorif.rb
37	libexec/ninix/ninix/dll/niseshiori.pyc	37	lib/ninix/ninix/ngm.rb
38	libexec/ninix/ninix/dll/osuwari.py	38	lib/ninix/ninix/pix.rb
39	libexec/ninix/ninix/dll/osuwari.pyc	39	lib/ninix/ninix/prefs.rb
40	libexec/ninix/ninix/dll/saori_cpuid.py	40	lib/ninix/ninix/sakura.rb
41	libexec/ninix/ninix/dll/saori_cpuid.pyc	41	lib/ninix/ninix/script.rb
42	libexec/ninix/ninix/dll/satori.py	42	lib/ninix/ninix/seriko.rb
43	libexec/ninix/ninix/dll/satori.pyc	43	lib/ninix/ninix/sstp.rb
44	libexec/ninix/ninix/dll/ssu.py	44	lib/ninix/ninix/sstplib.rb
45	libexec/ninix/ninix/dll/ssu.pyc	45	lib/ninix/ninix/surface.rb
46	libexec/ninix/ninix/dll/textcopy.py	46	lib/ninix/ninix/update.rb
47	libexec/ninix/ninix/dll/textcopy.pyc	47	lib/ninix/ninix/version.rb
48	libexec/ninix/ninix/dll/win_dll.py	48	lib/ninix/ninix_main.rb
49	libexec/ninix/ninix/dll/win_dll.pyc	49	share/locale/ja/LC_MESSAGES/ninix-aya.mo
50	libexec/ninix/ninix/dll/wmove.py
51	libexec/ninix/ninix/dll/wmove.pyc
52	libexec/ninix/ninix/dll/yaya.py
53	libexec/ninix/ninix/dll/yaya.pyc
54	libexec/ninix/ninix/entry_db.py
55	libexec/ninix/ninix/entry_db.pyc
56	libexec/ninix/ninix/home.py
57	libexec/ninix/ninix/home.pyc
58	libexec/ninix/ninix/install.py
59	libexec/ninix/ninix/install.pyc
60	libexec/ninix/ninix/keymap.py
61	libexec/ninix/ninix/keymap.pyc
62	libexec/ninix/ninix/kinoko.py
63	libexec/ninix/ninix/kinoko.pyc
64	libexec/ninix/ninix/lock.py
65	libexec/ninix/ninix/lock.pyc
66	libexec/ninix/ninix/makoto.py
67	libexec/ninix/ninix/makoto.pyc
68	libexec/ninix/ninix/menu.py
69	libexec/ninix/ninix/menu.pyc
70	libexec/ninix/ninix/metamagic.py
71	libexec/ninix/ninix/metamagic.pyc
72	libexec/ninix/ninix/nekodorif.py
73	libexec/ninix/ninix/nekodorif.pyc
74	libexec/ninix/ninix/ngm.py
75	libexec/ninix/ninix/ngm.pyc
76	libexec/ninix/ninix/pix.py
77	libexec/ninix/ninix/pix.pyc
78	libexec/ninix/ninix/plugin.py
79	libexec/ninix/ninix/plugin.pyc
80	libexec/ninix/ninix/prefs.py
81	libexec/ninix/ninix/prefs.pyc
82	libexec/ninix/ninix/sakura.py
83	libexec/ninix/ninix/sakura.pyc
84	libexec/ninix/ninix/script.py
85	libexec/ninix/ninix/script.pyc
86	libexec/ninix/ninix/seriko.py
87	libexec/ninix/ninix/seriko.pyc
88	libexec/ninix/ninix/sstp.py
89	libexec/ninix/ninix/sstp.pyc
90	libexec/ninix/ninix/sstplib.py
91	libexec/ninix/ninix/sstplib.pyc
92	libexec/ninix/ninix/surface.py
93	libexec/ninix/ninix/surface.pyc
94	libexec/ninix/ninix/update.py
95	libexec/ninix/ninix/update.pyc
96	libexec/ninix/ninix/version.py
97	libexec/ninix/ninix/version.pyc
98	libexec/ninix/ninix_main.py
99	libexec/ninix/ninix_main.pyc
100	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
101	%%PORTDOCS%%%%DOCSDIR%%/KNOWN_ISSUES
102	%%PORTDOCS%%%%DOCSDIR%%/README
103	%%PORTDOCS%%%%DOCSDIR%%/README.ninix
104	%%PORTDOCS%%%%DOCSDIR%%/TODO.ninix
105	%%PORTDOCS%%%%DOCSDIR%%/extension.txt
106	%%PORTDOCS%%%%DOCSDIR%%/kawari.txt
107	%%PORTDOCS%%%%DOCSDIR%%/saori.txt
108	%%NLS%%share/locale/ja/LC_MESSAGES/ninix.mo
109	%%NLS%%share/locale/zh_TW/LC_MESSAGES/ninix.mo