diff options
| author | steve <steve@FreeBSD.org> | 2000-05-28 11:25:16 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-05-28 11:25:16 +0800 |
| commit | 80b8a6f63d12c0fb67a3ed8668e71421508e05d7 (patch) | |
| tree | c8868766f0067f75b6c1463cf3ba7499caeca883 | |
| parent | 08aa6d99624068ab808d998f6a164fab98d902fa (diff) | |
| download | freebsd-ports-graphics-80b8a6f63d12c0fb67a3ed8668e71421508e05d7.tar.gz freebsd-ports-graphics-80b8a6f63d12c0fb67a3ed8668e71421508e05d7.tar.zst freebsd-ports-graphics-80b8a6f63d12c0fb67a3ed8668e71421508e05d7.zip | |
Don't add -O2 to CFLAGS. Make this port honor CFLAGS and CXXFLAGS. Fix
build for -current.
| -rw-r--r-- | www/fhttpd/files/patch-ac | 17 | ||||
| -rw-r--r-- | www/fhttpd/files/patch-ae | 18 | ||||
| -rw-r--r-- | www/fhttpd/files/patch-ag | 12 |
3 files changed, 40 insertions, 7 deletions
diff --git a/www/fhttpd/files/patch-ac b/www/fhttpd/files/patch-ac index 5772321b605..f0de05cf760 100644 --- a/www/fhttpd/files/patch-ac +++ b/www/fhttpd/files/patch-ac @@ -1,5 +1,5 @@ ---- Makefile Mon Apr 19 13:38:56 1999 -+++ Makefile.new Fri Dec 24 00:14:18 1999 +--- Makefile.orig Mon Apr 19 12:38:56 1999 ++++ Makefile Sat May 27 14:51:57 2000 @@ -99,21 +99,21 @@ ## for Linux (glibc2/libc 6): @@ -25,7 +25,7 @@ -# -DSIGARGS="int sig" -DSIGACTARGS="int sig"\ -# -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK -#LFLAGS = -lcrypt -+COPTS = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\ ++COPTS = -fno-strength-reduce -DLS_OPTIONS_IGNORE\ + -D__s32=int -DMMAPPAGESIZE=65536\ + -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\ + -DSIGARGS="int sig" -DSIGACTARGS="int sig"\ @@ -34,3 +34,14 @@ # End of OS-dependent definitions +@@ -126,8 +126,8 @@ + # Don't modify anything below + + CXXOPTS = $(COPTS) +-CXXFLAGS = $(CXXOPTS) $(DEBUG) +-CFLAGS = $(COPTS) $(DEBUG) ++CXXFLAGS += $(CXXOPTS) $(DEBUG) ++CFLAGS += $(COPTS) $(DEBUG) + + FHTTPD_OFILES = pseudopoll.o lists.o wildmat.o util.o configfile.o users.o \ + process.o log.o loadedfile.o sockobj.o configargs.o fhttpd.o diff --git a/www/fhttpd/files/patch-ae b/www/fhttpd/files/patch-ae index 4870350a46a..8f7bcf4418b 100644 --- a/www/fhttpd/files/patch-ae +++ b/www/fhttpd/files/patch-ae @@ -1,6 +1,16 @@ ---- sockobj.cc.orig Sat Jan 29 00:54:37 2000 -+++ sockobj.cc Sat Jan 29 00:55:34 2000 -@@ -645,7 +645,7 @@ +--- sockobj.cc.orig Sat May 15 06:13:54 1999 ++++ sockobj.cc Sat May 27 14:57:47 2000 +@@ -53,6 +53,9 @@ + #include <stdarg.h> + #include <errno.h> + #include <time.h> ++#if defined(__FreeBSD__) && __FreeBSD__ >= 5 ++#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ ++#endif + #include <sys/socket.h> + #include <sys/un.h> + #include <netinet/in.h> +@@ -645,7 +648,7 @@ global_nconnections++; if(xsocket->status==0){ hisaddresslength=128; @@ -9,7 +19,7 @@ if(h<0) return; hisaddress=(struct sockaddr*)malloc(hisaddresslength); if(hisaddress) memcpy(hisaddress,s,hisaddresslength); else{ -@@ -1861,7 +1861,7 @@ +@@ -1861,7 +1864,7 @@ if(fdarray[sockets[i]->handleindexforwheel].revents&POLLIN){ fdarray[sockets[i]->handleindexforwheel].revents&=~POLLIN; hisaddresslength=128; diff --git a/www/fhttpd/files/patch-ag b/www/fhttpd/files/patch-ag new file mode 100644 index 00000000000..f08fc28d018 --- /dev/null +++ b/www/fhttpd/files/patch-ag @@ -0,0 +1,12 @@ +--- servproc.h.orig Sat May 27 15:00:37 2000 ++++ servproc.h Sat May 27 15:00:58 2000 +@@ -29,6 +29,9 @@ + #endif + #include <sys/time.h> + #include <sys/stat.h> ++#if defined(__FreeBSD__) && __FreeBSD__ >= 5 ++#include <machine/param.h> /* for ALIGN macro needed by CMSG_DATA */ ++#endif + #include <sys/socket.h> + #include <sys/un.h> + #include <sys/file.h> |