Index: head/www/rnews/Makefile =================================================================== --- head/www/rnews/Makefile (revision 371184) +++ head/www/rnews/Makefile (revision 371185) @@ -1,96 +1,82 @@ # Created by: Vincent Tantardini # $FreeBSD$ PORTNAME= rnews PORTVERSION= 1.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Server-side RSS aggregator written in PHP with MySQL NO_BUILD= yes SUB_FILES= pkg-message OPTIONS_DEFINE= GD MYSQLSERVER DOCS OPTIONS_DEFAULT= GD MYSQLSERVER_DESC= Use MySQL-Server on localhost .include USE_PHP= mysql mbstring pcre xml iconv USE_MYSQL= yes .if ${PORT_OPTIONS:MGD} USE_PHP+= gd .endif .if ${PORT_OPTIONS:MMYSQLSERVER} RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server .endif RUN_DEPENDS+= curl:${PORTSDIR}/ftp/curl .if ${PORT_OPTIONS:MDOCS} 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},${STAGEDIR}${WWWDIR},' \ | ${XARGS} ${MKDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/.htaccess ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${STAGEDIR}${WWWDIR}/tmp ${INSTALL_DATA} ${WRKSRC}/favicon.ico ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/help.html ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${STAGEDIR}${WWWDIR}/img ${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${STAGEDIR}${WWWDIR}/img ${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${STAGEDIR}${WWWDIR}/img ( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${STAGEDIR}${WWWDIR}/inc ) \ | ${XARGS} ${INSTALL_DATA} -v ${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${STAGEDIR}${WWWDIR}/magpierss ${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${STAGEDIR}${WWWDIR}/magpierss/extlib ${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${STAGEDIR}${WWWDIR}/opml - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/magpierss/cache - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/img/feeds - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/tmp .for FILE in ${CONFIGS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${WWWDIR}/${FILE}.sample .endfor - -post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} . for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} . endfor .endif - @${CAT} ${PKGMESSAGE} create-plist: @${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" -o -name "help.html" -o -name "favicon.ico" -o -name "*.opml" \) \ -and -not -name config_user.php -and -not -name config.php \ | ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST} .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} + @${ECHO_CMD} '@sample(${WWWOWN},,) %%WWWDIR%%/${FILE}.sample' >> ${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} +.for DIR in magpierss/cache img/feeds tmp + @${ECHO_CMD} '@dir(${WWWOWN},,) %%WWWDIR%%/${DIR}' >> ${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 Index: head/www/rnews/pkg-plist =================================================================== --- head/www/rnews/pkg-plist (revision 371184) +++ head/www/rnews/pkg-plist (revision 371185) @@ -1,126 +1,115 @@ %%WWWDIR%%/.htaccess %%WWWDIR%%/add.php %%WWWDIR%%/add_user.php %%WWWDIR%%/ajax.js %%WWWDIR%%/ajax.php %%WWWDIR%%/all.js %%WWWDIR%%/auth.php %%WWWDIR%%/book.php %%WWWDIR%%/cron.php %%WWWDIR%%/export.php %%WWWDIR%%/favicon.ico %%WWWDIR%%/foot.php %%WWWDIR%%/functions.js %%WWWDIR%%/help.html %%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-filt-all.png %%WWWDIR%%/img/b1-filt-all_hv.png %%WWWDIR%%/img/b1-filt-all_nm.png %%WWWDIR%%/img/b1-filt-new.png %%WWWDIR%%/img/b1-filt-new_hv.png %%WWWDIR%%/img/b1-filt-new_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/ib-bg.png %%WWWDIR%%/img/ib-delete_hv.png %%WWWDIR%%/img/ib-delete_nm.png %%WWWDIR%%/img/ib-fontbg_hv.png %%WWWDIR%%/img/ib-fontbg_nm.png %%WWWDIR%%/img/ib-fontsm_hv.png %%WWWDIR%%/img/ib-fontsm_nm.png %%WWWDIR%%/img/ib-link_hv.png %%WWWDIR%%/img/ib-link_nm.png %%WWWDIR%%/img/ib-mark_hv.png %%WWWDIR%%/img/ib-mark_nm.png %%WWWDIR%%/img/ib-marked_hv.png %%WWWDIR%%/img/ib-marked_nm.png %%WWWDIR%%/img/ib-markold_hv.png %%WWWDIR%%/img/ib-markold_nm.png %%WWWDIR%%/img/ib-star_hv.png %%WWWDIR%%/img/ib-star_nm.png %%WWWDIR%%/img/ib-unstar_hv.png %%WWWDIR%%/img/ib-unstar_nm.png %%WWWDIR%%/img/loading.gif %%WWWDIR%%/img/more_hv.png %%WWWDIR%%/img/more_nm.png %%WWWDIR%%/img/morew_hv.png %%WWWDIR%%/img/morew_nm.png %%WWWDIR%%/img/rnews-logo.png %%WWWDIR%%/img/screenshot-sm-g.jpg %%WWWDIR%%/img/xml.png %%WWWDIR%%/inc/.htaccess %%WWWDIR%%/inc/cl_cat.php %%WWWDIR%%/inc/cl_configw.php %%WWWDIR%%/inc/cl_db.php %%WWWDIR%%/inc/cl_feed.php %%WWWDIR%%/inc/cl_feedlink.php %%WWWDIR%%/inc/cl_user.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/upgrade.php %%WWWDIR%%/index.php %%WWWDIR%%/install.php %%WWWDIR%%/magpierss/extlib/Snoopy.class.inc %%WWWDIR%%/magpierss/rss_cache.inc %%WWWDIR%%/magpierss/rss_fetch.inc %%WWWDIR%%/magpierss/rss_parse.inc %%WWWDIR%%/magpierss/rss_utils.inc %%WWWDIR%%/opml/amusement.opml %%WWWDIR%%/opml/deals.opml %%WWWDIR%%/opml/language.opml %%WWWDIR%%/opml/news.opml %%WWWDIR%%/opml/photos.opml %%WWWDIR%%/opml/tech.opml %%WWWDIR%%/prefs.php %%WWWDIR%%/redirect.php %%WWWDIR%%/rnews-ie6.css %%WWWDIR%%/rnews-side.css %%WWWDIR%%/rollover.js %%WWWDIR%%/search.php %%WWWDIR%%/tmp/.htaccess -@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 -@dirrmtry %%WWWDIR%%/img/feeds -@dirrm %%WWWDIR%%/img -@dirrm %%WWWDIR%%/inc -@dirrm %%WWWDIR%%/magpierss/cache -@dirrm %%WWWDIR%%/magpierss/extlib -@dirrm %%WWWDIR%%/magpierss -@dirrm %%WWWDIR%%/opml -@dirrm %%WWWDIR%%/tmp -@dirrm %%WWWDIR%% +@sample(www,,) %%WWWDIR%%/inc/config.php.sample +@sample(www,,) %%WWWDIR%%/inc/config_user.php.sample +@dir(www,,) %%WWWDIR%%/magpierss/cache +@dir(www,,) %%WWWDIR%%/img/feeds +@dir(www,,) %%WWWDIR%%/tmp