6 files changed, 29 insertions, 94 deletions

diff --git a/sysutils/ipa/Makefile b/sysutils/ipa/Makefile
index d4258d15f1b4..bb1ac64bc65c 100644
--- a/sysutils/ipa/Makefile
+++ b/sysutils/ipa/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ipa
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ipa-system.sourceforge.net/ \
 		http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
@@ -19,49 +18,49 @@ COMMENT=	Pluggable accounting system
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	ipa
 
 OPTIONS=	AUTORULES "Enable dynamic rules support" on \
 		RULES "Enable static rules support" on \
 		LIMITS "Enable limits support" on \
 		SUBLIMITS "Enable sublimits support" on \
 		THRESHOLDS "Enable thresholds support" on \
-		CTL_CREDS "Enable ipactl's messages credentials" on \
+		CTL_CREDS "Enable ipactl's messages credentials" off \
 		MEMFUNC_DEBUG "Enable ipa_memfunc debugging" off \
 		DEBUG_INFO "Produce debugging information" off \
 		MAN_KOI8_R "Install Russian manual pages" off
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITHOUT_AUTORULES
+.if defined(WITHOUT_AUTORULES)
 CONFIGURE_ARGS+=	--disable-autorules
 .endif
 
-.ifdef WITHOUT_RULES
+.if defined(WITHOUT_RULES)
 CONFIGURE_ARGS+=	--disable-rules
 .endif
 
-.ifdef WITHOUT_LIMITS
+.if defined(WITHOUT_LIMITS)
 CONFIGURE_ARGS+=	--disable-limits
 .endif
 
-.ifdef WITHOUT_SUBLIMITS
+.if defined(WITHOUT_SUBLIMITS)
 CONFIGURE_ARGS+=	--disable-sublimits
 .endif
 
-.ifdef WITHOUT_THRESHOLDS
+.if defined(WITHOUT_THRESHOLDS)
 CONFIGURE_ARGS+=	--disable-thresholds
 .endif
 
-.ifdef WITHOUT_CTL_CREDS
-CONFIGURE_ARGS+=	--disable-ctl-creds
+.if defined(WITH_CTL_CREDS)
+CONFIGURE_ARGS+=	--enable-ctl-creds
 .endif
 
-.ifdef WITH_MEMFUNC_DEBUG
+.if defined(WITH_MEMFUNC_DEBUG)
 CONFIGURE_ARGS+=	--enable-memfunc-debug
 .endif
 
-.ifdef WITH_DEBUG_INFO
+.if defined(WITH_DEBUG_INFO)
 STRIP=		# empty
 CFLAGS+=	-g
 .endif
@@ -70,22 +69,15 @@ MAN3=		ipa_mod.3
 MAN5=		ipa.conf.5 ipastat.conf.5
 MAN8=		ipa.8 ipactl.8 ipastat.8
 MANLANG=	""
-.ifdef WITH_MAN_KOI8_R
+.if defined(WITH_MAN_KOI8_R)
 MANLANG+=	ru.KOI8-R
 .endif
 
-RC_SCRIPT_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
-post-build:
-	@${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/ipa.sh > ${WRKSRC}/ipa.sh
-
 do-install:
-	cd ${WRKSRC}/src && make install
-	cd ${WRKSRC}/man && make install-am
-	${INSTALL_SCRIPT} ${WRKSRC}/ipa.sh ${PREFIX}/etc/rc.d
-.ifdef WITH_MAN_KOI8_R
-	cd ${WRKSRC}/man/ru.KOI8-R && make install
+	cd ${WRKSRC}/src && ${MAKE} install
+	cd ${WRKSRC}/man && ${MAKE} install-am
+.if defined(WITH_MAN_KOI8_R)
+	cd ${WRKSRC}/man/ru.KOI8-R && ${MAKE} install
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/ipa/distinfo b/sysutils/ipa/distinfo
index 2bb7115d77be..0dc9c2ac845b 100644
--- a/sysutils/ipa/distinfo
+++ b/sysutils/ipa/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipa-2.0.tar.bz2) = 3031b5c837ad059c7401e5d18726c9d9
-SHA256 (ipa-2.0.tar.bz2) = 48b97af965b995f33fb9b331e4690ad02691ec458607c59bb7bfee689f2a0046
-SIZE (ipa-2.0.tar.bz2) = 281507
+MD5 (ipa-2.0.1.tar.bz2) = 0a8abf40c001b040dd410015cfb2790a
+SHA256 (ipa-2.0.1.tar.bz2) = ff4d20082ba19c1828e7836f52a4fd1595d84ee3db153b93f47b81a4ea0a2242
+SIZE (ipa-2.0.1.tar.bz2) = 282407
diff --git a/sysutils/ipa/files/ipa.sh b/sysutils/ipa/files/ipa.in
index df02f5a46b5a..3c8850d53e94 100644
--- a/sysutils/ipa/files/ipa.sh
+++ b/sysutils/ipa/files/ipa.in
@@ -4,12 +4,13 @@
 #
 
 # If some IPA module requires some services, then they should
