update tt-rss to 1.7.8

with feedback and ok landry@ sthen@
This commit is contained in:
rpe 2013-04-14 20:28:09 +00:00
parent c8a5256592
commit 99f354891f
5 changed files with 983 additions and 608 deletions

View File

@ -1,17 +1,18 @@
# $OpenBSD: Makefile,v 1.14 2013/03/11 11:44:50 espie Exp $
# $OpenBSD: Makefile,v 1.15 2013/04/14 20:28:09 rpe Exp $
COMMENT= webbased rss reader with standalone look and feel
DISTNAME= tt-rss-1.5.11
V= 1.7.8
DISTNAME= Tiny-Tiny-RSS-$V
PKGNAME= tt-rss-$V
CATEGORIES= www
REVISION = 1
HOMEPAGE= http://tt-rss.org/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}/download/
MASTER_SITES= https://github.com/gothfox/Tiny-Tiny-RSS/archive/${V}.tar.gz?dummy=/
NO_BUILD= Yes
NO_TEST= Yes
@ -21,12 +22,15 @@ PREFIX= /var/www
INSTDIR= ${PREFIX}/tt-rss
SUBST_VARS= INSTDIR MODPHP_BIN
MODULES= lang/php
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-pgsql \
lang/php/${MODPHP_VERSION},-curl \
lang/php/${MODPHP_VERSION},-xmlrpc
MODULES= lang/php
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-pgsql \
lang/php/${MODPHP_VERSION},-curl \
lang/php/${MODPHP_VERSION},-xmlrpc
WRKDIST= ${WRKDIR}/Tiny-Tiny-RSS-$V
do-install:
find ${WRKDIST}/lib/ -name '*.js.uncompressed.js' -exec rm {} +
cp -Rp ${WRKDIST} ${INSTDIR}
${SUBST_CMD} ${INSTDIR}/{update.php,config.php-dist}
rm -Rf ${INSTDIR}/{*.{beforesubst,orig},.*,debian}

View File

@ -1,2 +1,2 @@
SHA256 (tt-rss-1.5.11.tar.gz) = Oj7b/lmwjqV9Mive6wa+GXAibIVGkVQnU9wS8Pyeh24=
SIZE (tt-rss-1.5.11.tar.gz) = 2755392
SHA256 (Tiny-Tiny-RSS-1.7.8.tar.gz) = XlptgqES60glm3MyB8GKcYwzgDjDPsj/yHiV1X4F88s=
SIZE (Tiny-Tiny-RSS-1.7.8.tar.gz) = 2391937

View File

@ -1,9 +1,18 @@
$OpenBSD: patch-update_php,v 1.1 2012/03/15 09:50:23 landry Exp $
--- update.php.orig Wed Mar 14 19:01:19 2012
+++ update.php Wed Mar 14 19:01:36 2012
$OpenBSD: patch-update_php,v 1.2 2013/04/14 20:28:09 rpe Exp $
--- update.php.orig Sat Mar 23 07:56:48 2013
+++ update.php Tue Apr 2 00:47:41 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/php
-#!/usr/bin/env php
+#!${MODPHP_BIN}
<?php
set_include_path(get_include_path() . PATH_SEPARATOR .
dirname(__FILE__) . "/include");
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
@@ -15,7 +15,7 @@
require_once "db-prefs.php";
if (!defined('PHP_EXECUTABLE'))
- define('PHP_EXECUTABLE', '/usr/bin/php');
+ define('PHP_EXECUTABLE', '${MODPHP_BIN}');
// Create a database connection.
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: tt_rss_update.rc,v 1.4 2012/08/25 11:41:46 ajacoutot Exp $
# $OpenBSD: tt_rss_update.rc,v 1.5 2013/04/14 20:28:09 rpe Exp $
daemon="${INSTDIR}/update.php -daemon"
daemon="${INSTDIR}/update.php --daemon"
daemon_user="www"
. /etc/rc.d/rc.subr