5 files changed, 97 insertions, 53 deletions

diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index 883ca6677c29..56e18e0253ad 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rnews
-PORTVERSION=	0.81
+PORTVERSION=	0.92
 CATEGORIES=	www
 MASTER_SITES=	SF
 
@@ -15,8 +15,6 @@ COMMENT=	A server-side rss aggregator written in php with mysql
 
 NO_BUILD=	yes
 
-WWWDIR?=	${PREFIX}/www/${PORTNAME}
-
 SUB_FILES=	pkg-message
 
 OPTIONS=	GD		"Enable Graphic (GD) support"	ON \
@@ -37,44 +35,64 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER
 .endif
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	CHANGELOG INSTALL README UPGRADE
+PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADE
 .endif
 
+CONFIGS=	inc/config.php inc/config_user.php
+
 do-install:
 	@${FIND} -s ${WRKSRC} -type  d | ${SED} -e 's,^${WRKSRC},${WWWDIR},' \
 		| ${XARGS} ${MKDIR}
 	${INSTALL_DATA} -v ${WRKSRC}/*.php ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/rnews-side.css ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/ajax.js ${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.css ${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.js ${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/.htaccess ${WWWDIR}
 	${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${WWWDIR}/img
-	${INSTALL_DATA} ${WRKSRC}/img/xml.png ${WWWDIR}/img
-	( ${FIND} ${WRKSRC}/inc -name '*.php' -not -name config_user.php; ${ECHO} ${WWWDIR}/inc ) \
+	${INSTALL_DATA} ${WRKSRC}/img/*.png ${WWWDIR}/img
+	${INSTALL_DATA} ${WRKSRC}/img/*.jpg ${WWWDIR}/img
+	( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${WWWDIR}/inc ) \
 		| ${XARGS} ${INSTALL_DATA} -v
-	${INSTALL_DATA} ${WRKSRC}/inc/.htaccess ${WWWDIR}/inc
 	${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${WWWDIR}/magpierss
 	${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${WWWDIR}/magpierss/extlib
 	@${CHOWN} ${WWWOWN} ${WWWDIR}/magpierss/cache
 	@${CHOWN} ${WWWOWN} ${WWWDIR}/img/feeds
-.if !exists(${WWWDIR}/inc/config_user.php)
-	@${TOUCH} ${WWWDIR}/inc/config_user.php
-	@${CHOWN} ${WWWOWN} ${WWWDIR}/inc/config_user.php
-.endif
+.for FILE in ${CONFIGS}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${WWWDIR}/${FILE}.sample
+.endfor
+
+post-install:
+.for FILE in ${CONFIGS}
+. if !exists(${WWWDIR}/${FILE})
+	${INSTALL_DATA} ${WWWDIR}/${FILE}.sample ${WWWDIR}/${FILE}
+	@${CHOWN} ${WWWOWN} ${WWWDIR}/${FILE}
+	@${CHMOD} u+w ${WWWDIR}/${FILE}
+. endif
+.endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.	for FILE in ${PORTDOCS}
+. for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.	endfor
+. endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 create-plist:
-	@${FIND} -s ${WRKSRC} \( -name "*.php" -o -name "*.inc" -o -name "*.js" -o -name "*.css" \
+	@${FIND} -s ${WRKSRC} \( -name "*.php" -o -name "*.inc" -o -name "*.js" -o -name "*.css" -o -name "*.jpg" \
 		-o -name "*.gif" -o -name "*.png" -o -name ".htaccess" \) -and -not -name config_user.php \
 		| ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST}
-	@${ECHO_CMD} '@exec ${TOUCH} %D/%%WWWDIR%%/inc/config_user.php;${CHOWN} ${WWWOWN} %D/%%WWWDIR%%/inc/config_user.php' >> ${PLIST}
-	@${ECHO_CMD} '@unexec if [ ! -s %D/%%WWWDIR%%/inc/config_user.php ];then ${RM} -f %D/%%WWWDIR%%/inc/config_user.php;fi' >> ${PLIST}
-	@${FIND} -ds ${WRKSRC} -type d \
+.for FILE in ${CONFIGS}
+	@${ECHO_CMD} '@exec if [ ! -f %D/%%WWWDIR%%/${FILE} ]; then \
+		${INSTALL_DATA} %D/%%WWWDIR%%/${FILE}.sample %D/%%WWWDIR%%/${FILE}; \
+		${CHOWN} ${WWWOWN} %D/%%WWWDIR%%/${FILE}; \
+		${CHMOD} u+w %D/%%WWWDIR%%/${FILE}; fi' >> ${PLIST}
+.endfor
+.for FILE in ${CONFIGS}
+	@${ECHO_CMD} '@unexec if cmp -s %D/%%WWWDIR%%/${FILE}.sample %D/%%WWWDIR%%/${FILE}; \
+		then ${RM} -f %D/%%WWWDIR%%/${FILE}; fi' >> ${PLIST}
+	@${ECHO_CMD} '%%WWWDIR%%/${FILE}.sample' >> ${PLIST}
+.endfor
+	@${ECHO_CMD} '@unexec if [ $$(ls %D/%%WWWDIR%%/img/feeds/|wc -w) -eq 0 ]; then ${RM} -rf %D/%%WWWDIR%%/img/feeds;fi' >> ${PLIST}
+	@${FIND} -ds ${WRKSRC} -type d -a -not -name feeds \
 		| ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST}
 
 .include <bsd.port.post.mk>
diff --git a/www/rnews/distinfo b/www/rnews/distinfo
index 78ec34d320bf..674db48a5f83 100644
--- a/www/rnews/distinfo
+++ b/www/rnews/distinfo
@@ -1,3 +1,3 @@
-MD5 (rnews-0.81.tar.gz) = dc58e801795734f323ae433dd17536ab
-SHA256 (rnews-0.81.tar.gz) = 2f8bc2d431fe60e543b79a0019225a338d8526589edd90d08a2852474006c74c
-SIZE (rnews-0.81.tar.gz) = 68404
+MD5 (rnews-0.92.tar.gz) = c084b033e82593744642baa682cc435e
+SHA256 (rnews-0.92.tar.gz) = 2518245736604414b75abf4f9a09e8ac1eaaa649d0185e681b04563008b092c0
+SIZE (rnews-0.92.tar.gz) = 135874
diff --git a/www/rnews/files/patch-inc-db.php b/www/rnews/files/patch-inc-db.php
deleted file mode 100644
index e24ed3473943..000000000000
--- a/www/rnews/files/patch-inc-db.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- inc/db.php.orig	Fri Sep 14 06:25:32 2007
-+++ inc/db.php	Fri Sep 14 06:36:13 2007
-@@ -50,7 +50,7 @@
-       if (mysql_select_db(DB_DATABASE)) {
-         $rc = TRUE;
-       } else {
--        $rc = mysql_create_db(DB_DATABASE);
-+        $rc = mysql_query('CREATE DATABASE ' . DB_DATABASE);
-       }
-       mysql_close();
-       return $rc;
diff --git a/www/rnews/files/pkg-message.in b/www/rnews/files/pkg-message.in
index 550a62486d6f..40fa50c99ff4 100644
--- a/www/rnews/files/pkg-message.in
+++ b/www/rnews/files/pkg-message.in
@@ -14,8 +14,7 @@ and restart httpd.
 To finish the installation, open:
     http://<hostname>/rnews/install.php
 
-update:
-    The DB schema has changed in several ways! For more
-    information see: %%DOCSDIR%%/UPGRADE 
+for update information see:
+    %%DOCSDIR%%/UPGRADE 
 ===============================================================
 
diff --git a/www/rnews/pkg-plist b/www/rnews/pkg-plist
index 73bb0775047f..8b9b0824493a 100644
--- a/www/rnews/pkg-plist
+++ b/www/rnews/pkg-plist
@@ -4,31 +4,62 @@
 %%WWWDIR%%/ajax.js
 %%WWWDIR%%/ajax.php
 %%WWWDIR%%/auth.php
+%%WWWDIR%%/book.php
 %%WWWDIR%%/export.php
 %%WWWDIR%%/foot.php
-%%WWWDIR%%/img/add.gif
-%%WWWDIR%%/img/edit.gif
-%%WWWDIR%%/img/info.gif
-%%WWWDIR%%/img/mark.gif
-%%WWWDIR%%/img/markall.gif
-%%WWWDIR%%/img/more.gif
-%%WWWDIR%%/img/rnews-logo.gif
-%%WWWDIR%%/img/update.gif
-%%WWWDIR%%/img/x.gif
+%%WWWDIR%%/functions.js
+%%WWWDIR%%/img/b1-add_hv.png
+%%WWWDIR%%/img/b1-add_nm.png
+%%WWWDIR%%/img/b1-block.png
+%%WWWDIR%%/img/b1-block_hv.png
+%%WWWDIR%%/img/b1-block_nm.png
+%%WWWDIR%%/img/b1-blockw.png
+%%WWWDIR%%/img/b1-blockw_hv.png
+%%WWWDIR%%/img/b1-blockw_nm.png
+%%WWWDIR%%/img/b1-list.png
+%%WWWDIR%%/img/b1-list_hv.png
+%%WWWDIR%%/img/b1-list_nm.png
+%%WWWDIR%%/img/b1-markall_hv.png
+%%WWWDIR%%/img/b1-markall_nm.png
+%%WWWDIR%%/img/b1-sname.png
+%%WWWDIR%%/img/b1-sname_hv.png
+%%WWWDIR%%/img/b1-sname_nm.png
+%%WWWDIR%%/img/b1-sscore.png
+%%WWWDIR%%/img/b1-sscore_hv.png
+%%WWWDIR%%/img/b1-sscore_nm.png
+%%WWWDIR%%/img/b2-edit_hv.png
+%%WWWDIR%%/img/b2-edit_nm.png
+%%WWWDIR%%/img/b2-mark_hv.png
+%%WWWDIR%%/img/b2-mark_nm.png
+%%WWWDIR%%/img/b2-update_hv.png
+%%WWWDIR%%/img/b2-update_nm.png
+%%WWWDIR%%/img/b2-x_hv.png
+%%WWWDIR%%/img/b2-x_nm.png
+%%WWWDIR%%/img/feedhdbg.png
+%%WWWDIR%%/img/hdrbg.png
+%%WWWDIR%%/img/loading.gif
+%%WWWDIR%%/img/more-seen.png
+%%WWWDIR%%/img/more.png
+%%WWWDIR%%/img/morew_hv.png
+%%WWWDIR%%/img/morew_nm.png
+%%WWWDIR%%/img/rnews-logo.png
+%%WWWDIR%%/img/screenshot-0.90-sm-g.jpg
 %%WWWDIR%%/img/xml.png
 %%WWWDIR%%/inc/.htaccess
-%%WWWDIR%%/inc/cat.php
+%%WWWDIR%%/inc/cl_cat.php
+%%WWWDIR%%/inc/cl_config.php
+%%WWWDIR%%/inc/cl_db.php
+%%WWWDIR%%/inc/cl_feed.php
+%%WWWDIR%%/inc/cl_feedlink.php
+%%WWWDIR%%/inc/cl_user.php
 %%WWWDIR%%/inc/config.php
-%%WWWDIR%%/inc/db.php
-%%WWWDIR%%/inc/feed.php
-%%WWWDIR%%/inc/feedlink.php
 %%WWWDIR%%/inc/functions.php
 %%WWWDIR%%/inc/kses.php
 %%WWWDIR%%/inc/opml.php
 %%WWWDIR%%/inc/output.php
 %%WWWDIR%%/inc/rss.php
 %%WWWDIR%%/inc/security.php
-%%WWWDIR%%/inc/user.php
+%%WWWDIR%%/inc/upgrade.php
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install.php
 %%WWWDIR%%/magpierss/extlib/Snoopy.class.inc
@@ -38,10 +69,17 @@
 %%WWWDIR%%/magpierss/rss_utils.inc
 %%WWWDIR%%/prefs.php
 %%WWWDIR%%/redirect.php
+%%WWWDIR%%/rnews-ie6.css
 %%WWWDIR%%/rnews-side.css
-@exec /usr/bin/touch %D/%%WWWDIR%%/inc/config_user.php;/usr/sbin/chown www %D/%%WWWDIR%%/inc/config_user.php
-@unexec if [ ! -s %D/%%WWWDIR%%/inc/config_user.php ];then /bin/rm -f %D/%%WWWDIR%%/inc/config_user.php;fi
-@dirrm %%WWWDIR%%/img/feeds
+%%WWWDIR%%/rollover.js
+%%WWWDIR%%/search.php
+@exec if [ ! -f %D/%%WWWDIR%%/inc/config.php ]; then  install  -o root -g wheel -m 444 %D/%%WWWDIR%%/inc/config.php.sample %D/%%WWWDIR%%/inc/config.php;  /usr/sbin/chown www %D/%%WWWDIR%%/inc/config.php;  /bin/chmod u+w %D/%%WWWDIR%%/inc/config.php; fi
+@exec if [ ! -f %D/%%WWWDIR%%/inc/config_user.php ]; then  install  -o root -g wheel -m 444 %D/%%WWWDIR%%/inc/config_user.php.sample %D/%%WWWDIR%%/inc/config_user.php;  /usr/sbin/chown www %D/%%WWWDIR%%/inc/config_user.php;  /bin/chmod u+w %D/%%WWWDIR%%/inc/config_user.php; fi
+@unexec if cmp -s %D/%%WWWDIR%%/inc/config.php.sample %D/%%WWWDIR%%/inc/config.php;  then /bin/rm -f %D/%%WWWDIR%%/inc/config.php; fi
+%%WWWDIR%%/inc/config.php.sample
+@unexec if cmp -s %D/%%WWWDIR%%/inc/config_user.php.sample %D/%%WWWDIR%%/inc/config_user.php;  then /bin/rm -f %D/%%WWWDIR%%/inc/config_user.php; fi
+%%WWWDIR%%/inc/config_user.php.sample
+@unexec if [ $(ls %D/%%WWWDIR%%/img/feeds/|wc -w) -eq 0 ]; then /bin/rm -rf %D/%%WWWDIR%%/img/feeds;fi
 @dirrm %%WWWDIR%%/img
 @dirrm %%WWWDIR%%/inc
 @dirrm %%WWWDIR%%/magpierss/cache