Update to actual cherokee-devel after repocopy. Fix: #!/bin/sh
Responsible Changed From-To: freebsd-ports-bugs->sat sat@ wants his PRs
Integrated changes from www/cherokee: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # cherokee-devel # cherokee-devel/files # cherokee-devel/files/patch-cherokee-util.h # cherokee-devel/files/patch-Makefile.in # cherokee-devel/files/patch-cherokee-handler_cgi_base.c # cherokee-devel/files/cherokee.sh.in # cherokee-devel/files/patch-cherokee-connection.c # cherokee-devel/Makefile # cherokee-devel/distinfo # cherokee-devel/pkg-descr # cherokee-devel/pkg-plist # echo c - cherokee-devel mkdir -p cherokee-devel > /dev/null 2>&1 echo c - cherokee-devel/files mkdir -p cherokee-devel/files > /dev/null 2>&1 echo x - cherokee-devel/files/patch-cherokee-util.h sed 's/^X//' >cherokee-devel/files/patch-cherokee-util.h << 'END-of-cherokee-devel/files/patch-cherokee-util.h' X--- cherokee/util.h.orig Wed Sep 13 22:13:07 2006 X+++ cherokee/util.h Wed Sep 13 22:15:20 2006 X@@ -31,6 +31,14 @@ X X #include <cherokee/common.h> X X+#ifdef HAVE_SYS_TYPES_H X+#include <sys/types.h> X+#endif X+ X+#ifdef HAVE_SYS_SOCKET_H X+# include <sys/socket.h> X+#endif X+ X #include <time.h> X #include <dirent.h> X END-of-cherokee-devel/files/patch-cherokee-util.h echo x - cherokee-devel/files/patch-Makefile.in sed 's/^X//' >cherokee-devel/files/patch-Makefile.in << 'END-of-cherokee-devel/files/patch-Makefile.in' X--- Makefile.in.orig Sat Apr 7 22:43:45 2007 X+++ Makefile.in Sat Apr 7 22:57:30 2007 X@@ -962,9 +962,6 @@ X else \ X $(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \ X fi X- @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \ X- $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \ X- fi X @if test -f $(DESTDIR)$(cherokeeconfdir)/mods-available/icons ; then \ X echo "$@ will not overwrite existing $(DESTDIR)$(cherokeeconfdir)/mods-available/icons"; \ X else \ END-of-cherokee-devel/files/patch-Makefile.in echo x - cherokee-devel/files/patch-cherokee-handler_cgi_base.c sed 's/^X//' >cherokee-devel/files/patch-cherokee-handler_cgi_base.c << 'END-of-cherokee-devel/files/patch-cherokee-handler_cgi_base.c' X--- cherokee/handler_cgi_base.c.orig Mon Dec 11 11:44:26 2006 X+++ cherokee/handler_cgi_base.c Thu Dec 14 10:09:38 2006 X@@ -21,7 +21,8 @@ X * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 X * USA X */ X- X+#include <stdlib.h> X+#include <limits.h> X #include "common-internal.h" X #include "handler_cgi_base.h" X END-of-cherokee-devel/files/patch-cherokee-handler_cgi_base.c echo x - cherokee-devel/files/cherokee.sh.in sed 's/^X//' >cherokee-devel/files/cherokee.sh.in << 'END-of-cherokee-devel/files/cherokee.sh.in' X#!/bin/sh X# X# $FreeBSD: ports/www/cherokee/files/cherokee.sh.in,v 1.2 2006/07/19 18:55:37 rafan Exp $ X# X# PROVIDE: cherokee X# REQUIRE: DAEMON X# KEYWORD: shutdown X# X# Add the following lines to /etc/rc.conf to enable cherokee: X# X# cherokee_enable (bool): Set it to "YES" to enable cherokee X# Default is "NO". X# cherokee_conf (path): Set full path to config file. X# Default is "%%PREFIX%%/etc/cherokee/cherokee.conf". X# X X. %%RC_SUBR%% X Xname="cherokee" Xrcvar=`set_rcvar` X Xload_rc_config $name X X: ${cherokee_enable="NO"} X: ${cherokee_conf="%%PREFIX%%/etc/cherokee/cherokee.conf"} X Xcommand=%%PREFIX%%/sbin/cherokee Xcommand_args="-C ${cherokee_conf} -b" Xpidfile=/var/run/cherokee.pid Xrequired_files=${cherokee_conf} Xstop_postcmd=stop_postcmd X Xstop_postcmd() X{ X rm -f ${pidfile} X} X Xrun_rc_command "$1" END-of-cherokee-devel/files/cherokee.sh.in echo x - cherokee-devel/files/patch-cherokee-connection.c sed 's/^X//' >cherokee-devel/files/patch-cherokee-connection.c << 'END-of-cherokee-devel/files/patch-cherokee-connection.c' X--- cherokee/connection.c.orig Mon Dec 11 11:44:26 2006 X+++ cherokee/connection.c Thu Dec 14 09:50:08 2006 X@@ -32,6 +32,7 @@ X #include <fcntl.h> X #include <time.h> X #include <sys/types.h> X+#include <limits.h> X X #ifdef HAVE_PWD_H X # include <pwd.h> END-of-cherokee-devel/files/patch-cherokee-connection.c echo x - cherokee-devel/Makefile sed 's/^X//' >cherokee-devel/Makefile << 'END-of-cherokee-devel/Makefile' X# New ports collection makefile for: cherokee-devel X# Date created: 24 Apr 2007 X# Whom: Beech Rintoul <beech@alaskaparadise.com> X# X# $FreeBSD$ X# X XPORTNAME= cherokee XPORTVERSION= 0.6.0b700 XCATEGORIES= www XMASTER_SITES= http://www.cherokee-project.com/download/%SUBDIR%/ \ X http://freebsd.alaskaparadise.com/source/ XMASTER_SITE_SUBDIR= ${PORTVERSION:R}/0.6.0/ XPKGNAMESUFFIX= -devel X XMAINTAINER= beech@alaskaparadise.com XCOMMENT= An extremely fast and flexible web server X XLIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre X XCONFLICTS= cherokee-[0-9]* XUSE_GNOME= gnomehack gnometarget pkgconfig XUSE_LDCONFIG= yes XUSE_RC_SUBR= cherokee.sh XUSE_GCC= 3.4+ XUSE_BISON= yes XGNU_CONFIGURE= yes XCPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} XLDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} XCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" XCONFIGURE_ARGS= --mandir=${MANPREFIX}/man \ X --with-wwwroot=${PREFIX}/www/cherokee \ X --enable-readdir_r \ X --disable-static XDEFCONFS= cherokee.conf mime.compression.types mime.types XCONFSUBDIRS= ssl mods-available mods-enabled XMAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1 X XOPTIONS= OPENSSL "TLS/SSL support via openssl" on \ X GNUTLS "TLS/SSL support via gnutls" off \ X IPV6 "IPv6 support" on X X.include <bsd.port.pre.mk> X X.ifndef WITHOUT_OPENSSL XCONFIGURE_ARGS+=--enable-tls=openssl X.elifdef WITH_GNUTLS XLIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls XCONFIGURE_ARGS+=--enable-tls=gnutls X.else XCONFIGURE_ARGS+=--disable-tls X.endif X X.ifdef WITHOUT_IPV6 XCONFIGURE_ARGS+=--disable-ipv6 X.endif X Xpost-patch: X @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ X ${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR} --|g' X @${REINPLACE_CMD} -e '/cherokee_replace.*%sysconfdir%/d;/^SUBDIRS/s| doc ||;\ X /^install-data-am/s|install-data-local|install-data-local-config|'\ X ${WRKSRC}/Makefile.in X @for i in ${BUILD_WRKSRC}/*.sample.pre;do ${SED} -e \ X 's:%sysconfdir%:${PREFIX}/etc:g; \ X s:%datadir%:${PREFIX}/share:g; \ X s:%wwwroot%:${PREFIX}/www/cherokee:g; \ X s:%prefix%:${PREFIX}:g; \ X s:#.*User.*nobody:User www:g; \ X s:#.*Group.*nogroup:Group www:g; \ X s:#.*PollMethod.*poll:PollMethod kqueue:g' \ X $$i > $${i%.pre};done X Xpost-install: X @${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|} X @for i in ${DEFCONFS};do\ X ${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done X @for i in ${WRKSRC}/mods-*.sample;do\ X ${INSTALL_DATA} $$i ${PREFIX}/etc/cherokee/mods-available/$${i#*mods-};done X @:>${PREFIX}/etc/cherokee/mods-enabled/.empty X @:>${PREFIX}/etc/cherokee/ssl/.empty X @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\ X if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done X @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\ X if [ ! -f $${i%.sample} ];then ${CP} $$i $${i%.sample};fi;done X X.include <bsd.port.post.mk> END-of-cherokee-devel/Makefile echo x - cherokee-devel/distinfo sed 's/^X//' >cherokee-devel/distinfo << 'END-of-cherokee-devel/distinfo' XMD5 (cherokee-0.6.0b700.tar.gz) = bba3567da2802bef8a76694d8e29ef47 XSHA256 (cherokee-0.6.0b700.tar.gz) = 3fbad3ce1f3e444d4067555bdd0065267c75f71b7e45df2a1e057459edd9f008 XSIZE (cherokee-0.6.0b700.tar.gz) = 1025738 END-of-cherokee-devel/distinfo echo x - cherokee-devel/pkg-descr sed 's/^X//' >cherokee-devel/pkg-descr << 'END-of-cherokee-devel/pkg-descr' XCherokee is a very fast, flexible, and lightweight Web server. It is Ximplemented entirely in C, and has no dependencies beyond a standard C Xlibrary. It is embeddable and extensible with plug-ins. It supports on-the-fly Xconfiguration by reading files or strings, TLS/SSL (via GNUTLS or OpenSSL), Xvirtual hosts, authentication, cache friendly features, PHP, custom error Xmanagement, and much more. X XWWW: http://www.cherokee-project.com/ END-of-cherokee-devel/pkg-descr echo x - cherokee-devel/pkg-plist sed 's/^X//' >cherokee-devel/pkg-plist << 'END-of-cherokee-devel/pkg-plist' Xbin/cget Xbin/cherokee-config Xbin/cherokee-panic Xbin/cherokee_logrotate X@unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done X@unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done Xetc/cherokee/cherokee.conf.default Xetc/cherokee/mime.compression.types.default Xetc/cherokee/mime.types.default Xetc/cherokee/mods-available/ssl.sample Xetc/cherokee/mods-available/icons.conf.sample Xetc/cherokee/mods-enabled/.empty Xetc/cherokee/ssl/.empty X@exec for i in `find %D/etc/cherokee -name \*.default`;do if [ ! -f ${i%%.default} ];then cp $i ${i%%.default};fi;done X@exec for i in `find %D/etc/cherokee -name \*.sample`;do if [ ! -f ${i%%.sample} ];then cp $i ${i%%.sample};fi;done Xinclude/cherokee/admin_client.h Xinclude/cherokee/buffer.h Xinclude/cherokee/cherokee-config.h Xinclude/cherokee/cherokee.h Xinclude/cherokee/common.h Xinclude/cherokee/connection.h Xinclude/cherokee/connection_info.h Xinclude/cherokee/downloader.h Xinclude/cherokee/encoder.h Xinclude/cherokee/fdpoll.h Xinclude/cherokee/handler.h Xinclude/cherokee/header.h Xinclude/cherokee/http.h Xinclude/cherokee/list.h Xinclude/cherokee/logger.h Xinclude/cherokee/macros.h Xinclude/cherokee/mime.h Xinclude/cherokee/mime_entry.h Xinclude/cherokee/module.h Xinclude/cherokee/nonce.h Xinclude/cherokee/plugin.h Xinclude/cherokee/plugin_loader.h Xinclude/cherokee/resolv_cache.h Xinclude/cherokee/server.h Xinclude/cherokee/table.h Xinclude/cherokee/url.h Xinclude/cherokee/util.h Xinclude/cherokee/version.h Xlib/cherokee/libplugin_admin.la Xlib/cherokee/libplugin_admin.so Xlib/cherokee/libplugin_cgi.la Xlib/cherokee/libplugin_cgi.so Xlib/cherokee/libplugin_combined.la Xlib/cherokee/libplugin_combined.so Xlib/cherokee/libplugin_common.la Xlib/cherokee/libplugin_common.so Xlib/cherokee/libplugin_dirlist.la Xlib/cherokee/libplugin_dirlist.so Xlib/cherokee/libplugin_error_redir.la Xlib/cherokee/libplugin_error_redir.so Xlib/cherokee/libplugin_fastcgi.la Xlib/cherokee/libplugin_fastcgi.so Xlib/cherokee/libplugin_fcgi.la Xlib/cherokee/libplugin_fcgi.so Xlib/cherokee/libplugin_file.la Xlib/cherokee/libplugin_file.so Xlib/cherokee/libplugin_gzip.la Xlib/cherokee/libplugin_gzip.so Xlib/cherokee/libplugin_htdigest.la Xlib/cherokee/libplugin_htdigest.so Xlib/cherokee/libplugin_htpasswd.so Xlib/cherokee/libplugin_htpasswd.la Xlib/cherokee/libplugin_ldap.la Xlib/cherokee/libplugin_ldap.so Xlib/cherokee/libplugin_mirror.so Xlib/cherokee/libplugin_mirror.la Xlib/cherokee/libplugin_mysql.so Xlib/cherokee/libplugin_mysql.la Xlib/cherokee/libplugin_ncsa.la Xlib/cherokee/libplugin_ncsa.so Xlib/cherokee/libplugin_nn.la Xlib/cherokee/libplugin_nn.so Xlib/cherokee/libplugin_pam.so Xlib/cherokee/libplugin_pam.la Xlib/cherokee/libplugin_phpcgi.la Xlib/cherokee/libplugin_phpcgi.so Xlib/cherokee/libplugin_plain.la Xlib/cherokee/libplugin_plain.so Xlib/cherokee/libplugin_proxy.so Xlib/cherokee/libplugin_proxy.la Xlib/cherokee/libplugin_redir.la Xlib/cherokee/libplugin_redir.so Xlib/cherokee/libplugin_round_robin.so Xlib/cherokee/libplugin_round_robin.la Xlib/cherokee/libplugin_scgi.la Xlib/cherokee/libplugin_scgi.so Xlib/cherokee/libplugin_server_info.la Xlib/cherokee/libplugin_server_info.so Xlib/cherokee/libplugin_w3c.la Xlib/cherokee/libplugin_w3c.so Xlib/libcherokee-base.la Xlib/libcherokee-base.so Xlib/libcherokee-base.so.0 Xlib/libcherokee-client.la Xlib/libcherokee-client.so Xlib/libcherokee-client.so.0 Xlib/libcherokee-config.la Xlib/libcherokee-config.so Xlib/libcherokee-config.so.0 Xlib/libcherokee-server.la Xlib/libcherokee-server.so Xlib/libcherokee-server.so.0 Xlibdata/pkgconfig/cherokee.pc Xsbin/cherokee-admin Xsbin/cherokee Xshare/aclocal/cherokee.m4 X%%DATADIR%%/themes/default/header.html X%%DATADIR%%/themes/default/footer.html X%%DATADIR%%/themes/default/entry.html X%%DATADIR%%/themes/default/theme.css X%%DATADIR%%/themes/default/cherokee-logo.png X%%DATADIR%%/deps/combined.deps X%%DATADIR%%/deps/common.deps X%%DATADIR%%/deps/error_redir.deps X%%DATADIR%%/deps/nn.deps X%%DATADIR%%/deps/phpcgi.deps X%%DATADIR%%/icons/back.png X%%DATADIR%%/icons/binary.png X%%DATADIR%%/icons/blank.png X%%DATADIR%%/icons/bomb.png X%%DATADIR%%/icons/compressed.png X%%DATADIR%%/icons/folder.png X%%DATADIR%%/icons/image.png X%%DATADIR%%/icons/iso.png X%%DATADIR%%/icons/java.png X%%DATADIR%%/icons/movie.png X%%DATADIR%%/icons/pdf.png X%%DATADIR%%/icons/ps.png X%%DATADIR%%/icons/readme.png X%%DATADIR%%/icons/script.png X%%DATADIR%%/icons/sound.png X%%DATADIR%%/icons/tex.png X%%DATADIR%%/icons/text.png X%%DATADIR%%/icons/unknown.png X%%DATADIR%%/mime_types.txt Xwww/cherokee/images/cherokee-logo.png Xwww/cherokee/images/default-bg.png Xwww/cherokee/images/powered_by_cherokee.png Xwww/cherokee/index.html X@dirrm %%DATADIR%%/icons X@dirrm %%DATADIR%%/deps X@dirrm %%DATADIR%%/themes/default X@dirrm %%DATADIR%%/themes X@dirrm %%DATADIR%% X@dirrm lib/cherokee X@dirrm include/cherokee X@dirrmtry etc/cherokee/ssl X@dirrmtry etc/cherokee/sites-enabled X@dirrmtry etc/cherokee/mods-enabled X@dirrm etc/cherokee/mods-available X@dirrmtry etc/cherokee X@dirrmtry www/cherokee/images X@dirrmtry www/cherokee END-of-cherokee-devel/pkg-plist exit
sat 2007-05-01 19:33:03 UTC FreeBSD ports repository Modified files: www Makefile www/cherokee-devel Makefile distinfo pkg-plist Removed files: www/cherokee-devel/files patch-cherokee-socket.c Log: - Update cherokee-devel to the latest snapshot - Connect to the build PR: ports/111389, ports/112114 Submitted by: Beech Rintoul <beech@alaskaparadise.com> (maintainer) Revision Changes Path 1.1804 +1 -0 ports/www/Makefile 1.38 +12 -16 ports/www/cherokee-devel/Makefile 1.21 +3 -3 ports/www/cherokee-devel/distinfo 1.5 +0 -23 ports/www/cherokee-devel/files/patch-cherokee-socket.c (dead) 1.19 +34 -70 ports/www/cherokee-devel/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks!