- Update to 1.1

- Update pkg-descr

PR:		154615
Submitted by:	maintainer

6 files changed, 18 insertions, 30 deletions

diff --git a/net/ipa_ip6fw/Makefile b/net/ipa_ip6fw/Makefile
index ddb75bf8aa5c..8716de9447ce 100644
--- a/net/ipa_ip6fw/Makefile
+++ b/net/ipa_ip6fw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipa_ip6fw
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1
 CATEGORIES=	net
 MASTER_SITES=	SF/ipa-system/modules/ipa_ip6fw
 
diff --git a/net/ipa_ip6fw/distinfo b/net/ipa_ip6fw/distinfo
index 60633905751f..1c0e51632aee 100644
--- a/net/ipa_ip6fw/distinfo
+++ b/net/ipa_ip6fw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipa_ip6fw-1.0.2.tar.bz2) = 836b15fceb78b418ad3b30dfb9419cc7523d576cc9d854eee73333fb85d2c33a
-SIZE (ipa_ip6fw-1.0.2.tar.bz2) = 16737
+SHA256 (ipa_ip6fw-1.1.tar.bz2) = 082e2a1dec5c9fc6c0fca5bdef4458dcd994917dcc041fd267b279261178b1b0
+SIZE (ipa_ip6fw-1.1.tar.bz2) = 16828
diff --git a/net/ipa_ip6fw/pkg-descr b/net/ipa_ip6fw/pkg-descr
index d3d75b6897cf..661524992a4f 100644
--- a/net/ipa_ip6fw/pkg-descr
+++ b/net/ipa_ip6fw/pkg-descr
@@ -2,13 +2,12 @@ IPA_IP6FW -- IPA accounting module for FreeBSD IPv6 Firewall
 
 Main features:
 
-- The module is designed for traffic accounting from FreeBSD IPv6
-  Firewall rules byte counters;
+- The module is designed for traffic accounting from IPv6 Firewall
+  rules byte counters;
 - The module understands IPv6 Firewall rules byte counters overflow;
-- It is possible to summarize and subtract statistics from IPv6
-  Firewall rules byte counters;
-- It is possible to distinguish IPv6 Firewall rules with the same
-  numbers;
+- It is possible to summarize and subtract statistics of IPv6 Firewall
+  rules byte counters;
+- It is possible to distinguish IPv6 Firewall rules with the same numbers;
 - IPv6 Firewall rules can be dynamically added to and deleted from
   the system, the module correctly works in such situations.
 
diff --git a/net/ipa_ipfw/Makefile b/net/ipa_ipfw/Makefile
index d2d59703cc17..0b4f6350875e 100644
--- a/net/ipa_ipfw/Makefile
+++ b/net/ipa_ipfw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipa_ipfw
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1
 CATEGORIES=	net
 MASTER_SITES=	SF/ipa-system/modules/ipa_ipfw
 
@@ -20,14 +20,10 @@ NO_PACKAGE=	Needs to be built uniquely for each host
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	DEBUG_INFO "Produce debugging info" off \
-		MAN_KOI8_R "Install Russian manual pages" off
-
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_DEBUG_INFO)
-MAKE_ENV+=	DEBUG_FLAGS=""
-.endif
+LOCALINCLUDE?=	${LOCALBASE}/include
+MAKE_ENV+=	DEBUG_FLAGS="" PREFIX=${PREFIX} LOCALINCLUDE=${LOCALINCLUDE}
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
 
@@ -35,15 +31,10 @@ PLIST_FILES=	lib/ipa_ipfw.so
 
 MANCOMPRESSED=	yes
 MAN8=		ipa_ipfw.8
-MANLANG=	""
-.if defined(WITH_MAN_KOI8_R)
-MANLANG+=	ru.KOI8-R
-.endif
+MANLANG=	"" ru.KOI8-R
 
 do-install:
 	cd ${WRKSRC} && ${MAKE} install
-.if defined(WITH_MAN_KOI8_R)
 	cd ${WRKSRC}/man && ${MAKE} LANG_DIR_SRC=ru.KOI8-R clean all install
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/ipa_ipfw/distinfo b/net/ipa_ipfw/distinfo
index 7e794040dc66..3f1ee185c68e 100644
--- a/net/ipa_ipfw/distinfo
+++ b/net/ipa_ipfw/distinfo
@@ -1,3 +1,2 @@
-MD5 (ipa_ipfw-1.0.2.tar.bz2) = 5571cd76f663eefdbc2c419dc0d06ce7
-SHA256 (ipa_ipfw-1.0.2.tar.bz2) = dbdb9a72abd3a4bc9cce2e343f7bc7b688c32ab39ed4d3dc0de47ecbe58d0793
-SIZE (ipa_ipfw-1.0.2.tar.bz2) = 16498
+SHA256 (ipa_ipfw-1.1.tar.bz2) = 50fd880b9b832fa305773c59fa040afb34e30d7960126f98d382acda9f5f2b16
+SIZE (ipa_ipfw-1.1.tar.bz2) = 16540
diff --git a/net/ipa_ipfw/pkg-descr b/net/ipa_ipfw/pkg-descr
index d7fe7c175ad9..b7d606dd2511 100644
--- a/net/ipa_ipfw/pkg-descr
+++ b/net/ipa_ipfw/pkg-descr
@@ -2,13 +2,12 @@ IPA_IPFW -- IPA accounting module for FreeBSD IP Firewall
 
 Main features:
 
-- The module is designed for traffic accounting from FreeBSD IP
-  Firewall (including IPFW2) rules byte counters;
+- The module is designed for traffic accounting from IP Firewall
+  (including IPFW2) rules byte counters;
 - The module understands IP Firewall rules byte counters overflow;
-- It is possible to summarize and subtract statistics from IP Firewall
+- It is possible to summarize and subtract statistics of IP Firewall
   rules byte counters;
-- It is possible to distinguish IP Firewall rules with the same
-  numbers;
+- It is possible to distinguish IP Firewall rules with the same numbers;
 - IP Firewall rules can be dynamically added to and deleted from
   the system, the module correctly works in such situations.