- Update to 2.0.1.

- Remove patchs, now it's build on 64bits without them.
- Port reorganize.

PR:		ports/95581
Submitted by:	Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua> (maintainer)
Reworked by:	jmelo
Approved by:	maintainer via email, mnag (mentor)

3 files changed, 9 insertions, 65 deletions

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;
-