-# be specified after the REQUIRE, by default REQUIRE is empty,
-# since ipa itself does not require anything for running.
+# be specified after REQUIRE, by default REQUIRE contains
+# only syslogd, since ipa uses syslog for logging by default
+# and does not require anything more for running.
 
 # PROVIDE: ipa
-# REQUIRE:
-# BEFORE: LOGIN
+# REQUIRE: syslogd
+# KEYWORD: shutdown
 
 # Following line can enable ipa (see rc.subr(8) for information
 # where to write it):
@@ -19,14 +20,14 @@
 
 . %%RC_SUBR%%
 
-name=ipa
-rcvar=`set_rcvar`
+name="ipa"
+rcvar=${name}_enable
 
 command="%%PREFIX%%/bin/ipa"
+extra_commands="reload"
 
 load_rc_config $name
 
-ipa_enable=${ipa_enable:-"NO"}
+: ${ipa_enable="NO"}
 
-extra_commands="reload"
 run_rc_command "$1"
diff --git a/sysutils/ipa/files/patch-memfunc.c b/sysutils/ipa/files/patch-memfunc.c
deleted file mode 100644
index f3e8370d8700..000000000000
--- a/sysutils/ipa/files/patch-memfunc.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/memfunc.c.orig	Sat Dec  3 11:28:00 2005
-+++ src/memfunc.c	Tue Jan  3 13:44:56 2006
-@@ -575,8 +575,8 @@
- 		    mem_type->name);
- 
- 	if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
--		logmsgx("mem_malloc(%lu + %u, %s) failed: malloc: %s",
--		    (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name,
-+		logmsgx("mem_malloc(%lu + %lu, %s) failed: malloc: %s",
-+		    (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
- 		    strerror(errno));
- 		return NULL;
- 	}
-@@ -614,8 +614,8 @@
- 
- 	size *= number;
- 	if ( (mem = malloc(size + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
--		logmsgx("mem_calloc(%lu + %u, %s) failed: %s",
--		    (u_long)size, MEM_DESC_BUF_OFFSET, mem_type->name,
-+		logmsgx("mem_calloc(%lu + %lu, %s) failed: %s",
-+		    (u_long)size, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
- 		    strerror(errno));
- 		return NULL;
- 	}
-@@ -714,8 +714,8 @@
- #ifdef WITH_MEMFUNC_DEBUG
- 	/* malloc() --> memcpy() --> free() */
- 	if ( (mem2 = malloc(size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
--		logmsgx("mem_realloc(%s): malloc(%lu + %u) failed: %s",
--		    mem_type->name, (u_long)size2, MEM_DESC_BUF_OFFSET,
-+		logmsgx("mem_realloc(%s): malloc(%lu + %lu) failed: %s",
-+		    mem_type->name, (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET,
- 		    strerror(errno));
- 		return NULL;
- 	}
-@@ -733,8 +733,8 @@
- 	/* True realloc(). */
- 	mem1->signature = MEM_NOSIGNATURE;
- 	if ( (mem2 = realloc(mem1, size2 + MEM_DESC_BUF_OFFSET + sizeof(gbytes))) == NULL) {
--		logmsgx("mem_realloc(%lu + %u, %s) failed: %s",
--		    (u_long)size2, MEM_DESC_BUF_OFFSET, mem_type->name,
-+		logmsgx("mem_realloc(%lu + %lu, %s) failed: %s",
-+		    (u_long)size2, (u_long)MEM_DESC_BUF_OFFSET, mem_type->name,
- 		    strerror(errno));
- 		mem1->signature = MEM_SIGNATURE & (int)size1;
- 		return NULL;
diff --git a/sysutils/ipa/files/patch-parser.c b/sysutils/ipa/files/patch-parser.c
deleted file mode 100644
index 3b8651217d6a..000000000000
--- a/sysutils/ipa/files/patch-parser.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/parser.c.orig	Sat Dec  3 11:28:00 2005
-+++ src/parser.c	Tue Jan  3 13:44:50 2006
-@@ -533,7 +533,7 @@
-  * outside of this function.
-  */
- struct parser_pbuf *
--parser_new_pbuf(u_int size)
-+parser_new_pbuf(size_t size)
- {
- 	struct parser_pbuf *pbuf;
- 
diff --git a/sysutils/ipa/pkg-plist b/sysutils/ipa/pkg-plist
index 15838ba08cb4..e1ec5494dd83 100644
--- a/sysutils/ipa/pkg-plist
+++ b/sysutils/ipa/pkg-plist
@@ -1,5 +1,4 @@
 bin/ipa
 bin/ipactl
 bin/ipastat
-etc/rc.d/ipa.sh
 include/ipa_mod.h