Update to 1.3.1, from Andrey Simonenko in PR 20486.

Changes in ipa-1.3.1 (from the ipa-1.3.1/HISTORY file):
1.      Some improvements for ipa(8) were implemented, as a result
        ipa(8) now uses less CPU time when works with many rules and
        with many limits.
2.      Fixed incorrectly rounded Kbytes, Mbytes, Gbytes and Tbytes in
        output of ipastat(8).
3.      Fixed some minor bugs in ipa(8).

Package changes:
1.      Two MASTER_SITES were removed.
2.      MAINTAINER email was changed.
3.      ALL_TARGET was "disabled", let original Makefile finds
        right target.

4 files changed, 37 insertions, 39 deletions

diff --git a/net/ipa/DESCR b/net/ipa/DESCR
index b69fa31dfb6..3e89b00ab05 100644
--- a/net/ipa/DESCR
+++ b/net/ipa/DESCR
@@ -9,5 +9,4 @@ like "end of day", "end of week", "end of month", etc.
 ipastat(8) is a viewer for IP accounting database made by ipa(8).
 
 - Andrey Simonenko
-simon@simon.org.ua
 simon@comsys.ntu-kpi.kiev.ua
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index 3afd26b3a28..30b8e753c00 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/05 07:11:41 wiz Exp $
 
-DISTNAME=	ipa-1.3
+DISTNAME=	ipa-1.3.1
 CATEGORIES=	net sysutils
-MASTER_SITES=	http://www.simon.org.ua/ipa/ \
-		http://ipa-system.sourceforge.net/ \
+MASTER_SITES=	http://ipa-system.sourceforge.net/ \
 		http://www.mirrors.wiretapped.net/security/network-monitoring/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
-HOMEPAGE=	http://www.simon.org.ua/ipa/
+MAINTAINER=	simon@comsys.ntu-kpi.kiev.ua
+HOMEPAGE=	http://ipa-system.sourceforge.net/
 COMMENT=	IP accounting software
 
 RESTRICTED=		"Needs to be built uniquely for each host"
@@ -20,7 +18,7 @@ NO_PACKAGE=		${RESTRICTED}
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
-ALL_TARGET=		NetBSD
+ALL_TARGET=		# empty
 
 CFLAGS+=		-DCFGFILE=\\\"${PKG_SYSCONFDIR}/ipa.conf\\\"
 
@@ -32,4 +30,5 @@ RCD_SCRIPTS=		ipa
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ipa
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ipa/distinfo b/net/ipa/distinfo
index e7c0fc69488..31ba23c9e5b 100644
--- a/net/ipa/distinfo
+++ b/net/ipa/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/01/09 17:38:36 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2003/03/05 07:11:41 wiz Exp $
 
-SHA1 (ipa-1.3.tar.gz) = 3c6c71d88b9c15ce8cf8c04a2c2a022ef1c239d9
-Size (ipa-1.3.tar.gz) = 135183 bytes
-SHA1 (patch-aa) = 0164a4dd1934c38d46265dd2d41a46b31af8e9ac
+SHA1 (ipa-1.3.1.tar.gz) = 3226a89c8dee0d630fb108e29a4367559aa44c76
+Size (ipa-1.3.1.tar.gz) = 134042 bytes
+SHA1 (patch-aa) = bed495cd58e2c9d2414fe4e94f8f3613b988be64
 SHA1 (patch-ab) = edce3d9d03ee7456c440ce4179e1e8c39bb516f2
diff --git a/net/ipa/patches/patch-aa b/net/ipa/patches/patch-aa
index 95b96f92212..e40789ead2d 100644
--- a/net/ipa/patches/patch-aa
+++ b/net/ipa/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2002/10/30 09:28:34 martti Exp $
+$NetBSD: patch-aa,v 1.8 2003/03/05 07:11:41 wiz Exp $
 
