aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpawel <pawel@FreeBSD.org>2015-08-11 05:44:39 +0800
committerpawel <pawel@FreeBSD.org>2015-08-11 05:44:39 +0800
commitdde59ca80db5df04c8c7d482adcc13cda4e141da (patch)
treebf1b837bfdc2ba5e9eb44063049c0b88d59838ad
parentb5bbc15523f4e65db198ac88dd6107694e6f4ff8 (diff)
downloadfreebsd-ports-gnome-dde59ca80db5df04c8c7d482adcc13cda4e141da.tar.gz
freebsd-ports-gnome-dde59ca80db5df04c8c7d482adcc13cda4e141da.tar.zst
freebsd-ports-gnome-dde59ca80db5df04c8c7d482adcc13cda4e141da.zip
- Update to version 3.1.0 [1]
- Respect CFLAGS during build PR: 201939 [1] Submitted by: IWAMOTO Kouichi (maintainer) [1]
-rw-r--r--net-im/sayaka/Makefile13
-rw-r--r--net-im/sayaka/distinfo4
-rw-r--r--net-im/sayaka/files/patch-sayaka.sh21
3 files changed, 23 insertions, 15 deletions
diff --git a/net-im/sayaka/Makefile b/net-im/sayaka/Makefile
index 75ede0d48c16..e15b5e4f8f0a 100644
--- a/net-im/sayaka/Makefile
+++ b/net-im/sayaka/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sayaka
-PORTVERSION= 3.0.9
+PORTVERSION= 3.1.0
CATEGORIES= net-im
MAINTAINER= sue@iwmt.org
@@ -15,7 +15,7 @@ RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \
USE_GITHUB= yes
GH_ACCOUNT= isaki68k
-PLIST_FILES= bin/sayaka
+PLIST_FILES= bin/sayaka bin/cellsize
USE_PHP= curl filter hash json mbstring pcntl pdo pdo_sqlite sqlite3
WANT_PHP_CLI= yes
@@ -30,13 +30,18 @@ PORTDATA= OAuth.php \
subr.php \
twitteroauth.php
-NO_BUILD= yes
+ALL_TARGET= cellsize
post-patch:
- @${REINPLACE_CMD} -e 's|@@DATADIR@@|${DATADIR}|g' ${WRKSRC}/sayaka.sh
+ @${REINPLACE_CMD} -e \
+ 's|@@DATADIR@@|${DATADIR}|g ; \
+ s|@@BINDIR@@|${PREFIX}/bin|g' \
+ ${WRKSRC}/sayaka.sh
+ @${REINPLACE_CMD} 's|-O2|${CFLAGS}|' ${WRKSRC}/Makefile
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka
+ ${INSTALL_PROGRAM} ${WRKSRC}/cellsize ${STAGEDIR}${PREFIX}/bin/cellsize
${MKDIR} ${STAGEDIR}${DATADIR}
.for f in ${PORTDATA}
${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}
diff --git a/net-im/sayaka/distinfo b/net-im/sayaka/distinfo
index b89eaf120ef5..76b6a9ab3212 100644
--- a/net-im/sayaka/distinfo
+++ b/net-im/sayaka/distinfo
@@ -1,2 +1,2 @@
-SHA256 (isaki68k-sayaka-3.0.9_GH0.tar.gz) = 0b5673b1e8e28a884c0efe1f6e09bfc2a715f20cba592dad93b5f4bae8ca9865
-SIZE (isaki68k-sayaka-3.0.9_GH0.tar.gz) = 40350
+SHA256 (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 662237cc2d06ba46f4c1e80488274cd80b26f44a6582e2773f83d3ac55674401
+SIZE (isaki68k-sayaka-3.1.0_GH0.tar.gz) = 42303
diff --git a/net-im/sayaka/files/patch-sayaka.sh b/net-im/sayaka/files/patch-sayaka.sh
index cfe7c536c4c0..9a953c86804d 100644
--- a/net-im/sayaka/files/patch-sayaka.sh
+++ b/net-im/sayaka/files/patch-sayaka.sh
@@ -1,6 +1,6 @@
---- sayaka.sh.orig 2015-06-14 09:43:42 UTC
-+++ sayaka.sh
-@@ -27,9 +27,26 @@
+--- 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.
@@ -8,6 +8,7 @@
+: ${SAYAKA_HOME:=${HOME}/.sayaka}
#SAYAKA_HOME=.
++BINDIR=@@BINDIR@@
+DATADIR=@@DATADIR@@
+
+die() {
@@ -15,16 +16,18 @@
+ exit 1
+}
+
-+mklinks() {
-+ mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}."
-+ cd $SAYAKA_HOME
-+ for f in ${DATADIR}/*.php ${DATADIR}/*.png; do
-+ ln -s $f .
++checklinks() {
++ for f in ${BINDIR}/cellsize ${DATADIR}/*.php ${DATADIR}/*.png; do
++ [ -L ${f##*/} ] || ln -s $f .
+ done
+}
+
-+[ -d $SAYAKA_HOME ] || mklinks
++[ -d $SAYAKA_HOME ] || mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}."
+
cd $SAYAKA_HOME
++checklinks
++
cmd=$1
+ [ $# -ne 0 ] && shift
+ case $cmd in