Update the libutf package from 2.10 to 3.0.

Main changes are:

+ drag this package into the modern era
+ take all the arguments out of the prototypes in the header files
+ add a better French collation sequence from Serge Gagnon, sent to me
  in May 2003
+ add a utflcpy(3) function
+ update buildlink3.mk file to a more recent vintage
+ be a bit more pragmatic - move to a 3-clause BSD licence

4 files changed, 13 insertions, 15 deletions

diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index ce39a392a68..45145645d3e 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/12/29 06:21:55 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/05/26 21:13:01 agc Exp $
 #
 
-DISTNAME=	libutf-2.10
-PKGREVISION=	3
+DISTNAME=	libutf-3.0
 CATEGORIES=	misc
 MASTER_SITES=	http://www.alistaircrooks.co.uk/src/
 
diff --git a/misc/libutf/buildlink3.mk b/misc/libutf/buildlink3.mk
index 228fbceaa6b..fd513544088 100644
--- a/misc/libutf/buildlink3.mk
+++ b/misc/libutf/buildlink3.mk
@@ -1,18 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:27 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/05/26 21:13:01 agc Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUTF_BUILDLINK3_MK:=	${LIBUTF_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	libutf
 .endif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibutf}
 BUILDLINK_PACKAGES+=	libutf
 
-.if !empty(LIBUTF_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libutf+=	libutf>=2.10nb1
-BUILDLINK_ABI_DEPENDS.libutf+=	libutf>=2.10nb2
+.if ${LIBUTF_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libutf+=	libutf>=3.0
 BUILDLINK_PKGSRCDIR.libutf?=	../../misc/libutf
 .endif	# LIBUTF_BUILDLINK3_MK
 
diff --git a/misc/libutf/distinfo b/misc/libutf/distinfo
index 26758a98fa1..121e9e3ce7d 100644
--- a/misc/libutf/distinfo
+++ b/misc/libutf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 11:02:55 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/05/26 21:13:01 agc Exp $
 
-SHA1 (libutf-2.10.tar.gz) = 8dd0f6873112deaa5b5bf2a0554e28f9d8d4ddda
-RMD160 (libutf-2.10.tar.gz) = f7be9f311440fe68654ce0312e869dc6a94dc47f
-Size (libutf-2.10.tar.gz) = 55099 bytes
-SHA1 (patch-aa) = 13ed8cf7d011e10f207d0d95a9d033b41251be44
+SHA1 (libutf-3.0.tar.gz) = 7259fedf0d51107e4e4c03147f8a59e22d19e437
+RMD160 (libutf-3.0.tar.gz) = 243a030d9cb0b278ddc3263648a39d88e25f489a
+Size (libutf-3.0.tar.gz) = 55529 bytes
+SHA1 (patch-aa) = b5585f63b3f18c38d4e65b52d4d72305bdfdb205
diff --git a/misc/libutf/patches/patch-aa b/misc/libutf/patches/patch-aa
index 53673d0c7b0..dabd53f5768 100644
--- a/misc/libutf/patches/patch-aa
+++ b/misc/libutf/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/12/23 08:03:04 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2006/05/26 21:13:01 agc Exp $
 
 Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
 
@@ -17,7 +17,7 @@ Patches to use NetBSD's libtool and PKG_SYSCONFDIR.
  
  $(LIBS) : $(OBJS)
 -	$(AR) $(ARFLAGS) $(LIBS) $(OBJS)
-+	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:10
++	${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0
  
  ci:
  	ci -l ure.c ure.h urelang.c utf.c utf.h