---- Makefile.orig	Mon Oct 28 21:40:37 2002
-+++ Makefile	Tue Oct 29 22:31:42 2002
+--- Makefile.orig	Thu Feb 20 07:06:58 2003
++++ Makefile	Thu Feb 27 11:11:33 2003
 @@ -38,7 +38,7 @@
  #	-Ox   - optimize;
  #	-g    - produce debugging information.
@@ -13,16 +13,16 @@ $NetBSD: patch-aa,v 1.7 2002/10/30 09:28:34 martti Exp $
  # PREFIX - prefix for all below listed paths
 @@ -58,7 +58,7 @@
  #
- # DSTETCDIR - where to install template configuration
+ # DST_ETC_DIR - where to install template configuration
  #
--DSTETCDIR=	${PREFIX}/etc
-+DSTETCDIR=	${DSTEXAMPLEDIR}
+-DST_ETC_DIR=	${PREFIX}/etc
++DST_ETC_DIR=	${DST_EXAMPLE_DIR}
  
  #
- # DSTRCDIR - where to install sample rc-script
+ # DST_RC_DIR - where to install sample rc-script
 @@ -81,10 +81,10 @@
  #
- # Some INSTALL_* variables
+ # INSTALL_* variables
  #
 -INSTALL_MAN=		${INSTALL} -c -g wheel -o root -m 0444
 -INSTALL_DATA=		${INSTALL} -c -g wheel -o root -m 0444
@@ -35,26 +35,26 @@ $NetBSD: patch-aa,v 1.7 2002/10/30 09:28:34 martti Exp $
  INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
  
-@@ -236,21 +236,9 @@
- 	${INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
- 	${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
- 	${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
--.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man5)
--	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_RU.KOI8-R/man5
+@@ -207,21 +207,9 @@
+ 	${INSTALL_PROGRAM} ipa ipastat ${DST_BIN_DIR}
+ 	${INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DST_MAN_DIR}/man5
+ 	${INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DST_MAN_DIR}/man8
+-.if !exists(${DST_MAN_DIR}/ru_RU.KOI8-R/man5)
+-	${INSTALL_MAN_DIR} ${DST_MAN_DIR}/ru_RU.KOI8-R/man5
 -.endif
--.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man8)
--	${INSTALL_MAN_DIR} ${DSTMANDIR}/ru_RU.KOI8-R/man8
+-.if !exists(${DST_MAN_DIR}/ru_RU.KOI8-R/man8)
+-	${INSTALL_MAN_DIR} ${DST_MAN_DIR}/ru_RU.KOI8-R/man8
 -.endif
--.if !exists(${DSTMANDIR}/ru_SU.KOI8-R)
--	${LN} -s ${DSTMANDIR}/ru_RU.KOI8-R ${DSTMANDIR}/ru_SU.KOI8-R
+-.if !exists(${DST_MAN_DIR}/ru_SU.KOI8-R)
+-	${LN} -s ${DST_MAN_DIR}/ru_RU.KOI8-R ${DST_MAN_DIR}/ru_SU.KOI8-R
 -.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
--	${INSTALL_DATA_DIR} ${DSTEXAMPLEDIR}
- 	${INSTALL_DATA} examples/* ${DSTEXAMPLEDIR}
- .if exists(${DSTRCDIR})
--	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
-+	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}/ipa
+-	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DST_MAN_DIR}/ru_RU.KOI8-R/man5
+-	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DST_MAN_DIR}/ru_RU.KOI8-R/man8
+-	${INSTALL_DATA_DIR} ${DST_EXAMPLE_DIR}
+ 	${INSTALL_DATA} examples/* ${DST_EXAMPLE_DIR}
+ .if exists(${DST_RC_DIR})
+-	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DST_RC_DIR}
++	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DST_RC_DIR}/ipa
  .else
  	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
+ 	@${ECHO} ">> Can't find directory ${DST_RC_DIR}, the ipa.sh.sample file was not installed (not a problem)."