fairly minor update to 1.4.13

- obexapp does not now require GNU libiconv (this was in pkgsrc already)
- compiler errors fixed
- no longer tries to provide username/groupname in file listings (info
  not available in chroot)

4 files changed, 22 insertions, 101 deletions

diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index 2f26f7ee966..bbe2646daff 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2009/12/01 11:18:48 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2010/01/15 17:48:44 plunky Exp $
 #
 
-DISTNAME=	obexapp-1.4.12
-PKGREVISION=	1
+DISTNAME=	obexapp-1.4.13
 CATEGORIES=	comms
 MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 
diff --git a/comms/obexapp/distinfo b/comms/obexapp/distinfo
index c3c9d58248f..1f54b0dd97b 100644
--- a/comms/obexapp/distinfo
+++ b/comms/obexapp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2009/12/01 11:18:48 drochner Exp $
+$NetBSD: distinfo,v 1.15 2010/01/15 17:48:44 plunky Exp $
 
-SHA1 (obexapp-1.4.12.tar.gz) = 3ad061b611d113e94d1c44fa3ce7aa2cf90c1d98
-RMD160 (obexapp-1.4.12.tar.gz) = 60c33d242be4659bfbe81a767d3d22cd5c38a734
-Size (obexapp-1.4.12.tar.gz) = 33179 bytes
-SHA1 (patch-ac) = 5134aa913f69f7e78ecccc47eef0a65e778eb273
-SHA1 (patch-af) = cbab3674b8b5fabcddea20c350586986e834c29f
+SHA1 (obexapp-1.4.13.tar.gz) = 768c15e1558b1cb87b64c328f7ee73be28ae4dc7
+RMD160 (obexapp-1.4.13.tar.gz) = 4efd9e670a4429ff13fee1b2ef8328110517e3f2
+Size (obexapp-1.4.13.tar.gz) = 32001 bytes
+SHA1 (patch-ac) = 604a84e13aff146698e44eee7350216e716a5066
+SHA1 (patch-af) = ef1a6723cd5a66cbd6483e146197fbd8409dbbd3
diff --git a/comms/obexapp/patches/patch-ac b/comms/obexapp/patches/patch-ac
index ceb39bac947..da726075acd 100644
--- a/comms/obexapp/patches/patch-ac
+++ b/comms/obexapp/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2009/12/01 11:18:48 drochner Exp $
+$NetBSD: patch-ac,v 1.5 2010/01/15 17:48:44 plunky Exp $
 
---- util.c.orig	2009-08-20 23:57:18.000000000 +0200
+--- util.c.orig	2010-01-08 19:37:12.000000000 +0000
 +++ util.c
 @@ -30,9 +30,9 @@
   */
@@ -11,74 +11,5 @@ $NetBSD: patch-ac,v 1.4 2009/12/01 11:18:48 drochner Exp $
  #include <errno.h>
 +#include <expat.h>
  #include <iconv.h>
+ #include <langinfo.h>
  #include <libgen.h>
