Date: Sat, 29 Jun 2002 11:50:05 -0700 (PDT) From: Thierry Thomas <thierry@pompo.net> To: freebsd-ports@FreeBSD.org Subject: Re: ports/33312: New port: www/jonah - a portal and content collection system Message-ID: <200206291850.g5TIo5va053898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/33312; it has been noted by GNATS. From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: Will Andrews <will@FreeBSD.org> Subject: Re: ports/33312: New port: www/jonah - a portal and content collection system Date: Sat, 29 Jun 2002 20:45:44 +0200 Le 28 jun 02 à 1:06:04 +0000, Thierry Thomas écrivait : > > PR looks OK. Can you confirm if any changes are needed to put it in the > > ports tree now? Sorry no one else appears to have looked at this yet. > > > > http://www.freebsd.org/cgi/query-pr.cgi?pr=33312 > > It should be OK, but I shall re-send some patches to include a better > deinstallation procedure (like in the other Horde's apps). Done. Hereunder is a patch which: - has a better deinstallation procedure; - transform ${PERL} into ${REINPLACE_CMD}; - IS_INTERACTIVE; - upgrades to a fresh snapshot; - remove patch of channels.php.dist (committed). diff -urN /usr/ports/www/jonah.orig/Makefile /usr/ports/www/jonah/Makefile --- /usr/ports/www/jonah.orig/Makefile Sun Feb 17 17:29:16 2002 +++ /usr/ports/www/jonah/Makefile Sat Jun 29 17:11:37 2002 @@ -6,20 +6,27 @@ # PORTNAME= jonah -PORTVERSION= 0.0.3.011217 +PORTVERSION= 0.0.3.020629 CATEGORIES= www MASTER_SITES= http://pompo.net/horde/jonah/ MAINTAINER= thierry@pompo.net +WRKSRC= ${WRKDIR}/${PORTNAME} + RUN_DEPENDS= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2 \ ${LOCALBASE}/bin/php:${PORTSDIR}/lang/php4 +IS_INTERACTIVE= 'need to build php4 with XML support.' NO_BUILD= yes +USE_REINPLACE= yes + +REINPLACE_ARGS= -i.beforeJonah DOCS= COPYING README docs/CHANGES docs/CREDITS docs/HELP \ docs/INSTALL CONFFILE= channels.php conf.php html.php +SUB_DIRS= config graphics lib scripts templates LHORDEDIR?= www/horde LJONAHDIR?= ${LHORDEDIR}/jonah @@ -46,30 +53,37 @@ do-install: @${MKDIR} ${JONAHDIR} - @${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${JONAHDIR} - @${CP} -Rp ${WRKSRC}/templates ${JONAHDIR} +.for REP in ${SUB_DIRS} + @${CP} -Rp ${WRKSRC}/${REP} ${JONAHDIR} +.endfor @${CP} -p ${WRKSRC}/*.php ${JONAHDIR} - @${MV} ${JONAHDIR}/cli-backend.php ${PREFIX}/bin + @${MV} ${JONAHDIR}/scripts/cli-backend.php ${PREFIX}/bin .for FILE in ${CONFFILE} @if [ ! -f ${CONFDIR}/${FILE} ]; then \ ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ fi .endfor - @${PERL} -pi -e "s:/var/jonah:${RSS_HTML}:" ${CONFDIR}/conf.php - @${PERL} -pi -e "s:%%JONAHDIR%%:'${JONAHDIR}':" \ + @${REINPLACE_CMD} -e "s:/var/jonah:${RSS_HTML}:" ${CONFDIR}/conf.php + @${RM} ${CONFDIR}/conf.php.beforeJonah + @${REINPLACE_CMD} -e "s:%%JONAHDIR%%:'${JONAHDIR}':" \ ${PREFIX}/bin/cli-backend.php + @${RM} ${PREFIX}/bin/cli-backend.php.beforeJonah @${CHOWN} -R www:www ${JONAHDIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.jonah ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/jonah:${JONAHDIR}:g" \ + @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/jonah:${JONAHDIR}:g" \ ${HORDE_INC}/httpd.conf.jonah - @${PERL} -pi -e "s://UNCOMMENTWHENINSTJONAH::" \ + @${RM} ${HORDE_INC}/httpd.conf.jonah.beforeJonah + @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTJONAH::" \ ${HORDEDIR}/config/registry.php + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterJonah @${MKDIR} ${RSS_HTML}/html ${RSS_HTML}/rss @${CHOWN} -R root:www ${RSS_HTML} @if ${GREP} -q -e "conf\['auth'\]\['admins'\] = array()" ${HORDE_CNF} ; then \ - ${ECHO_MSG} "===> Defining admin in ${HORDE_CNF}" ; \ - ${PERL} -pi -e "s:admins'] = array\(\):admins'] = array('admin'):" ${HORDE_CNF} ; \ + ${ECHO_MSG} "===> Defining admin in ${HORDE_CNF}" ; \ + ${REINPLACE_CMD} -e "s:admins'] = array():admins'] = array('admin'):" ${HORDE_CNF} ; \ + ${CP} -p ${HORDE_CNF} ${HORDE_CNF}.afterJonah ; \ fi @if [ ! -f ${PHPSA_INI} ]; then \ ${ECHO_MSG} "===> Creating ${PHPSA_INI} for PHP standalone" ; \ @@ -77,8 +91,8 @@ fi @if ! ${GREP} -q -e '^include_path' ${PHPSA_INI} ; then \ ${ECHO_MSG} "===> Configuring ${PHPSA_INI} for PHP standalone" ; \ - ${CP} -p ${PHPSA_INI} ${PHPSA_INI}.beforeJonah ; \ - ${PERL} -pi -e 's!;include_path = ".:/php/includes"!include_path = "${LOCALBASE}/include/php:.:${LOCALBASE}/lib/php"!' ${PHPSA_INI} ; \ + ${REINPLACE_CMD} -e 's!;include_path = ".:/php/includes"!include_path = "${LOCALBASE}/include/php:.:${LOCALBASE}/lib/php"!' ${PHPSA_INI} ; \ + ${CP} -p ${PHPSA_INI} ${PHPSA_INI}.afterJonah ; \ fi .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff -urN /usr/ports/www/jonah.orig/distinfo /usr/ports/www/jonah/distinfo --- /usr/ports/www/jonah.orig/distinfo Wed Dec 19 22:17:32 2001 +++ /usr/ports/www/jonah/distinfo Sat Jun 29 16:47:18 2002 @@ -1 +1 @@ -MD5 (jonah-0.0.3.011217.tar.gz) = b5a0b00eb05eea9dc45f248b275b05bc +MD5 (jonah-0.0.3.020629.tar.gz) = e33ecae03344b4e84cbc57c7715e1216 diff -urN /usr/ports/www/jonah.orig/files/httpd.conf.jonah /usr/ports/www/jonah/files/httpd.conf.jonah --- /usr/ports/www/jonah.orig/files/httpd.conf.jonah Wed Dec 19 22:28:28 2001 +++ /usr/ports/www/jonah/files/httpd.conf.jonah Sat Jun 29 17:12:51 2002 @@ -11,6 +11,10 @@ order deny,allow deny from all </Directory> +<Directory "/home/httpd/html/horde/jonah/scripts"> + order deny,allow + deny from all +</Directory> <Directory "/home/httpd/html/horde/jonah/templates"> order deny,allow deny from all diff -urN /usr/ports/www/jonah.orig/files/patch-channels.php.dist /usr/ports/www/jonah/files/patch-channels.php.dist --- /usr/ports/www/jonah.orig/files/patch-channels.php.dist Sat Dec 29 23:03:35 2001 +++ /usr/ports/www/jonah/files/patch-channels.php.dist Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- config/channels.php.dist.orig Thu Dec 13 06:13:10 2001 -+++ config/channels.php.dist Sat Dec 29 23:02:38 2001 -@@ -131,6 +131,12 @@ - 'url' => 'http://www.telepolis.de/news.rdf', - 'img' => 'heise.gif'), - -+ 'freebsddiary' => array('name' => 'FreeBSD diary', -+ 'url' => 'http://www.freebsddiary.org/news.php'), -+ -+ 'bsdtoday' => array('name' => 'BSD today', -+ 'url' => 'http://www.bsdtoday.com/backend/bt.rdf'), -+ - 'zend' => array('name' => 'Zend', - 'url' => 'http://www.zend.com/rss.php')); - diff -urN /usr/ports/www/jonah.orig/files/patch-cli-backend.php /usr/ports/www/jonah/files/patch-cli-backend.php --- /usr/ports/www/jonah.orig/files/patch-cli-backend.php Wed Dec 26 22:57:37 2001 +++ /usr/ports/www/jonah/files/patch-cli-backend.php Sat Jun 29 17:05:21 2002 @@ -1,11 +1,11 @@ ---- cli-backend.php.orig Thu Dec 13 04:45:44 2001 -+++ cli-backend.php Wed Dec 26 22:56:35 2001 -@@ -2,7 +2,7 @@ - <?php - // $Horde: jonah/cli-backend.php,v 1.3 2001/12/13 03:45:44 chuck Exp $ +--- scripts/cli-backend.php.orig Wed Apr 17 20:00:46 2002 ++++ scripts/cli-backend.php Sat Jun 29 17:04:47 2002 +@@ -3,7 +3,7 @@ + // $Horde: jonah/scripts/cli-backend.php,v 1.5 2002/04/17 18:00:46 jan Exp $ --define('JONAH_BASE', dirname(__FILE__)); + $self_contained_auth = true; +-define('JONAH_BASE', dirname(__FILE__) . '/..'); +define('JONAH_BASE', %%JONAHDIR%%); - @require_once JONAH_BASE . '/lib/base.php'; // This shouldn't be callable via the web. + if (isset($_SERVER['SCRIPT_NAME']) || diff -urN /usr/ports/www/jonah.orig/pkg-plist /usr/ports/www/jonah/pkg-plist --- /usr/ports/www/jonah.orig/pkg-plist Sat Dec 29 23:05:00 2001 +++ /usr/ports/www/jonah/pkg-plist Sat Jun 29 17:17:18 2002 @@ -8,7 +8,6 @@ %%JONAHDIR%%/channels.php %%JONAHDIR%%/config/channels.php %%JONAHDIR%%/config/channels.php.dist -%%JONAHDIR%%/config/channels.php.dist.orig %%JONAHDIR%%/config/conf.php %%JONAHDIR%%/config/conf.php.dist %%JONAHDIR%%/config/html.php @@ -39,10 +38,11 @@ %%JONAHDIR%%/graphics/jonah_whale.gif %%JONAHDIR%%/index.php %%JONAHDIR%%/lib/Headlines.php -%%JONAHDIR%%/lib/Jonah.php %%JONAHDIR%%/lib/base.php %%JONAHDIR%%/lib/htmlgen.php %%JONAHDIR%%/lib/version.php +%%JONAHDIR%%/scripts/cli-backend.php.orig +%%JONAHDIR%%/scripts/cli-backend.sh %%JONAHDIR%%/templates/backend/menu.inc %%JONAHDIR%%/templates/channels/bottom.inc %%JONAHDIR%%/templates/channels/channels.inc @@ -59,9 +59,13 @@ @dirrm %%JONAHDIR%%/graphics/channels @dirrm %%JONAHDIR%%/graphics @dirrm %%JONAHDIR%%/lib +@dirrm %%JONAHDIR%%/scripts @dirrm %%JONAHDIR%%/templates/backend @dirrm %%JONAHDIR%%/templates/channels @dirrm %%JONAHDIR%%/templates/index @dirrm %%JONAHDIR%%/templates @dirrm %%JONAHDIR%% %%PORTDOCS%%@dirrm share/doc/jonah +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterJonah; then rm -f %D/www/horde/config/registry.php.afterJonah; mv %D/www/horde/config/registry.php.beforeJonah %D/www/horde/config/registry.php; fi +@unexec if cmp -s %D/www/horde/config/horde.php %D/www/horde/config/horde.php.afterJonah; then rm -f %D/www/horde/config/horde.php.afterJonah; mv %D/www/horde/config/horde.php.beforeJonah %D/www/horde/config/horde.php; fi +@unexec if cmp -s %D/etc/php.standalone/php.ini %D/etc/php.standalone/php.ini.afterJonah; then rm -f %D/etc/php.standalone/php.ini.afterJonah; mv %D/etc/php.standalone/php.ini.beforeJonah %D/etc/php.standalone/php.ini; fi Remark: if you prefer a comprehensive shar file, I can submit it. Regards, -- Th. Thomas. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206291850.g5TIo5va053898>