From 38b984a1a0fbbe046359ea36b16305ab1e896d4e Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Mon, 21 Oct 2002 00:41:02 +0000
Subject: Fix build on -current (#include <stdlib.h> for exit() prototype) and
 respect CC and CFLAGS

---
 www/dhttpd/files/patch-Makefile | 28 ++++++++++++++++++++++++++++
 www/dhttpd/files/patch-main.cc  | 10 +++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 www/dhttpd/files/patch-Makefile

(limited to 'www')

diff --git a/www/dhttpd/files/patch-Makefile b/www/dhttpd/files/patch-Makefile
new file mode 100644
index 00000000000..63484542697
--- /dev/null
+++ b/www/dhttpd/files/patch-Makefile
@@ -0,0 +1,28 @@
+--- src/Makefile.orig	Mon Mar  3 16:35:53 1997
++++ src/Makefile	Sun Oct 20 17:42:06 2002
+@@ -1,22 +1,21 @@
+ # if compiling for SunOS, you need to add -lsocket to the LIBS variable
+ 
+ SH	= /bin/sh
+-CC	= gcc
++CXX	?= c++
+ MAKEFILE= Makefile
+-CFLAGS	= -O2 --pipe
+ LIBS	=
+ 
+ OBJECTS = main.o socket.o httpsock.o
+ 
+ .cc.o:
+-	$(CC) $(CFLAGS) -c -o $*.o $<
++	$(CXX) $(CXXFLAGS) -c -o $*.o $<
+ 
+ all:	compile dhttpd
+ 
+ compile: $(OBJECTS)
+ 
+ dhttpd: $(OBJECTS)
+-	$(CC) -o dhttpd $(OBJECTS) $(LIBS)
++	$(CXX) -o dhttpd $(OBJECTS) $(LIBS)
+ 	strip dhttpd
+ 
+ clean:
diff --git a/www/dhttpd/files/patch-main.cc b/www/dhttpd/files/patch-main.cc
index 1572b806066..77b53a87a68 100644
--- a/www/dhttpd/files/patch-main.cc
+++ b/www/dhttpd/files/patch-main.cc
@@ -1,6 +1,6 @@
---- src/main.cc	Tue Mar  4 09:10:41 1997
-+++ src/main.cc.orig	Mon Jun 24 15:12:32 2002
-@@ -18,7 +18,6 @@
+--- src/main.cc.orig	Mon Mar  3 17:10:41 1997
++++ src/main.cc	Sun Oct 20 17:41:25 2002
+@@ -18,10 +18,10 @@
   */
  
  #include <errno.h>
@@ -8,3 +8,7 @@
  #include <pwd.h>
  #include <signal.h>
  #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
-- 
cgit