- #include <limits.h>
-@@ -43,6 +43,7 @@
- #include <string.h>
- #include <time.h>
- #include <unistd.h>
-+#include <langinfo.h>
- 
- #include <readline/readline.h>
- #include <readline/history.h>
-@@ -66,26 +67,12 @@ static iconv_t		 locale2utf16be = (iconv
- int
- obexapp_util_locale_init(void)
- {
--	int	one = 1;
- 
--	locale = setlocale(LC_CTYPE, "");
-+	setlocale(LC_CTYPE, "");
-+	locale = nl_langinfo(CODESET);
- 	if (locale == NULL)
- 		return (-1);
- 
--	if (strcmp(locale, "ASCII") == 0 ||
--	    strcmp(locale, "C") == 0 ||
--	    strcmp(locale, "POSIX") == 0 ||
--	    strcmp(locale, "US-ASCII") == 0)
--		locale = "en_US.US-ASCII";
--
--	locale = strchr(locale, '.');
--	if (locale == NULL)
--		return (-1);
--
--	locale ++;
--	if (locale[0] == '\0')
--		return (-1);
--
- 	utf16 = (strstr(locale, "UTF-16") != NULL)? 1 : 0;
- 
- 	/* UTF-8 -> current locale */
-@@ -94,7 +81,6 @@ obexapp_util_locale_init(void)
- 		return (-1);
- 
- 	iconv(utf82locale, NULL, NULL, NULL, NULL);
--	iconvctl(utf82locale, ICONV_SET_DISCARD_ILSEQ, &one);
- 
- 	/* current locale -> UTF-8 */
- 	locale2utf8 = iconv_open("UTF-8", locale);
-@@ -104,7 +90,6 @@ obexapp_util_locale_init(void)
- 	}
- 
- 	iconv(locale2utf8, NULL, NULL, NULL, NULL);
--	iconvctl(locale2utf8, ICONV_SET_DISCARD_ILSEQ, &one);
- 
- 	/* UTF-16BE -> current locale */
- 	utf16be2locale = iconv_open(locale, "UTF-16BE");
-@@ -114,7 +99,6 @@ obexapp_util_locale_init(void)
- 	}
- 
- 	iconv(utf16be2locale, NULL, NULL, NULL, NULL);
--	iconvctl(utf16be2locale, ICONV_SET_DISCARD_ILSEQ, &one);
- 
- 	/* current locale -> UTF-16BE */
- 	locale2utf16be = iconv_open("UTF-16BE", locale);
-@@ -124,7 +108,6 @@ obexapp_util_locale_init(void)
- 	}
- 
- 	iconv(locale2utf16be, NULL, NULL, NULL, NULL);
--	iconvctl(locale2utf16be, ICONV_SET_DISCARD_ILSEQ, &one);
- 
- 	return (0);
- }
diff --git a/comms/obexapp/patches/patch-af b/comms/obexapp/patches/patch-af
index 22af99017f4..660cc02261a 100644
--- a/comms/obexapp/patches/patch-af
+++ b/comms/obexapp/patches/patch-af
@@ -1,32 +1,23 @@
-$NetBSD: patch-af,v 1.4 2009/05/12 14:43:17 plunky Exp $
+$NetBSD: patch-af,v 1.5 2010/01/15 17:48:44 plunky Exp $
 
---- Makefile.orig	2007-04-23 20:29:18.000000000 +0200
-+++ Makefile	2007-05-24 15:43:11.000000000 +0200
-@@ -6,7 +6,7 @@ MANDIR=		/usr/local/man/man
- PROG=		obexapp
- MAN1=		obexapp.1
- 
--WARNS?=		3
-+WARNS?=		0
- 
- SRCS=		client.c event.c log.c main.c sdp.c server.c stream.c \
- 		transport.c util.c
-@@ -17,9 +17,16 @@
- 		-I/usr/local/include/openobex \
- 		-fno-strict-aliasing
+--- Makefile.orig	2010-01-08 18:31:22.000000000 +0000
++++ Makefile
+@@ -16,9 +16,15 @@ DEBUG_FLAGS=	-g
+ CFLAGS+=	-I/usr/local/include \
+ 		-I/usr/local/include/openobex
  
 -DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
 +DPADD=		${LIBBLUETOOTH} ${LIBREADLINE}
  LDADD=		-L/usr/lib -L/usr/local/lib \
 -		-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
 +		-lbluetooth -lopenobex -lexpat -lreadline -liconv
-+
+ 
+-.include <bsd.prog.mk>
 +.if (${HAVE_LIBSDP:Uyes} == "no")
 +CPPFLAGS+=	-DSDP_COMPAT
 +.else
-+DPADD+=	${LIBSDP}
-+LDADD+=	-lsdp
++DPADD+=		${LIBSDP}
++LDADD+=		-lsdp
 +.endif
  
- .include <bsd.prog.mk>
- 
++.include <bsd.prog.mk>