- Add LICENSE

- Switch to options helpers
- Regenerate patches with `make makepatch`

5 files changed, 25 insertions, 19 deletions

diff --git a/security/ipfw2dshield/Makefile b/security/ipfw2dshield/Makefile
index 3a26597b33cc..cccc7350d550 100644
--- a/security/ipfw2dshield/Makefile
+++ b/security/ipfw2dshield/Makefile
@@ -9,6 +9,9 @@ MASTER_SITES=	http://www.dynamical-systems.org/ipfw/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DShield client for ipfw logs
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 PORTDOCS=	CHANGES README.html README.txt
 
 OPTIONS_DEFINE=	DOCS
@@ -20,7 +23,7 @@ post-patch:
 		${WRKSRC}/ipaddr/Makefile \
 		${WRKSRC}/strpdate/Makefile
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
diff --git a/security/ipfw2dshield/files/patch-Makefile b/security/ipfw2dshield/files/patch-Makefile
index 97070322aefe..03af926e3fe1 100644
--- a/security/ipfw2dshield/files/patch-Makefile
+++ b/security/ipfw2dshield/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-05-29 16:27:21.000000000 +0200
-+++ Makefile	2014-07-11 00:00:21.463847887 +0200
+--- Makefile.orig	2004-05-29 14:27:21 UTC
++++ Makefile
 @@ -4,7 +4,8 @@
  RMCMD	= rm -f
  INSTALL = install
@@ -10,7 +10,7 @@
  sbindir	= $(prefix)/sbin
  
  SUBDIRS	= ipaddr strpdate
-@@ -28,13 +29,13 @@
+@@ -28,13 +29,13 @@ $(RC):
  install: $(RC)
  	@for subdir in $(SUBDIRS); do (cd $$subdir && make install) ; done
  	@[ -d $(sbindir) ] || mkdir -vp $(sbindir)
diff --git a/security/ipfw2dshield/files/patch-README.html b/security/ipfw2dshield/files/patch-README.html
index 43c6b5c0e6e6..c2124e646d7d 100644
--- a/security/ipfw2dshield/files/patch-README.html
+++ b/security/ipfw2dshield/files/patch-README.html
@@ -1,6 +1,6 @@
---- README.html.orig	Tue Jun  1 23:51:53 2004
-+++ README.html	Wed Jun  9 12:46:58 2004
-@@ -38,9 +38,22 @@
+--- README.html.orig	2004-06-01 21:52:15 UTC
++++ README.html
+@@ -38,11 +38,24 @@ This will install the following files:
  /usr/local/bin/ipaddr<br>
  ~/.ipfw2dshield.rc.sample
  </dd></dl>
@@ -13,13 +13,15 @@
  Copy or rename the sample configuration file to <em>~/.ipfw2dshield.rc</em>
  and edit this latter file to fit your local demands. Please read section 2
  below for an explanation of the configuration entries.
-+<p>
-+
+ <p>
+ 
 +<b>Note:</b> The FreeBSD ports version does also accept
 +<nobr><em>/usr/local/etc/ipfw2dshield.rc</em></nobr>
 +as its configuration file. However, the preference is for
 +<nobr><em>~/.ipfw2dshield.rc</em></nobr>
 +in case that both these files exist.
- <p>
- 
++<p>
++
  The script creates a stampfile in <em>/var/tmp</em> where it stores date 
+ and time information which will be accessed on a subsequent run to prevent
+ multiple submission of log records. 
diff --git a/security/ipfw2dshield/files/patch-README.txt b/security/ipfw2dshield/files/patch-README.txt
index a54b342053c8..0df4b6e3995f 100644
--- a/security/ipfw2dshield/files/patch-README.txt
+++ b/security/ipfw2dshield/files/patch-README.txt
@@ -1,6 +1,6 @@
---- README.txt.orig	Tue Jun  1 23:51:53 2004
-+++ README.txt	Wed Jun  9 12:46:58 2004
-@@ -21,9 +21,17 @@
+--- README.txt.orig	2004-06-01 21:52:15 UTC
++++ README.txt
+@@ -21,10 +21,18 @@ This will install the following files:
        /usr/local/bin/ipaddr
        ~/.ipfw2dshield.rc.sample
  
@@ -11,10 +11,11 @@
  Copy or rename the sample configuration file to ~~//..iippffww22ddsshhiieelldd..rrcc and edit
  this latter file to fit your local demands. Please read section 2 below for an
  explanation of the configuration entries.
-+
+ 
 +NNoottee:: The FreeBSD ports version does also accept //uussrr//llooccaall//eettcc//iippffww22ddsshhiieelldd..rrcc
 +as its configuration file. However, the preference is for ~~//..iippffww22ddsshhiieelldd..rrcc in
 +case that both these files exist.
- 
++
  The script creates a stampfile in //vvaarr//ttmmpp where it stores date and time
  information which will be accessed on a subsequent run to prevent multiple
+ submission of log records. Hence this file should remain untouched for correct
diff --git a/security/ipfw2dshield/files/patch-ipfw2dshield b/security/ipfw2dshield/files/patch-ipfw2dshield
index a9595771bd5c..46060f66f9a6 100644
--- a/security/ipfw2dshield/files/patch-ipfw2dshield
+++ b/security/ipfw2dshield/files/patch-ipfw2dshield
@@ -1,6 +1,6 @@
---- ipfw2dshield.orig	Sat Oct  9 10:53:48 2004
-+++ ipfw2dshield	Wed Nov 24 21:46:41 2004
-@@ -279,7 +279,8 @@
+--- ipfw2dshield.orig	2004-10-09 08:54:10 UTC
++++ ipfw2dshield
+@@ -279,7 +279,8 @@ else
  fi
  
  # Suck in the config file.