svn commit: r350071 - in head/security/firewalk: . files

[Emanuel Haupt]

Author: ehaupt
Date: Fri Apr  4 09:16:12 2014
New Revision: 350071
URL: http://svnweb.freebsd.org/changeset/ports/350071
QAT: https://qat.redports.org/buildarchive/r350071/

Log:
  - Support staging
  - Define DOCS option
  - New LIB_DEPENDS definition
  - Modernize

Added:
  head/security/firewalk/files/patch-include__firewalk.h
     - copied unchanged from r350066, head/security/firewalk/files/patch-include:firewalk.h
  head/security/firewalk/files/patch-src__firewalk.c
     - copied unchanged from r350066, head/security/firewalk/files/patch-src:firewalk.c
Deleted:
  head/security/firewalk/files/patch-include:firewalk.h
  head/security/firewalk/files/patch-src:firewalk.c
  head/security/firewalk/pkg-plist
Modified:
  head/security/firewalk/Makefile

Modified: head/security/firewalk/Makefile
==============================================================================
--- head/security/firewalk/Makefile	Fri Apr  4 09:07:31 2014	(r350070)
+++ head/security/firewalk/Makefile	Fri Apr  4 09:16:12 2014	(r350071)
@@ -11,31 +11,33 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	onatan at gmail.com
 COMMENT=	Remote firewall auditing tool
 
-LIB_DEPENDS=	dnet:${PORTSDIR}/net/libdnet \
-		net:${PORTSDIR}/net/libnet
-
-WRKSRC=		${WRKDIR}/Firewalk
+LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
+		libnet.so:${PORTSDIR}/net/libnet
 
 GNU_CONFIGURE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAN8=		firewalk.8
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/firewalk man/man8/firewalk.8.gz
+PORTDOCS=	BUGS README TODO
+
+WRKSRC=		${WRKDIR}/Firewalk
+
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/firewalk ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${MANPREFIX}/man/man8/
-.	if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/BUGS ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.	endif
+	${INSTALL_PROGRAM} ${WRKSRC}/src/firewalk ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>

Copied: head/security/firewalk/files/patch-include__firewalk.h (from r350066, head/security/firewalk/files/patch-include:firewalk.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/firewalk/files/patch-include__firewalk.h	Fri Apr  4 09:16:12 2014	(r350071, copy of r350066, head/security/firewalk/files/patch-include:firewalk.h)
@@ -0,0 +1,13 @@
+--- include/firewalk.h.orig	Wed Sep 14 19:19:27 2005
++++ include/firewalk.h	Wed Sep 14 19:20:37 2005
+@@ -41,6 +41,10 @@
+ #include <dnet.h>
+ #include <libnet.h>
+ 
++#ifndef BIOCIMMEDIATE
++#define BIOCIMMEDIATE	_IOW('B',112,u_int)
++#endif
++
+ #define FW_BANNER  "Firewalk (c) 2002 Mike D. Schiffman \
+ <mike at infonexus.com>\nhttp://www.packetfactory.net/firewalk\n\
+ for more information.\n"

Copied: head/security/firewalk/files/patch-src__firewalk.c (from r350066, head/security/firewalk/files/patch-src:firewalk.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/firewalk/files/patch-src__firewalk.c	Fri Apr  4 09:16:12 2014	(r350071, copy of r350066, head/security/firewalk/files/patch-src:firewalk.c)
@@ -0,0 +1,11 @@
+--- src/firewalk.c.orig	Mon Aug 16 13:13:44 2004
++++ src/firewalk.c	Mon Aug 16 13:13:56 2004
+@@ -188,8 +188,6 @@
+                     case FW_SERIOUS_ERROR:
+                         /* err msg set in fw_packet_capture() */
+                         return (FW_SERIOUS_ERROR);
+-                    default:
+-                        /* empty */
+                 }
+             }
+         }