respect CC and CFLAGS, and unbreak LaBrea on ia64 and alpha.

refine description.

Noticed by:	kris and bento

3 files changed, 29 insertions, 61 deletions

diff --git a/security/labrea/Makefile b/security/labrea/Makefile
index 51f9271ce104..dacca6687a0a 100644
--- a/security/labrea/Makefile
+++ b/security/labrea/Makefile
@@ -17,11 +17,12 @@ COMMENT=	Security tarpit defense tool
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
-ALL_TARGET=	${PORTNAME}
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/LaBrea.README ${DOCSDIR}
 	@echo "******************************************"
 	@echo "You will need to read the LaBrea.README in"
diff --git a/security/labrea/files/patch-Makefile b/security/labrea/files/patch-Makefile
index e6a231a73390..b44a51908349 100644
--- a/security/labrea/files/patch-Makefile
+++ b/security/labrea/files/patch-Makefile
@@ -1,53 +1,22 @@
-*** Makefile	Wed Feb 20 09:27:56 2002
---- Makefile.new	Wed Jun 11 18:10:47 2003
-***************
-*** 4,17 ****
-  -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer
-  #OPTFLAGS = -g
-  CC = gcc
-! CFLAGS = -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES)
-  LDLIBS = `libnet-config --libs` -lpcap 
-! LDFLAGS = -s
-! INCLUDES = -I/usr/include/pcap
-! 
-! LaBrea:	LaBrea.o CleanExit.o FixArrays.o GoDaemon.o \
-!         PacketHandler.o ServiceTimer.o ToggleLogging.o
-  
-  LaBrea.o: LaBrea.c labrea.h defines.h
-  CleanExit.o: CleanExit.c labrea.h defines.h
-  FixArrays.o: FixArrays.c labrea.h defines.h
---- 4,17 ----
-  -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer
-  #OPTFLAGS = -g
-  CC = gcc
-! CFLAGS = -Wall `libnet-config --defines` -DCONFIG_PATH=\"/usr/local/etc\" $(OPTFLAGS) $(INCLUDES)
-  LDLIBS = `libnet-config --libs` -lpcap 
-! LDFLAGS = -s -L/usr/local/lib
-! INCLUDES = -I/usr/include/pcap -I/usr/local/include
-! FILES = LaBrea.o CleanExit.o FixArrays.o GoDaemon.o PacketHandler.o ServiceTimer.o ToggleLogging.o
-  
-+ LaBrea: $(FILES)
-+        
-  LaBrea.o: LaBrea.c labrea.h defines.h
-  CleanExit.o: CleanExit.c labrea.h defines.h
-  FixArrays.o: FixArrays.c labrea.h defines.h
-***************
-*** 20,26 ****
-  ServiceTimer.o: ServiceTimer.c labrea.h defines.h
-  ToggleLogging.o: ToggleLogging.c labrea.h defines.h
-  
-  clean:
-  	rm -f *.o core LaBrea
-- 
-  
---- 20,29 ----
-  ServiceTimer.o: ServiceTimer.c labrea.h defines.h
-  ToggleLogging.o: ToggleLogging.c labrea.h defines.h
-  
-+ install: 
-+ 	$(CC) -o LaBrea $(FILES) $(LDFLAGS) $(LDLIBS)
-+ 	$(INSTALL) -c -o root -g wheel LaBrea /usr/local/bin
-+ 
-  clean:
-  	rm -f *.o core LaBrea
-  
+--- Makefile.orig	Thu Feb 21 00:27:56 2002
++++ Makefile	Wed Jun 25 10:36:50 2003
+@@ -3,14 +3,15 @@
+ OPTFLAGS = -O6 -funroll-loops -frerun-cse-after-loop -finline-functions \
+ -mcpu=i686 -fexpensive-optimizations -fomit-frame-pointer
+ #OPTFLAGS = -g
+-CC = gcc
+-CFLAGS = -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES)
++CC ?= gcc
++CFLAGS += -Wall `libnet-config --defines` -DCONFIG_PATH=\"$(PREFIX)/etc\" $(INCLUDES)
+ LDLIBS = `libnet-config --libs` -lpcap 
+-LDFLAGS = -s
+-INCLUDES = -I/usr/include/pcap
++LDFLAGS = -s -L$(PREFIX)/lib
++INCLUDES = -I/usr/include/pcap -I$(PREFIX)/include
+ 
+ LaBrea:	LaBrea.o CleanExit.o FixArrays.o GoDaemon.o \
+         PacketHandler.o ServiceTimer.o ToggleLogging.o
++	$(CC) -o LaBrea $> $(LDFLAGS) $(LDLIBS)
+ 
+ LaBrea.o: LaBrea.c labrea.h defines.h
+ CleanExit.o: CleanExit.c labrea.h defines.h
diff --git a/security/labrea/pkg-descr b/security/labrea/pkg-descr
index ef6a0df167f4..ea675c88b7e6 100644
--- a/security/labrea/pkg-descr
+++ b/security/labrea/pkg-descr
@@ -1,9 +1,7 @@
-LaBrea  is  a  small  Linux-based  application  that  puts  unused  IP
-addresses on your network to  use,  creating a "tarpit" which can stop
-or slow down scans of your  address space, eg, CodeRed.
-It is licensed under the GPL.
-
-For more information, visit:
+LaBrea takes over unused IP addresses, and creates virtual servers that
+are attractive to worms, hackers, and other denizens of the Internet.
+The program answers connection attempts in such a way that the machine
+at the other end gets "stuck", sometimes for a very long time. 
 
 WWW: http://www.hackbusters.net