summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/w3c-httpd/Makefile10
-rw-r--r--www/w3c-httpd/files/patch-bb26
2 files changed, 21 insertions, 15 deletions
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index c17a55a1d816..b4488be8d30f 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,9 +1,9 @@
# New ports collection makefile for: w3c-httpd
# Version required: 3.0A
# Date created: 29 October 1994
-# Whom: pst
+# Whom: pst (orig)
#
-# $Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp $
+# $Id: Makefile,v 1.20 1999/05/10 04:05:14 steve Exp $
#
DISTNAME= w3c-httpd-3.0A
@@ -13,9 +13,11 @@ MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \
MAINTAINER= ports@FreeBSD.org
-NO_WRKSUBDIR= yes
+BUILD_DEPENDS= /nonexistent:${PORTSDIR}/net/wais:build
-WWW_ROOT= ${PREFIX}/www
+NO_WRKSUBDIR= yes
+WWW_ROOT?= ${PREFIX}/www
+MAKE_ENV+= PORTSDIR=${PORTSDIR}
pre-configure:
.if !defined(MD5_PW)
diff --git a/www/w3c-httpd/files/patch-bb b/www/w3c-httpd/files/patch-bb
index d3cdcf8f4fd0..dbe84e3a4247 100644
--- a/www/w3c-httpd/files/patch-bb
+++ b/www/w3c-httpd/files/patch-bb
@@ -1,5 +1,5 @@
*** All/freebsd/Makefile.include.orig Wed Jan 10 20:07:31 1996
---- All/freebsd/Makefile.include Sat May 8 12:30:11 1999
+--- All/freebsd/Makefile.include Sun May 9 20:12:35 1999
***************
*** 4,14 ****
# For W3 distribution, machine type for subdirectories
@@ -18,7 +18,7 @@
WWW_MACH = freebsd
! CFLAGS += -D__BSD__
-! LFLAGS += -lcrypt
+! LFLAGS = -lcrypt
# Directory for installed binary:
! BINDIR = $(PREFIX)/bin
@@ -26,19 +26,23 @@
# Where is the W3 object library to be installed (not normally done)?
LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
***************
-*** 25,31 ****
+*** 25,33 ****
#
# Uncomment these six lines (and edit them, if necessary).
#
! # WAIS = ../../../freeWAIS
- # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a
- # MATHLIB = -lm
- # WAISINC = -I$(WAIS)/include
---- 25,31 ----
+! # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a
+! # MATHLIB = -lm
+! # WAISINC = -I$(WAIS)/include
+! # WAISCFLAGS = -DHT_DIRECT_WAIS
+! # HTWAIS = $(WTMP)/Library/$(WWW_MACH)/HTWAIS.o
+--- 25,33 ----
#
# Uncomment these six lines (and edit them, if necessary).
#
-! # WAIS = ${PORTSDIR}/net/wais/work/freeWAIS-0.5/src
- # WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a
- # MATHLIB = -lm
- # WAISINC = -I$(WAIS)/include
+! WAIS = ${PORTSDIR}/net/wais/work/freeWAIS-0.5
+! WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a
+! MATHLIB = -lm
+! WAISINC = -I$(WAIS)/include
+! WAISCFLAGS = -DHT_DIRECT_WAIS
+! HTWAIS = $(WTMP)/Library/$(WWW_MACH)/HTWAIS.o