Date: Tue, 14 May 2002 21:29:28 -0400 (EDT) From: Pierre-Luc Lespérance <oksala@videotron.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: pending/38092: Update Port : www/cherokee fixed working directory Message-ID: <200205150129.g4F1TShR000472@oksala.org>
next in thread | raw e-mail | index | archive | help
>Number: 38092
>Category: pending
>Synopsis: Update Port : www/cherokee fixed working directory
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue May 14 18:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: silence
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD silence 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #7: Mon May 6 15:40:51 EDT 2002 root@silence:/usr/src/sys/compile/oksala i386
>Description:
- Working directory was ${PREFIX}/share/cherokee
and It's changed to ${PREFIX}/www/data
>How-To-Repeat:
>Fix:
# 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
# cherokee/Makefile
# cherokee/files
# cherokee/files/patch-aa
# cherokee/distinfo
# cherokee/pkg-comment
# cherokee/pkg-descr
# cherokee/pkg-plist
#
echo c - cherokee
mkdir -p cherokee > /dev/null 2>&1
echo x - cherokee/Makefile
sed 's/^X//' >cherokee/Makefile << 'END-of-cherokee/Makefile'
XPORTNAME= Cherokee
XPORTVERSION= 0.2.8
XCATEGORIES= www
XMASTER_SITES= http://www.alobbs.com/cherokee/
XMAINTAINER= oksala@videotron.ca
X
XHAS_CONFIGURE= yes
XPREFIX=/usr/local
X
X#
X# User Configuration
X# This may seem a little overloaded
X# But there is not configuration files or getopt options
X#
X
X#User Configurations
X#Dir for your html files
X.if defined(HTDOCS)
XHTDOCS=${HTDOCS}
X.else
XHTDOCS=${PREFIX}/www/data
X.endif
X
X#Process UID
X.if defined(USER_ID)
XUSER_ID=${USER_ID}
X.else
XUSER_ID=80 #www
X.endif
X
X#Process GID
X.if defined(GROUP_ID)
XGROUP_ID=${GROUP_ID}
X.else
XGROUP_ID=80 #www
X.endif
X
X#inet port
X.if defined(PORT)
XPORT=${PORT}
X.else
XPORT=80
X.endif
X
X#index files
X.if defined(INDEX)
XINDEX=${INDEX}
X.else
XINDEX=index.html
X.endif
X
X
Xpre-configure:
X @${ECHO} ""
X @${ECHO} "=================================="
X @${ECHO} ""
X @${ECHO} "Current configuration :"
X @${ECHO} "Working directory : ${HTDOCS} (HTDOCS)"
X @${ECHO} "Process id : ${USER_ID} (USER_ID)"
X @${ECHO} "Process gid : ${GROUP_ID} (GROUP_ID)"
X @${ECHO} "Inet port : ${PORT} (PORT)"
X @${ECHO} "Index files : ${INDEX} (INDEX)"
X @${ECHO} ""
X @${ECHO} "=================================="
X @${ECHO} ""
X
XCONFIGURE_ARGS+= \
X --prefix=${PREFIX} \
X --enable-daemon\
X --enable-warnings\
X --with-htdocs=${HTDOCS}\
X --with-uid=${UID} \
X --with-gid=${GID} \
X --with-port=${PORT} \
X --with-index=${INDEX}
X
Xpre-install:
X @if [ ! -f ${PREFIX}/www ]; then \
X ${MKDIR} ${PREFIX}/www;\
X fi
X @if [ ! -f ${HTDOCS} ] ; then \
X ${MKDIR} ${HTDOCS};\
X fi
X.include <bsd.port.mk>
END-of-cherokee/Makefile
echo c - cherokee/files
mkdir -p cherokee/files > /dev/null 2>&1
echo x - cherokee/files/patch-aa
sed 's/^X//' >cherokee/files/patch-aa << 'END-of-cherokee/files/patch-aa'
X--- src/cherokee.h.old Fri Dec 28 07:39:11 2001
X+++ src/cherokee.h Tue May 14 14:49:35 2002
X@@ -28,11 +28,11 @@
X #include <stdio.h>
X #include <stdlib.h>
X #include <string.h>
X+#include <sys/types.h>
X #include <netinet/in.h>
X #include <sys/socket.h>
X #include <sys/wait.h>
X #include <sys/time.h>
X-#include <sys/types.h>
X #include <sys/stat.h>
X #include <unistd.h>
X #include <fcntl.h>
X--- src/server.h.old Fri Dec 28 07:25:54 2001
X+++ src/server.h Tue May 14 14:49:35 2002
X@@ -26,9 +26,9 @@
X
X #include <stdio.h>
X #include <stdlib.h>
X-#include <netinet/in.h>
X-#include <sys/socket.h>
X #include <sys/types.h>
X+#include <sys/socket.h>
X+#include <netinet/in.h>
X
X #include "configuration.h"
X
X--- src/socket.h.old Thu Dec 27 05:49:07 2001
X+++ src/socket.h Tue May 14 14:49:35 2002
X@@ -26,8 +26,11 @@
X
X #include <stdio.h>
X #include <stdlib.h>
X+#include <string.h>
X+#include <sys/types.h>
X #include <sys/socket.h>
X #include <sys/time.h>
X+#include <unistd.h>
X
X int __inline socket_ready_to_read (int socket);
X
END-of-cherokee/files/patch-aa
echo x - cherokee/distinfo
sed 's/^X//' >cherokee/distinfo << 'END-of-cherokee/distinfo'
XMD5 (Cherokee-0.2.8.tar.gz) = ffefd914d7d242c2e52fc85b3ecc221a
END-of-cherokee/distinfo
echo x - cherokee/pkg-comment
sed 's/^X//' >cherokee/pkg-comment << 'END-of-cherokee/pkg-comment'
XCherokee is an extremely fast and tiny web server.
END-of-cherokee/pkg-comment
echo x - cherokee/pkg-descr
sed 's/^X//' >cherokee/pkg-descr << 'END-of-cherokee/pkg-descr'
XCherokee is a tiny, ultrafast, lightweight Web server. It is implemented
Xentirely in C, and has no dependencies beyond a standard C library. It
Xprovides only the most basic HTTP functionality, but is extremely fast and
Xsmall.
X
XWWW: http://www.alobbs.com/cherokee
END-of-cherokee/pkg-descr
echo x - cherokee/pkg-plist
sed 's/^X//' >cherokee/pkg-plist << 'END-of-cherokee/pkg-plist'
Xbin/cherokee
X@dirrm www/data
X@dirrm www
END-of-cherokee/pkg-plist
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
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?200205150129.g4F1TShR000472>