o Fix a breakage (missed <sys/types.h>);

o respect CFLAGS.

Submitted by:	bento

4 files changed, 53 insertions, 4 deletions

diff --git a/www/webredirect/Makefile b/www/webredirect/Makefile
index 396ca1fdde76..49e3e121ade5 100644
--- a/www/webredirect/Makefile
+++ b/www/webredirect/Makefile
@@ -12,12 +12,13 @@ MASTER_SITES=	ftp://Raditex.se/pub/kaj/
 
 MAINTAINER=	rasmus@kaj.se
 
+ALL_TARGET=	depend all
+
 MAN1=		webredirect.1
 
-.include <bsd.port.pre.mk>
+pre-build:
+	@${TOUCH} ${WRKSRC}/incu/depend.mk
 
-do-configure:
-	${TOUCH} ${WRKSRC}/incu/depend.mk && cd ${WRKSRC} && ${MAKE} depend
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/webredirect ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/webredirect.1 ${PREFIX}/man/man1
@@ -25,4 +26,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/webredirect/files/patch-Makefile b/www/webredirect/files/patch-Makefile
new file mode 100644
index 000000000000..51e027fa709a
--- /dev/null
+++ b/www/webredirect/files/patch-Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile	2001/03/14 15:12:36	1.1
++++ Makefile	2001/03/14 15:12:46
+@@ -1,7 +1,7 @@
+ SRC	= webredirect.cc
+ OBJ	= ${SRC:.cc=.o}
+ INCLUDES = -Iincu
+-CXXFLAGS = -pipe -Wall -O2 ${INCLUDES}
++CXXFLAGS += -pipe -Wall ${INCLUDES}
+ PROG	= webredirect
+ 
+ all: ${PROG}
diff --git a/www/webredirect/files/patch-incu::Makefile b/www/webredirect/files/patch-incu::Makefile
new file mode 100644
index 000000000000..6494f9a70ce5
--- /dev/null
+++ b/www/webredirect/files/patch-incu::Makefile
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- incu/Makefile	2001/03/14 15:13:51	1.1
++++ incu/Makefile	2001/03/14 15:14:08
+@@ -1,6 +1,6 @@
+ SRC	= error.cc socket.cc log.cc system.cc time.cc pipe.cc
+ OBJS	= ${SRC:.cc=.o}
+-CXXFLAGS = -I. -pipe -Wall -O2
++CXXFLAGS += -I. -pipe -Wall
+ RANLIB	= ranlib
+ 
+ all: libincu.a depend.mk .cvsignore
+@@ -9,7 +9,7 @@
+ 	rm -f ${OBJS}
+ 
+ libincu.a: ${OBJS}
+-	-rm $@
++	rm -f $@
+ 	${AR} cq $@ ${OBJS} ${ARADD}
+ 	${RANLIB} $@
+ 
diff --git a/www/webredirect/files/patch-incu::incu::socket.hh b/www/webredirect/files/patch-incu::incu::socket.hh
new file mode 100644
index 000000000000..84c76ad5e224
--- /dev/null
+++ b/www/webredirect/files/patch-incu::incu::socket.hh
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- incu/incu/socket.hh	2001/03/14 15:11:52	1.1
++++ incu/incu/socket.hh	2001/03/14 15:12:11
+@@ -1,5 +1,6 @@
+ #ifndef INCU_SOCKET
+ #define INCU_SOCKET
++#include <sys/types.h>
+ #include <netdb.h>		// Needed by <sys/socket.h> on some systems
+ #include <sys/socket.h>
+ #include <netinet/in.h>