Attachment #159332 for bug #201939

View | Details | Raw Unified | Return to bug 201939
Collapse All | Expand All

Lines 1-7 Link Here

(-)Makefile (-4 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= sayaka	3	PORTNAME= sayaka
4	PORTVERSION= 3.0.9	4	PORTVERSION= 3.1.0
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6		6
7	MAINTAINER= sue@iwmt.org	7	MAINTAINER= sue@iwmt.org
Lines 15-21 Link Here
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= isaki68k	16	GH_ACCOUNT= isaki68k
17		17
18	PLIST_FILES= bin/sayaka	18	PLIST_FILES= bin/sayaka bin/cellsize
19		19
20	USE_PHP= curl filter hash json mbstring pcntl pdo pdo_sqlite sqlite3	20	USE_PHP= curl filter hash json mbstring pcntl pdo pdo_sqlite sqlite3
21	WANT_PHP_CLI= yes	21	WANT_PHP_CLI= yes
Lines 30-42 Link Here
30	subr.php \	30	subr.php \
31	twitteroauth.php	31	twitteroauth.php
32		32
33	NO_BUILD= yes	33	ALL_TARGET= cellsize
34		34
35	post-patch:	35	post-patch:
36	@${REINPLACE_CMD} -e 's\|@@DATADIR@@\|${DATADIR}\|g' ${WRKSRC}/sayaka.sh	36	@${REINPLACE_CMD} -e \
		37	's\|@@DATADIR@@\|${DATADIR}\|g ; \
		38	s\|@@BINDIR@@\|${PREFIX}/bin\|g' \
		39	${WRKSRC}/sayaka.sh
37		40
38	do-install:	41	do-install:
39	${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka	42	${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka
		43	${INSTALL_PROGRAM} ${WRKSRC}/cellsize ${STAGEDIR}${PREFIX}/bin/cellsize
40	${MKDIR} ${STAGEDIR}${DATADIR}	44	${MKDIR} ${STAGEDIR}${DATADIR}
41	.for f in ${PORTDATA}	45	.for f in ${PORTDATA}
42	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}	46	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (isaki68k-sayaka-3.0.9_GH0.tar.gz) = 0b5673b1e8e28a884c0efe1f6e09bfc2a715f20cba592dad93b5f4bae8ca9865	1	SHA256 (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 662237cc2d06ba46f4c1e80488274cd80b26f44a6582e2773f83d3ac55674401
2	SIZE (isaki68k-sayaka-3.0.9_GH0.tar.gz) = 40350	2	SIZE (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 42303




--- sayaka.sh.orig	2015-07-26 15:58:13.000000000 +0900
+++ sayaka.sh	2015-07-28 14:15:42.646976000 +0900
@@ -27,11 +27,29 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 

+: ${SAYAKA_HOME:=${HOME}/.sayaka}
 #SAYAKA_HOME=.
 
+BINDIR=@@BINDIR@@
+DATADIR=@@DATADIR@@
+
+die() {

+	exit 1
+}
+
+checklinks() {
+	for f in ${BINDIR}/cellsize ${DATADIR}/*.php ${DATADIR}/*.png; do
+		[ -L ${f##*/} ] || ln -s $f .
+	for f in ${DATADIR}/*.php ${DATADIR}/*.png; do
+		ln -s $f .
+	done
+}
+
+[ -d $SAYAKA_HOME ] || mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}."
+
 cd $SAYAKA_HOME
 
+checklinks
+
 cmd=$1
 [ $# -ne 0 ] && shift
 case $cmd in

Return to bug 201939

Lines 1-6 Link Here

(-)files/patch-sayaka.sh (-9 / +12 lines)
1	--- sayaka.sh.orig 2015-06-14 09:43:42 UTC	1	--- sayaka.sh.orig 2015-07-26 15:58:13.000000000 +0900
2	+++ sayaka.sh	2	+++ sayaka.sh 2015-07-28 14:15:42.646976000 +0900
3	@@ -27,9 +27,26 @@	3	@@ -27,11 +27,29 @@
4	# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	4	# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
5	# SUCH DAMAGE.	5	# SUCH DAMAGE.
6		6
Lines 8-13 Link Here
8	+: ${SAYAKA_HOME:=${HOME}/.sayaka}	8	+: ${SAYAKA_HOME:=${HOME}/.sayaka}
9	#SAYAKA_HOME=.	9	#SAYAKA_HOME=.
10		10
		11	+BINDIR=@@BINDIR@@
11	+DATADIR=@@DATADIR@@	12	+DATADIR=@@DATADIR@@
12	+	13	+
13	+die() {	14	+die() {
Lines 15-30 Link Here
15	+ exit 1	16	+ exit 1
16	+}	17	+}
17	+	18	+
18	+mklinks() {	19	+checklinks() {
19	+ mkdir $SAYAKA_HOME \|\| die "Can't create ${SAYAKA_HOME}."	20	+ for f in ${BINDIR}/cellsize ${DATADIR}/.php ${DATADIR}/.png; do
20	+ cd $SAYAKA_HOME	21	+ [ -L ${f##*/} ] \|\| ln -s $f .
21	+ for f in ${DATADIR}/.php ${DATADIR}/.png; do
22	+ ln -s $f .
23	+ done	22	+ done
24	+}	23	+}
25	+	24	+
26	+[ -d $SAYAKA_HOME ] \|\| mklinks	25	+[ -d $SAYAKA_HOME ] \|\| mkdir $SAYAKA_HOME \|\| die "Can't create ${SAYAKA_HOME}."
27	+	26	+
28	cd $SAYAKA_HOME	27	cd $SAYAKA_HOME
29		28
		29	+checklinks
		30	+
30	cmd=$1	31	cmd=$1
		32	[ $# -ne 0 ] && shift
		33	case $cmd in