Date: Sat, 17 Jul 2004 23:00:28 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69190: Update port: www/cherokee to 0.4.17 Message-ID: <20040717230028.20e7f914.tkato432@yahoo.com> Resent-Message-ID: <200407171410.i6HEAF7a047716@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 69190 >Category: ports >Synopsis: Update port: www/cherokee to 0.4.17 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jul 17 14:10:14 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 0.4.17 New file: files/patch-cherokee.conf.sample.pre files/patch-src::socket.h Remove file: files/patch-aa files/patch-ab >How-To-Repeat: >Fix: diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile --- /usr/ports/www/cherokee/Makefile Wed Jun 30 12:58:46 2004 +++ www/cherokee/Makefile Sat Jul 17 22:29:32 2004 @@ -6,38 +6,28 @@ # PORTNAME= cherokee -PORTVERSION= 0.4.2 +PORTVERSION= 0.4.17 CATEGORIES= www -MASTER_SITES= ftp://www.alobbs.com/cherokee/ +MASTER_SITES= ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Cherokee is an extremely fast and tiny web server +COMMENT= An extremely fast and flexible web server + +LIB_DEPENDS= gnutls.12:${PORTSDIR}/security/gnutls + +USE_GNOME= gnomehack gnometarget pkgconfig +USE_GETOPT_LONG= yes +USE_GMAKE= yes +USE_INC_LIBTOOL_VER= 15 +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -#USE_AUTOCONF_VER=213 -#USE_AUTOMAKE_VER=14 -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} INSTALLS_SHLIB= yes -#This is experimental -#do not expect it to work properly -.if defined(WITH_PHP) -CONFIGURE_ARGS+=--with-php=${PREFIX}/include/php -BUILD_DEPENDS=mod_php4:${PORTSDIR}/www/mod_php4: -.endif - -MAN1= cherokee.1 - -#pre-everything: -# @${ECHO_MSG} "----------------------------" -# @${ECHO_MSG} " " -# @${ECHO_MSG} "You can add php support" -# @${ECHO_MSG} "This is experimental" -# @${ECHO_MSG} "builds cherokee with WITH_PHP=yes" -# @${ECHO_MSG} "For example," -# @${ECHO_MSG} "make WITH_PHP=yes" -# @${ECHO_MSG} " " -# @${ECHO_MSG} "----------------------------" +MAN1= cherokee-config.1 cherokee.1 + +CPPFLAGS= ${PTHREAD_CFLAGS} +LDFLAGS= ${PTHREAD_LIBS} pre-install: @if [ ! -f ${PREFIX}/www ]; then \ @@ -49,7 +39,7 @@ @${ECHO_MSG} " `pwd` " post-install: - @${INSTALL} -m 644 ${WRKSRC}/doc/Intro.txt ${PREFIX}/share/cherokee + ${INSTALL_DATA} ${WRKSRC}/doc/Intro.txt ${DATADIR} @${ECHO_MSG} " " @${ECHO_MSG} " Dont forget to read the doc " @${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt" diff -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo --- /usr/ports/www/cherokee/distinfo Wed Mar 31 18:14:53 2004 +++ www/cherokee/distinfo Sat Jul 17 20:17:20 2004 @@ -1,2 +1,2 @@ -MD5 (cherokee-0.4.2.tar.gz) = cfebf2348fb7c195db262ea6f2abde62 -SIZE (cherokee-0.4.2.tar.gz) = 225005 +MD5 (cherokee-0.4.17.tar.gz) = 2cf8c8eb973e6b3e5578406b467f23b5 +SIZE (cherokee-0.4.17.tar.gz) = 800872 diff -urN /usr/ports/www/cherokee/files/patch-aa www/cherokee/files/patch-aa --- /usr/ports/www/cherokee/files/patch-aa Mon Apr 14 04:05:16 2003 +++ www/cherokee/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,35 +0,0 @@ -diff -ruN cherokee-0.4.2.orig/cherokee.conf cherokee-0.4.2/cherokee.conf ---- cherokee.conf.orig Mon Mar 17 12:25:35 2003 -+++ cherokee.conf Mon Apr 7 12:58:12 2003 -@@ -37,7 +37,7 @@ - ## documents. By default, all requests are taken from this directory, but - ## symbolic links and aliases may be used to point to other locations. - ## --DocumentRoot /var/www -+DocumentRoot /usr/local/www/data - - ## - ## Log: Turn On/Off the logging in to syslog -diff -ruN cherokee-0.4.2.orig/src/common.c cherokee-0.4.2/src/common.c ---- src.orig/common.c Sun Mar 23 14:55:03 2003 -+++ src/common.c Mon Apr 7 12:57:07 2003 -@@ -23,7 +23,6 @@ - * USA - */ - --#include <varargs.h> - #include <stdarg.h> - - #include "common.h" -diff -ruN cherokee-0.4.2.orig/src/server.h cherokee-0.4.2/src/server.h ---- src.orig/server.h Wed Mar 19 16:19:19 2003 -+++ src/server.h Mon Apr 7 12:57:20 2003 -@@ -26,6 +26,8 @@ - #ifndef __CHEROKEE2_SERVER_H__ - #define __CHEROKEE2_SERVER_H__ - -+#include <sys/types.h> -+ - #include <time.h> - - #include "common.h" diff -urN /usr/ports/www/cherokee/files/patch-ab www/cherokee/files/patch-ab --- /usr/ports/www/cherokee/files/patch-ab Sun Apr 13 20:05:52 2003 +++ www/cherokee/files/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Mon Apr 7 13:28:00 2003 -+++ configure Mon Apr 7 13:27:40 2003 -@@ -6331,7 +6331,7 @@ - withval="$with_php" - - CHEROKEE_PHP_CFLAGS="-I$withval -I$withval/main -I$withval/Zend -I$withval/regex -I$withval/TSRM" -- CHEROKEE_PHP_LIBADD="$withval/libphp4.la" -+ CHEROKEE_PHP_LIBADD="/usr/local/libexec/apache/libphp4.so" - - - php_support="yes" diff -urN /usr/ports/www/cherokee/files/patch-cherokee.conf.sample.pre www/cherokee/files/patch-cherokee.conf.sample.pre --- /usr/ports/www/cherokee/files/patch-cherokee.conf.sample.pre Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-cherokee.conf.sample.pre Sat Jul 17 22:20:04 2004 @@ -0,0 +1,11 @@ +--- cherokee.conf.sample.pre.orig Tue Jun 29 05:54:01 2004 ++++ cherokee.conf.sample.pre Sat Jul 17 22:19:43 2004 +@@ -68,7 +68,7 @@ + ## documents. By default, all requests are taken from this directory, but + ## symbolic links and aliases may be used to point to other locations. + ## +-DocumentRoot /var/www ++DocumentRoot /usr/local/www/data + + ## + ## Hide Version: Hide the software version diff -urN /usr/ports/www/cherokee/files/patch-src::socket.h www/cherokee/files/patch-src::socket.h --- /usr/ports/www/cherokee/files/patch-src::socket.h Thu Jan 1 09:00:00 1970 +++ www/cherokee/files/patch-src::socket.h Sat Jul 17 20:36:36 2004 @@ -0,0 +1,19 @@ +--- src/socket.h.orig Sat Jun 19 23:03:54 2004 ++++ src/socket.h Sat Jul 17 20:36:02 2004 +@@ -45,12 +45,12 @@ + # include <sys/socket.h> + #endif + +-#ifdef HAVE_ARPA_INET_H +-# include <arpa/inet.h> +-#endif +- + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> ++#endif ++ ++#ifdef HAVE_ARPA_INET_H ++# include <arpa/inet.h> + #endif + + #if defined(HAVE_GNUTLS) diff -urN /usr/ports/www/cherokee/pkg-descr www/cherokee/pkg-descr --- /usr/ports/www/cherokee/pkg-descr Sun Apr 6 09:30:58 2003 +++ www/cherokee/pkg-descr Sat Jul 17 22:25:57 2004 @@ -3,4 +3,4 @@ provides only the most basic HTTP functionality, but is extremely fast and small. -WWW: http://www.alobbs.com/cherokee +WWW: http://www.alobbs.com/cherokee/ diff -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist --- /usr/ports/www/cherokee/pkg-plist Mon Apr 14 04:05:16 2003 +++ www/cherokee/pkg-plist Sat Jul 17 21:37:15 2004 @@ -1,48 +1,133 @@ -bin/cherokee +bin/cherokee-bench bin/cherokee-config -bin/cherokee_static +bin/cherokee-panic +etc/cherokee/advanced.conf etc/cherokee/cherokee.conf +etc/cherokee/icons.conf +etc/cherokee/mime.conf +etc/cherokee/mods-available/ssl +etc/cherokee/sites-available/default +etc/cherokee/sites-available/example.com +etc/cherokee/sites-enabled/default +include/cherokee/access.h include/cherokee/avl.h include/cherokee/buffer.h -include/cherokee/cherokee.h +include/cherokee/cherokee-config.h include/cherokee/common.h include/cherokee/connection.h +include/cherokee/crc32.h +include/cherokee/encoder.h +include/cherokee/encoder_table.h include/cherokee/fdpoll.h include/cherokee/handler.h +include/cherokee/handler_table.h +include/cherokee/handler_table_entry.h +include/cherokee/header.h include/cherokee/http.h +include/cherokee/icons.h include/cherokee/list.h +include/cherokee/list_ext.h include/cherokee/log.h -include/cherokee/plugin_table.h -include/cherokee/plugin_table_entry.h +include/cherokee/logger.h +include/cherokee/logger_table.h +include/cherokee/match.h +include/cherokee/matching_list.h +include/cherokee/mime.h +include/cherokee/mmap.h +include/cherokee/module.h +include/cherokee/module_loader.h include/cherokee/server.h +include/cherokee/socket.h include/cherokee/table.h +include/cherokee/tdate_parse.h +include/cherokee/thread.h +include/cherokee/validator.h include/cherokee/virtual_server.h +lib/cherokee/libcherokee_cgi.a +lib/cherokee/libcherokee_cgi.la +lib/cherokee/libcherokee_cgi.so +lib/cherokee/libcherokee_combined.a +lib/cherokee/libcherokee_combined.la +lib/cherokee/libcherokee_combined.so lib/cherokee/libcherokee_common.a lib/cherokee/libcherokee_common.la lib/cherokee/libcherokee_common.so -lib/cherokee/libcherokee_common.so.0 lib/cherokee/libcherokee_dirlist.a lib/cherokee/libcherokee_dirlist.la lib/cherokee/libcherokee_dirlist.so -lib/cherokee/libcherokee_dirlist.so.0 lib/cherokee/libcherokee_file.a lib/cherokee/libcherokee_file.la lib/cherokee/libcherokee_file.so -lib/cherokee/libcherokee_file.so.0 +lib/cherokee/libcherokee_gotls.a +lib/cherokee/libcherokee_gotls.la +lib/cherokee/libcherokee_gotls.so +lib/cherokee/libcherokee_gzip.a +lib/cherokee/libcherokee_gzip.la +lib/cherokee/libcherokee_gzip.so +lib/cherokee/libcherokee_mono.a +lib/cherokee/libcherokee_mono.la +lib/cherokee/libcherokee_mono.so +lib/cherokee/libcherokee_ncsa.a +lib/cherokee/libcherokee_ncsa.la +lib/cherokee/libcherokee_ncsa.so +lib/cherokee/libcherokee_nn.a +lib/cherokee/libcherokee_nn.la +lib/cherokee/libcherokee_nn.so +lib/cherokee/libcherokee_pam.a +lib/cherokee/libcherokee_pam.la +lib/cherokee/libcherokee_pam.so +lib/cherokee/libcherokee_phpcgi.a +lib/cherokee/libcherokee_phpcgi.la +lib/cherokee/libcherokee_phpcgi.so +lib/cherokee/libcherokee_plain.a +lib/cherokee/libcherokee_plain.la +lib/cherokee/libcherokee_plain.so lib/cherokee/libcherokee_redir.a lib/cherokee/libcherokee_redir.la lib/cherokee/libcherokee_redir.so -lib/cherokee/libcherokee_redir.so.0 +lib/cherokee/libcherokee_remote_control.a +lib/cherokee/libcherokee_remote_control.la +lib/cherokee/libcherokee_remote_control.so +lib/cherokee/libcherokee_server_info.a +lib/cherokee/libcherokee_server_info.la +lib/cherokee/libcherokee_server_info.so +lib/cherokee/libcherokee_w3c.a +lib/cherokee/libcherokee_w3c.la +lib/cherokee/libcherokee_w3c.so lib/libcherokee.a lib/libcherokee.la lib/libcherokee.so lib/libcherokee.so.0 +libdata/pkgconfig/cherokee.pc +sbin/cherokee share/aclocal/cherokee.m4 -share/cherokee/mime_types.txt -share/cherokee/Intro.txt -@dirrm etc/cherokee -@dirrm include/cherokee +%%DATADIR%%/Intro.txt +%%DATADIR%%/icons/back.png +%%DATADIR%%/icons/binary.png +%%DATADIR%%/icons/blank.png +%%DATADIR%%/icons/bomb.png +%%DATADIR%%/icons/compressed.png +%%DATADIR%%/icons/folder.png +%%DATADIR%%/icons/image.png +%%DATADIR%%/icons/movie.png +%%DATADIR%%/icons/pdf.png +%%DATADIR%%/icons/ps.png +%%DATADIR%%/icons/readme.png +%%DATADIR%%/icons/script.png +%%DATADIR%%/icons/sound.png +%%DATADIR%%/icons/tex.png +%%DATADIR%%/icons/text.png +%%DATADIR%%/icons/unknown.png +%%DATADIR%%/mime_types.txt +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% @dirrm lib/cherokee -@dirrm share/cherokee +@dirrm include/cherokee +@dirrm etc/cherokee/ssl +@dirrm etc/cherokee/sites-enabled +@dirrm etc/cherokee/sites-available +@dirrm etc/cherokee/mods-enabled +@dirrm etc/cherokee/mods-available +@dirrm etc/cherokee @unexec rmdir %%LOCALBASE%%/www/data 2>/dev/null || true @unexec rmdir %%LOCALBASE%%/www 2>/dev/null || true >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040717230028.20e7f914.tkato432>