From fb953ffb5ba52c3a211db0d5c3fdad7917c48c6f Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Thu, 9 Jan 1997 03:07:52 +0000 Subject: Update, 3.0 -> 3.0A. Submitted by: Pedro Giffuni S. --- www/w3c-httpd/Makefile | 39 ++++++++++++++++----------------------- www/w3c-httpd/distinfo | 3 +-- www/w3c-httpd/files/patch-aa | 12 ++++++------ www/w3c-httpd/files/patch-ab | 35 +++++++++++++++++++---------------- www/w3c-httpd/files/patch-ba | 42 ++++++++++++++++++++++++++++++++++++++++++ www/w3c-httpd/files/patch-bb | 19 +++++++++++++++++++ www/w3c-httpd/pkg-comment | 2 +- www/w3c-httpd/pkg-descr | 20 +++++++++++++++++--- www/w3c-httpd/pkg-plist | 23 ++++++++++++++--------- 9 files changed, 135 insertions(+), 60 deletions(-) create mode 100644 www/w3c-httpd/files/patch-ba create mode 100644 www/w3c-httpd/files/patch-bb (limited to 'www/w3c-httpd') diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile index 7f4f233bbda9..9667a8f8e7a8 100644 --- a/www/w3c-httpd/Makefile +++ b/www/w3c-httpd/Makefile @@ -1,36 +1,29 @@ -# New ports collection makefile for: w3c_httpd -# Version required: 3.0 / 2.17 +# New ports collection makefile for: w3c-httpd +# Version required: 3.0A # Date created: 29 October 1994 # Whom: pst # -# $Id: Makefile,v 1.12 1996/11/18 11:42:11 asami Exp $ +# $Id: Makefile,v 1.13 1996/11/29 20:02:33 torstenb Exp $ # -DISTNAME= WWW -PKGNAME= w3c_httpd-3.0 +DISTNAME= w3c-httpd-3.0A CATEGORIES= www -MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \ - ftp://ftp.w3.org/pub/libwww/old/ -DISTFILES= libwww_2.17_src.tar.Z \ - httpd_3.0_src.tar.gz +MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ -MAINTAINER= sa2c@and.or.jp +MAINTAINER= m230761@ingenieria.ingsala.unal.edu.co + +NO_WRKSUBDIR= yes WWW_ROOT= ${PREFIX}/www do-install: - -mkdir ${WWW_ROOT} \ - ${WWW_ROOT}/data ${WWW_ROOT}/cgi-bin ${WWW_ROOT}/htbin - cd ${WRKSRC}/server_root; pax -rw * ${WWW_ROOT} - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/Daemon/unix/httpd ${PREFIX}/libexec - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/Daemon/unix/htadm ${PREFIX}/bin - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/Daemon/unix/htimage ${WWW_ROOT}/htbin - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/Daemon/unix/cgiparse ${WWW_ROOT}/cgi-bin - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/Daemon/unix/cgiutils ${WWW_ROOT}/cgi-bin + ${MKDIR} ${WWW_ROOT}/data ${WWW_ROOT}/cgi-bin ${WWW_ROOT}/htbin + ${CP} -R ${WRKSRC}/server_root/icons $(WWW_ROOT) + ${CP} ${WRKSRC}/server_root/config/*.conf $(PREFIX)/etc + ${INSTALL_PROGRAM} ${WRKSRC}/Daemon/freebsd/httpd ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/Daemon/freebsd/htadm ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Daemon/freebsd/htimage ${WWW_ROOT}/htbin + ${INSTALL_PROGRAM} ${WRKSRC}/Daemon/freebsd/cgiparse ${WWW_ROOT}/cgi-bin + ${INSTALL_PROGRAM} ${WRKSRC}/Daemon/freebsd/cgiutils ${WWW_ROOT}/cgi-bin .include diff --git a/www/w3c-httpd/distinfo b/www/w3c-httpd/distinfo index 77d627e217d9..631df9aa37d6 100644 --- a/www/w3c-httpd/distinfo +++ b/www/w3c-httpd/distinfo @@ -1,2 +1 @@ -MD5 (httpd_3.0_src.tar.gz) = 61d83f947c96e022aebcaf8d7b1c6a01 -MD5 (libwww_2.17_src.tar.Z) = 3ee4f68310947c236807a9ac26217b5b +MD5 (w3c-httpd-3.0A.tar.gz) = 8f9df48bb4fecdc6f1925573df8eb171 diff --git a/www/w3c-httpd/files/patch-aa b/www/w3c-httpd/files/patch-aa index 6ba1f7707af7..4f766df239f5 100644 --- a/www/w3c-httpd/files/patch-aa +++ b/www/w3c-httpd/files/patch-aa @@ -1,12 +1,12 @@ -*** BUILD Sat Sep 24 11:28:46 1994 ---- BUILD Sat Oct 29 12:20:18 1994 +*** BUILD.orig Sat Sep 24 13:28:46 1994 +--- BUILD Mon Dec 30 17:07:45 1996 *************** -*** 55,60 **** ---- 55,61 ---- - if ($UNAME == "ULTRIX") setenv WWW_MACH decstation +*** 56,61 **** +--- 56,62 ---- if ($UNAME == "AIX") setenv WWW_MACH rs6000 if ($UNAME == "OSF1") setenv WWW_MACH osf1 -+ if ($UNAME == "FreeBSD") setenv WWW_MACH unix if ($UNAME == "BSD/386") setenv WWW_MACH unix ++ if ($UNAME == "FreeBSD") setenv WWW_MACH freebsd if ($UNAME == "Linux") setenv WWW_MACH linux if ($UNAME == "A/UX") setenv WWW_MACH aux + if ($UNAME == "SMP_DC.SOx") setenv WWW_MACH pyramid diff --git a/www/w3c-httpd/files/patch-ab b/www/w3c-httpd/files/patch-ab index 651a6cec7d64..898f14824e20 100644 --- a/www/w3c-httpd/files/patch-ab +++ b/www/w3c-httpd/files/patch-ab @@ -1,19 +1,22 @@ -*** Daemon/Implementation/CommonMakefile.DIST Sat Oct 29 12:36:04 1994 ---- Daemon/Implementation/CommonMakefile Sat Oct 29 12:36:21 1994 +*** Library/Implementation/HTTCP.c.orig Mon Dec 30 12:20:05 1996 +--- Library/Implementation/HTTCP.c Mon Dec 30 13:23:20 1996 *************** -*** 35,41 **** - # If this env var is set to something else Some makes will use that instead - SHELL = /bin/sh - # Rule file to be used by target daemon -! RULE_FILE = "/etc/httpd.conf" +*** 113,118 **** +--- 113,119 ---- + extern int errno; + #endif /* errno */ - CMN = $(WWW)/Library/Implementation - INC = $(WWW)/Library/Implementation ---- 35,41 ---- - # If this env var is set to something else Some makes will use that instead - SHELL = /bin/sh - # Rule file to be used by target daemon -! RULE_FILE = "/usr/local/etc/httpd.conf" ++ #if !(defined(BSD) && (BSD >= 199306)) + #ifndef VM + #ifndef VMS + #ifndef NeXT +*************** +*** 123,128 **** +--- 124,130 ---- + #endif /* NeXT */ + #endif /* VMS */ + #endif /* VM */ ++ #endif /* FreeBSD */ + + #endif /* PCNFS */ - CMN = $(WWW)/Library/Implementation - INC = $(WWW)/Library/Implementation diff --git a/www/w3c-httpd/files/patch-ba b/www/w3c-httpd/files/patch-ba new file mode 100644 index 000000000000..e579d3ca9541 --- /dev/null +++ b/www/w3c-httpd/files/patch-ba @@ -0,0 +1,42 @@ +*** Daemon/Implementation/CommonMakefile.orig Mon Dec 30 17:25:30 1996 +--- Daemon/Implementation/CommonMakefile Mon Dec 30 17:27:26 1996 +*************** +*** 35,41 **** + # If this env var is set to something else Some makes will use that instead + SHELL = /bin/sh + # Rule file to be used by target daemon +! RULE_FILE = "/etc/httpd.conf" + + CMN = $(WWW)/Library/Implementation + INC = $(WWW)/Library/Implementation +--- 35,41 ---- + # If this env var is set to something else Some makes will use that instead + SHELL = /bin/sh + # Rule file to be used by target daemon +! RULE_FILE = "/usr/local/etc/httpd.conf" + + CMN = $(WWW)/Library/Implementation + INC = $(WWW)/Library/Implementation +*************** +*** 157,166 **** + + # Hypertext File server + +! PURIFY_CACHE = /home2/frystyk/purify-cache + + PURIFY = purify \ +! -logfile=$(HOME)/purify.log + -cache-dir=$(PURIFY_CACHE) + + # +--- 157,166 ---- + + # Hypertext File server + +! PURIFY_CACHE = /tmp/purify-cache + + PURIFY = purify \ +! -logfile=$(HOME)/purify.log \ + -cache-dir=$(PURIFY_CACHE) + + # diff --git a/www/w3c-httpd/files/patch-bb b/www/w3c-httpd/files/patch-bb new file mode 100644 index 000000000000..e7bd67a2316a --- /dev/null +++ b/www/w3c-httpd/files/patch-bb @@ -0,0 +1,19 @@ +*** All/freebsd/Makefile.include.orig Mon Dec 30 17:18:49 1996 +--- All/freebsd/Makefile.include Mon Dec 30 17:19:46 1996 +*************** +*** 5,11 **** + WWW_MACH = freebsd + + CFLAGS += -DDEBUG -D__BSD__ +! LFLAGS = + + # Directory for installed binary: + BINDIR = /usr/local/bin +--- 5,11 ---- + WWW_MACH = freebsd + + CFLAGS += -DDEBUG -D__BSD__ +! LFLAGS = -lcrypt + + # Directory for installed binary: + BINDIR = /usr/local/bin diff --git a/www/w3c-httpd/pkg-comment b/www/w3c-httpd/pkg-comment index 84cda3a5aeeb..1561b559a08d 100644 --- a/www/w3c-httpd/pkg-comment +++ b/www/w3c-httpd/pkg-comment @@ -1 +1 @@ -HTTPD (WWW) server from the W3 Consortium (W3C) +WWW server from the W3 Consortium (W3C). diff --git a/www/w3c-httpd/pkg-descr b/www/w3c-httpd/pkg-descr index 13effb44aa39..4597e8a8bb97 100644 --- a/www/w3c-httpd/pkg-descr +++ b/www/w3c-httpd/pkg-descr @@ -1,3 +1,17 @@ -This is the W3 Consortium (W3C) httpd (WWW) server. It is the most -versatile WWW server currently in the public domain, however it's not -particularly easy to configure for the neophyte. +W3C httpd is a generic public domain full-featured hypertext server +which can be used as a regular HTTP server. The running typically on +port 80 to serve hypertext and other documents, and also as a proxy -- +a server on a firewall machine -- that provides access for people +inside a firewall to the outside world. When running as proxy httpd +may be configured to do caching of documents resulting in faster +response times. + +For more information on the Library, please look at the page + + http://www.w3.org/hypertext/WWW/Daemon/Status.html + +Have fun! + +-- + +httpd@w3.org, May 1995 diff --git a/www/w3c-httpd/pkg-plist b/www/w3c-httpd/pkg-plist index f315eed20e43..7a6843fbdf3a 100644 --- a/www/w3c-httpd/pkg-plist +++ b/www/w3c-httpd/pkg-plist @@ -1,13 +1,18 @@ -libexec/httpd bin/htadm +etc/all.conf +etc/caching.conf +etc/httpd.conf +etc/prot.conf +etc/proxy.conf +libexec/httpd www/cgi-bin/cgiparse www/cgi-bin/cgiutils -www/htbin/htimage -www/config/httpd.conf -www/config/proxy.conf +www/config/all.conf www/config/caching.conf +www/config/httpd.conf www/config/prot.conf -www/config/all.conf +www/config/proxy.conf +www/htbin/htimage www/icons/back.xbm www/icons/binary.xbm www/icons/binhex.xbm @@ -16,8 +21,10 @@ www/icons/compressed.xbm www/icons/dir.gif www/icons/directory.xbm www/icons/doc.gif +www/icons/doc.xbm www/icons/dummy.xbm www/icons/ftp.xbm +www/icons/gzip.xbm www/icons/image.xbm www/icons/index.xbm www/icons/index2.xbm @@ -27,8 +34,6 @@ www/icons/tar.xbm www/icons/telnet.xbm www/icons/text.xbm www/icons/unknown.doc.xbm -www/icons/uu.xbm -www/icons/unknown.xbm -www/icons/doc.xbm -www/icons/gzip.xbm www/icons/unknown.old.xbm +www/icons/unknown.xbm +www/icons/uu.xbm -- cgit v1.2.3