- Update to 2.5-stable1

- no changelog available

4 files changed, 47 insertions, 42 deletions

diff --git a/net/LaBrea/Makefile b/net/LaBrea/Makefile
index 27665c6bf1e..30e15b875e6 100644
--- a/net/LaBrea/Makefile
+++ b/net/LaBrea/Makefile
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.13 2005/01/28 23:35:59 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2005/02/09 20:49:02 adrianp Exp $
 #
 
-DISTNAME=	LaBrea2_3
-PKGNAME=	LaBrea-2.3
-PKGREVISION=	1
+DISTNAME=	labrea-2.5-stable-1
+PKGNAME=	LaBrea-2.5
 CATEGORIES=	net security
-MASTER_SITES=	http://www.hackbusters.net/LaBrea/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=labrea/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.hackbusters.net/LaBrea/
+HOMEPAGE=	http://labrea.sourceforge.net/labrea-info.html
 COMMENT=	Builds tarpits/honeypots for scanners
 
-WRKSRC=		${WRKDIR}/LaBrea
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_BUILDLINK3=	YES
-BUILDLINK_DEPENDS.libnet+=	libnet<=1.0.1b
+GNU_CONFIGURE=	YES
+USE_PKGINSTALL=	YES
 
-post-extract:
-	cd ${WRKSRC};							\
-		${MV} LaBrea.c LaBrea.c.in &&				\
-		${SED} -e 's/.$$//' -e 's|LaBrea.README|${PREFIX}/share/doc/LaBrea|g' LaBrea.c.in > LaBrea.c
+CONF_FILES=	${PREFIX}/share/examples/LaBrea/labrea.conf \
+		${PKG_SYSCONFDIR}/labrea.conf
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/LaBrea.README ${PREFIX}/share/doc/LaBrea
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LaBrea
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/LaBrea
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/LaBrea
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/LaBrea
+	${INSTALL_DATA} ${WRKSRC}/misc/labrea.conf \
+		${PREFIX}/share/examples/LaBrea
 
-.include "../../devel/libnet/buildlink3.mk"
+.include "../../net/libdnet/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/LaBrea/PLIST b/net/LaBrea/PLIST
index f55d1dbbc55..7fc129a7efe 100644
--- a/net/LaBrea/PLIST
+++ b/net/LaBrea/PLIST
@@ -1,3 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/07 16:31:26 agc Exp $
-sbin/LaBrea
-share/doc/LaBrea
+@comment $NetBSD: PLIST,v 1.3 2005/02/09 20:49:02 adrianp Exp $
+man/man1/labrea.1
+man/man5/labrea.conf.5
+sbin/labrea
+share/doc/LaBrea/README
+share/doc/LaBrea/INSTALL
+share/examples/LaBrea/labrea.conf
+@dirrm share/doc/LaBrea
+@dirrm share/examples/LaBrea
diff --git a/net/LaBrea/distinfo b/net/LaBrea/distinfo
index f3499f518b0..a83e86daebc 100644
--- a/net/LaBrea/distinfo
+++ b/net/LaBrea/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/11/05 06:20:27 itojun Exp $
+$NetBSD: distinfo,v 1.3 2005/02/09 20:49:02 adrianp Exp $
 
-SHA1 (LaBrea2_3.tgz) = f78d51afc9b2f3c3a27cee45629ef9d489e7d581
-Size (LaBrea2_3.tgz) = 27951 bytes
-SHA1 (patch-aa) = aeb62428e0105d092c4c26cf9af21d171d310bd8
+SHA1 (labrea-2.5-stable-1.tar.gz) = 8f374b05cc50294b2773bda98f8317cf5b102067
+Size (labrea-2.5-stable-1.tar.gz) = 210494 bytes
+SHA1 (patch-aa) = f3b7b2556513a90b24b5adf73a99da28462d33e4
diff --git a/net/LaBrea/patches/patch-aa b/net/LaBrea/patches/patch-aa
index 9ed8a36d8fe..b4f8dc9b2d4 100644
--- a/net/LaBrea/patches/patch-aa
+++ b/net/LaBrea/patches/patch-aa
@@ -1,20 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/11 14:49:31 agc Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/09 20:49:02 adrianp Exp $
 
---- Makefile.orig	Thu Sep 13 18:00:00 2001
-+++ Makefile	Thu Oct 11 15:28:45 2001
-@@ -1,12 +1,8 @@
- all: LaBrea
- 
--OPTFLAGS = -g -O6 -funroll-loops -frerun-cse-after-loop -finline-functions \
---mcpu=i686 -fexpensive-optimizations
--#OPTFLAGS = -g
--CC = gcc
--CFLAGS = -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES)
--LDLIBS = `libnet-config --libs` -lpcap
--INCLUDES = -I/usr/include/pcap
-+CFLAGS= -Wall `libnet-config --defines` $(OPTFLAGS) $(INCLUDES)
-+LDLIBS= `libnet-config --libs` -lpcap
-+INCLUDES= -I${PREFIX}/include
- 
- LaBrea:	LaBrea.o
+--- misc/Makefile.in.orig	2005-02-08 21:35:35.000000000 +0000
++++ misc/Makefile.in
+@@ -247,12 +247,6 @@ sysconfDATA_INSTALL = $(INSTALL_DATA)
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	@list='$(sysconf_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
+-	  $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
+-	done
  
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)