Update to tt-rss 1.5.10

- remove dep on gtar
- patch config.php-dist & update.php to use MODPHP_BIN
- fix perms in PLIST, use @owner www for dirs where tt-rss writes
- switch MESSAGE to README, and improve the latter
- provide an rc script for the daemon updating the feeds

ok ajacoutot@

www/tt-rss/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2011/11/16 15:56:38 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2012/03/15 09:50:23 landry Exp $
 
 COMMENT=		webbased rss reader with standalone look and feel
 
-DISTNAME=		tt-rss-1.3.3
-REVISION=		3
+DISTNAME=		tt-rss-1.5.10
 CATEGORIES=		www
 
 HOMEPAGE=		http://tt-rss.org/
@@ -16,23 +15,23 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}/download/
 
-BUILD_DEPENDS=		archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 PKG_ARCH=		*
 
 PREFIX=			/var/www
 INSTDIR=		${PREFIX}/tt-rss/
-SUBST_VARS=		INSTDIR
+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
 
 do-install:
-	@cp -Rp ${WRKDIST} ${INSTDIR}
-	@chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
+	cp -Rp ${WRKDIST} ${INSTDIR}
+	${SUBST_CMD} ${INSTDIR}/{update.php,config.php-dist}
+	rm -Rf ${INSTDIR}/{*.{beforesubst,orig},.*,debian}
+	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 .include <bsd.port.mk>

www/tt-rss/distinfo

@@ -1,5 +1,5 @@
-MD5 (tt-rss-1.3.3.tar.gz) = xMuYf28ntErRjSpuFiNsPw==
-RMD160 (tt-rss-1.3.3.tar.gz) = 7EVrGwCvfMp3K5CY3inc+O+IQrs=
-SHA1 (tt-rss-1.3.3.tar.gz) = /OB1/eVds1FSI2F6AcJpWTICUIA=
-SHA256 (tt-rss-1.3.3.tar.gz) = h/Gfpm+4UkRsGRzXKJDKWK2Nve8zNJY6iNPm6FW7NLI=
-SIZE (tt-rss-1.3.3.tar.gz) = 791770
+MD5 (tt-rss-1.5.10.tar.gz) = CF6TFfqEssQ7SUaHi5dCcA==
+RMD160 (tt-rss-1.5.10.tar.gz) = IGlMAbVsNMEoLS278KEsdAlR7bw=
+SHA1 (tt-rss-1.5.10.tar.gz) = pdPse5fNPARGx6ESN0aYPfEKVPA=
+SHA256 (tt-rss-1.5.10.tar.gz) = qA0pK4X9JU1Oviangade9pbFZJzG9wL4s+UUQsZJhuc=
+SIZE (tt-rss-1.5.10.tar.gz) = 2752801

www/tt-rss/patches/patch-config_php-dist

@@ -0,0 +1,12 @@
+$OpenBSD: patch-config_php-dist,v 1.1 2012/03/15 09:50:23 landry Exp $
+--- config.php-dist.orig	Wed Mar 14 19:01:39 2012
++++ config.php-dist	Wed Mar 14 19:02:04 2012
+@@ -32,7 +32,7 @@
+ 	// *** Files and directories ***
+ 	// *****************************
+ 
+-	define('PHP_EXECUTABLE', '/usr/bin/php');
++	define('PHP_EXECUTABLE', '${MODPHP_BIN}');
+ 	// Path to PHP executable, used for various command-line tt-rss programs
+ 
+ 	define('LOCK_DIRECTORY', 'lock');

www/tt-rss/patches/patch-update_php

@@ -0,0 +1,9 @@
+$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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/php
++#!${MODPHP_BIN}
+ <?php
+ 	set_include_path(get_include_path() . PATH_SEPARATOR .
+ 		dirname(__FILE__) . "/include");

www/tt-rss/pkg/MESSAGE

@@ -1,12 +0,0 @@
-tt-rss has been installed into ${INSTDIR}
-
-You should point this to the DocumentRoot of your web-server:
-   # ln -s ../piwik /var/www/htdocs/piwik
-(make sure you use a relative symlink since Apache is chrooted)
-
-and proceed to complete the installation by reading the online
-documentation. Which can be found at:
-http://tt-rss.org/trac/wiki/InstallationNotes
-
-You can ensure you have a working install by accessing:
-http://<localhost>/tt-rss/

www/tt-rss/pkg/README

@@ -0,0 +1,35 @@
+$OpenBSD: README,v 1.1 2012/03/15 09:50:23 landry Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+tt-rss has been installed into ${INSTDIR}
+
+You should point this to the DocumentRoot of your web-server:
+   # cd /var/www/htdocs && ln -s ../tt-rss .
+(make sure you use a relative symlink since Apache is chrooted)
+
+and proceed to complete the installation by reading the online
+documentation. Which can be found at:
+http://tt-rss.org/trac/wiki/InstallationNotes
+
+Database Setup
+==============
+You'll need to create a database user and a database, then fill the db
+with the schema provided in ${INSTDIR}/schema. Then you'll need to
+configure the database access in ${INSTDIR}/config.php.
+
+Update feeds
+============
+You need to choose an update method for the feeds as explained on
+http://tt-rss.org/redmine/projects/tt-rss/wiki/UpdatingFeeds
+
+It is advised to run the update daemon through the provided
+tt_rss_update rc.d script or you can choose to run the update process
+as www user from a cronjob:
+
+*/5 * * * * www ${INSTDIR}/update.php -feeds
+
+Finally you can ensure you have a working install by accessing:
+http://<localhost>/tt-rss/

www/tt-rss/pkg/tt_rss_update.rc

@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $OpenBSD: tt_rss_update.rc,v 1.1 2012/03/15 09:50:23 landry Exp $
+
+daemon="${INSTDIR}update.php -daemon"
+daemon_user="www"
+
+. /etc/rc.d/rc.subr
+
+pexp="${MODPHP_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}}"
+
+rc_reload=NO
+rc_bg=YES
+
+rc_post() {
+	rm ${INSTDIR}lock/update_daemon.lock
+}
+
+rc_cmd $1