- Update to version 3.1.0 [1]

- Respect CFLAGS during build

PR:		201939 [1]
Submitted by:	IWAMOTO Kouichi (maintainer) [1]
This commit is contained in:
Pawel Pekala 2015-08-10 21:44:39 +00:00
parent a3a31d5ee7
commit aaa0d73cfc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=393911
3 changed files with 23 additions and 15 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= sayaka PORTNAME= sayaka
PORTVERSION= 3.0.9 PORTVERSION= 3.1.0
CATEGORIES= net-im CATEGORIES= net-im
MAINTAINER= sue@iwmt.org MAINTAINER= sue@iwmt.org
@ -15,7 +15,7 @@ RUN_DEPENDS= curl:${PORTSDIR}/ftp/curl \
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= isaki68k 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 USE_PHP= curl filter hash json mbstring pcntl pdo pdo_sqlite sqlite3
WANT_PHP_CLI= yes WANT_PHP_CLI= yes
@ -30,13 +30,18 @@ PORTDATA= OAuth.php \
subr.php \ subr.php \
twitteroauth.php twitteroauth.php
NO_BUILD= yes ALL_TARGET= cellsize
post-patch: 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: do-install:
${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka ${INSTALL_SCRIPT} ${WRKSRC}/sayaka.sh ${STAGEDIR}${PREFIX}/bin/sayaka
${INSTALL_PROGRAM} ${WRKSRC}/cellsize ${STAGEDIR}${PREFIX}/bin/cellsize
${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}
.for f in ${PORTDATA} .for f in ${PORTDATA}
${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DATADIR}

View File

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

View File

@ -1,6 +1,6 @@
--- sayaka.sh.orig 2015-06-14 09:43:42 UTC --- sayaka.sh.orig 2015-07-26 15:58:13.000000000 +0900
+++ sayaka.sh +++ sayaka.sh 2015-07-28 14:15:42.646976000 +0900
@@ -27,9 +27,26 @@ @@ -27,11 +27,29 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # SUCH DAMAGE.
@ -8,6 +8,7 @@
+: ${SAYAKA_HOME:=${HOME}/.sayaka} +: ${SAYAKA_HOME:=${HOME}/.sayaka}
#SAYAKA_HOME=. #SAYAKA_HOME=.
+BINDIR=@@BINDIR@@
+DATADIR=@@DATADIR@@ +DATADIR=@@DATADIR@@
+ +
+die() { +die() {
@ -15,16 +16,18 @@
+ exit 1 + exit 1
+} +}
+ +
+mklinks() { +checklinks() {
+ mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}." + for f in ${BINDIR}/cellsize ${DATADIR}/*.php ${DATADIR}/*.png; do
+ cd $SAYAKA_HOME + [ -L ${f##*/} ] || ln -s $f .
+ for f in ${DATADIR}/*.php ${DATADIR}/*.png; do
+ ln -s $f .
+ done + done
+} +}
+ +
+[ -d $SAYAKA_HOME ] || mklinks +[ -d $SAYAKA_HOME ] || mkdir $SAYAKA_HOME || die "Can't create ${SAYAKA_HOME}."
+ +
cd $SAYAKA_HOME cd $SAYAKA_HOME
+checklinks
+
cmd=$1 cmd=$1
[ $# -ne 0 ] && shift
case $cmd in