4 files changed, 32 insertions, 9 deletions

diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile
index f2431a954704..ec734e82ab53 100644
--- a/sysutils/ipa/Makefile
+++ b/sysutils/ipa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipa
-PORTVERSION=	1.2.8
+PORTVERSION=	1.2.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.simon.org.ua/ipa/ \
 		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
@@ -26,4 +26,27 @@ MAN5=		ipa.5 ipa.conf.5
 MAN8=		ipa.8 ipastat.8
 MANLANG=	"" ru_RU.KOI8-R
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-everything:
+	@${ECHO_MSG} "-------------------------------------------------------------------"
+.if !defined(WITHOUT_IPFW)
+	@${ECHO_MSG} "o You can remove IPv4 Firewall support by defining WITHOUT_IPFW"
+.endif
+.if !defined(WITHOUT_IP6FW) && ${OSVERSION} >= 420001
+	@${ECHO_MSG} "o You can remove IPv6 Firewall support by defining WITHOUT_IP6FW"
+.endif
+.if !defined(WITHOUT_IPFIL)
+	@${ECHO_MSG} "o You can remove IP Filter support by defining WITHOUT_IPFIL"
+.endif
+.if !defined(WITHOUT_IP6FW) && !defined(WITH_IP6FW) && ${OSVERSION} >= 400000 && ${OSVERSION} < 420001
+	@${ECHO_MSG} "o You can add IPv6 Firewall support by defining WITH_IP6FW,"
+	@${ECHO_MSG} "  this support will be probably broken on your system (see the"
+	@${ECHO_MSG} "  ${WRKSRC}/INSTALL file for more information)"
+.endif
+.if !defined(IPFW2) && !defined(WITHOUT_IPFW) && ${OSVERSION} >= 460100 && ${OSVERSION} < 500038
+	@${ECHO_MSG} "o You can add IPFW2 support by defining IPFW2"
+.endif
+	@${ECHO_MSG} "-------------------------------------------------------------------"
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/ipa/distinfo b/sysutils/ipa/distinfo
index a87c5a19a828..981ee7cc9846 100644
--- a/sysutils/ipa/distinfo
+++ b/sysutils/ipa/distinfo
@@ -1 +1 @@
-MD5 (ipa-1.2.8.tar.gz) = b0e8e4e11d25ee0855780beb0557092e
+MD5 (ipa-1.2.9.tar.gz) = 9bd5314eec444921441601c8dcf0db08
diff --git a/sysutils/ipa/files/patch-aa b/sysutils/ipa/files/patch-aa
index bdb987120189..225b09d20cc1 100644
--- a/sysutils/ipa/files/patch-aa
+++ b/sysutils/ipa/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Sep 27 23:24:32 2002
-+++ Makefile	Sat Sep 28 20:11:41 2002
+--- Makefile.orig	Mon Oct 28 21:40:37 2002
++++ Makefile	Mon Oct 28 22:15:47 2002
 @@ -38,7 +38,7 @@
  #	-Ox   - optimize;
  #	-g    - produce debugging information.
@@ -9,7 +9,7 @@
  
  #
  # PREFIX - prefix for all below listed paths
-@@ -96,10 +96,10 @@
+@@ -81,10 +81,10 @@
  #
  # Some INSTALL_* variables
  #
@@ -24,7 +24,7 @@
  INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  
-@@ -241,8 +241,10 @@
+@@ -247,8 +247,10 @@
  .endif
  	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5
  	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8
diff --git a/sysutils/ipa/pkg-descr b/sysutils/ipa/pkg-descr
index 1892b2b24f0d..938221971532 100644
--- a/sysutils/ipa/pkg-descr
+++ b/sysutils/ipa/pkg-descr
@@ -1,6 +1,6 @@
 ipa(8) allows to make IP accounting (network accounting) based on
-FreeBSD IPv4/v6 Firewall, OpenBSD Packet Filter and IP Filter
-accounting rules on FreeBSD, NetBSD and OpenBSD.
+FreeBSD IPv4/v6 Firewall (including IPFW2), OpenBSD Packet Filter and
+IP Filter accounting rules on FreeBSD, NetBSD and OpenBSD.
 
 It supports limits for accounting rules and limits events as "limit is
 reached", "reached limit is expired", etc. It understands time intervals