Update to 1.2.8

PR:		43465
Submitted by:	maintainer

5 files changed, 15 insertions, 12 deletions

diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile
index 29d2d936ec7d..f2431a954704 100644
--- a/sysutils/ipa/Makefile
+++ b/sysutils/ipa/Makefile
@@ -6,11 +6,13 @@
 #
 
 PORTNAME=	ipa
-PORTVERSION=	1.2.7
+PORTVERSION=	1.2.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.simon.org.ua/ipa/ \
 		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
-		http://www.outloud.org/ipa/
+		ftp://ftp.mirrors.wiretapped.net/pub/security/network-monitoring/ipa/ \
+		http://www.outloud.org/ipa/ \
+		http://ipa.it-ss.be/
 
 MAINTAINER=	simon@simon.org.ua
 
diff --git a/sysutils/ipa/distinfo b/sysutils/ipa/distinfo
index cf79c10288e6..a87c5a19a828 100644
--- a/sysutils/ipa/distinfo
+++ b/sysutils/ipa/distinfo
@@ -1 +1 @@
-MD5 (ipa-1.2.7.tar.gz) = db3ea4565917a6fbe35da953647e15e0
+MD5 (ipa-1.2.8.tar.gz) = b0e8e4e11d25ee0855780beb0557092e
diff --git a/sysutils/ipa/files/patch-aa b/sysutils/ipa/files/patch-aa
index c1b0fc073aeb..bdb987120189 100644
--- a/sysutils/ipa/files/patch-aa
+++ b/sysutils/ipa/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Dec 25 04:52:48 2001
-+++ Makefile	Fri Dec 28 23:10:11 2001
+--- Makefile.orig	Fri Sep 27 23:24:32 2002
++++ Makefile	Sat Sep 28 20:11:41 2002
 @@ -38,7 +38,7 @@
  #	-Ox   - optimize;
  #	-g    - produce debugging information.
@@ -9,7 +9,7 @@
  
  #
  # PREFIX - prefix for all below listed paths
-@@ -97,10 +97,10 @@
+@@ -96,10 +96,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
  
-@@ -243,8 +243,10 @@
+@@ -241,8 +241,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 754b120ee5e6..1892b2b24f0d 100644
--- a/sysutils/ipa/pkg-descr
+++ b/sysutils/ipa/pkg-descr
@@ -1,4 +1,4 @@
-IPA allows to make IP accounting (network accounting) based on
+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.
 
@@ -6,8 +6,7 @@ It supports limits for accounting rules and limits events as "limit is
 reached", "reached limit is expired", etc. It understands time intervals
 like "end of day", "end of week", "end of month", etc.
 
-There is special viewer for accounting database and access control lists,
-which allow or disallow one to view accounting information for rules.
+ipastat(8) is a viewer for IP accounting database made by ipa(8).
 
 WWW: http://www.simon.org.ua/ipa/
 
diff --git a/sysutils/ipa/pkg-plist b/sysutils/ipa/pkg-plist
index cb05c2786afa..64cfaa70a16f 100644
--- a/sysutils/ipa/pkg-plist
+++ b/sysutils/ipa/pkg-plist
@@ -7,5 +7,7 @@ etc/rc.d/ipa.sh.sample
 %%PORTDOCS%%share/examples/ipa/example-1
 %%PORTDOCS%%share/examples/ipa/example-2
 %%PORTDOCS%%@dirrm share/examples/ipa
-@unexec rmdir %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true
-@unexec if [ -L %D/man/ru_RU.KOI8-R ]; then rm %D/man/ru_RU.KOI8-R 2>/dev/null || true; else rmdir %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R && rm %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
+@unexec if [ ! -L %D/man/ru_RU.KOI8-R ]; then rmdir %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
+@unexec if [ ! -L %D/man/ru_SU.KOI8-R ]; then rmdir %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true ; fi
+@unexec if [ -L %D/man/ru_RU.KOI8-R -a ! -d %D/man/ru_SU.KOI8-R ]; then rm %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
+@unexec if [ -L %D/man/ru_SU.KOI8-R -a ! -d %D/man/ru_RU.KOI8-R ]; then rm %D/man/ru_SU.KOI8-R 2>/dev/null || true ; fi