- Unbreak and update to 20080409

3 files changed, 19 insertions, 39 deletions

diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile
index 72390cbe353f..113058269695 100644
--- a/textproc/libuninameslist/Makefile
+++ b/textproc/libuninameslist/Makefile
@@ -4,13 +4,12 @@
 #
 # $FreeBSD$
 #
-
 PORTNAME=	libuninameslist
-PORTVERSION=	20060907
+PORTVERSION=	20080409
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/Unicode%205%2C%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_src-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}/
+
+USE_BZIP2=	yes
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of Unicode annotation data
@@ -23,6 +22,4 @@ USE_AUTOTOOLS=	libtool:22
 ALL_TARGET=	both
 USE_LDCONFIG=	yes
 
-BROKEN=		checksum mismatch
-
 .include <bsd.port.mk>
diff --git a/textproc/libuninameslist/distinfo b/textproc/libuninameslist/distinfo
index 9590e1fe679e..ff78bf84f7af 100644
--- a/textproc/libuninameslist/distinfo
+++ b/textproc/libuninameslist/distinfo
@@ -1,3 +1,3 @@
-MD5 (libuninameslist_src-20060907.tgz) = e5090105b9f09e76838a0af3220b371d
-SHA256 (libuninameslist_src-20060907.tgz) = fd199bf28f93d208971b69d65af9646f13ae90ff0d9538b37ae579cfc3b28e08
-SIZE (libuninameslist_src-20060907.tgz) = 748096
+MD5 (libuninameslist-20080409.tar.bz2) = bcf7d9d7975278d11338b69d1248a072
+SHA256 (libuninameslist-20080409.tar.bz2) = 992c4b289dd4c93652cfbd32ae85f1bd16982c93417c0612858671d0b45e62ae
+SIZE (libuninameslist-20080409.tar.bz2) = 535866
diff --git a/textproc/libuninameslist/files/patch-Makefile.in b/textproc/libuninameslist/files/patch-Makefile.in
index 15c75109fd5e..8fd35f8db81e 100644
--- a/textproc/libuninameslist/files/patch-Makefile.in
+++ b/textproc/libuninameslist/files/patch-Makefile.in
@@ -1,32 +1,15 @@
---- Makefile.in.orig	2004-07-07 12:28:59.000000000 -0500
-+++ Makefile.in	2009-07-11 23:21:23.000000000 -0500
-@@ -23,23 +23,23 @@
- both: libuninameslist.la libuninameslist-fr.la
- 
- libuninameslist.la: nameslist.lo
--	$(LIBTOOL) $(CC) $(CFLAGS) -o libuninameslist.la nameslist.lo \
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libuninameslist.la nameslist.lo \
- 	    -rpath $(libdir) -version-info $(UN_VERSION):$(UN_REVISION):$(UN_AGE)
- 
- libuninameslist-fr.la: nameslist-fr.lo
--	$(LIBTOOL) $(CC) $(CFLAGS) -o libuninameslist-fr.la nameslist-fr.lo \
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libuninameslist-fr.la nameslist-fr.lo \
- 	    -rpath $(libdir) -version-info $(UN_VERSION):$(UN_REVISION):$(UN_AGE)
- 
- 
- %.lo: %.c
--	$(LIBTOOL) $(CC) $(CFLAGS) -c $<
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
- 
+--- Makefile.in.orig	2008-04-09 23:44:33.000000000 +0200
++++ Makefile.in	2009-08-27 11:52:44.563429892 +0200
+@@ -38,9 +38,9 @@
  install: both
  # You may need to be root to do the install
- 	mkdir -p $(libdir)
--	$(LIBTOOL) $(INSTALL) -c libuninameslist.la $(libdir)/libuninameslist.la
--	$(LIBTOOL) $(INSTALL) -c libuninameslist-fr.la $(libdir)/libuninameslist-fr.la
--	$(LIBTOOL) --finish $(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -c libuninameslist.la $(libdir)/libuninameslist.la
-+	$(LIBTOOL) --mode=install $(INSTALL) -c libuninameslist-fr.la $(libdir)/libuninameslist-fr.la
-+	$(LIBTOOL) --mode=finish $(libdir)
- 	mkdir -p $(incdir)
- 	$(INSTALL_DATA) nameslist.h $(incdir)/uninameslist.h
+ 	mkdir -p $(DESTDIR)$(libdir)
+-	$(LIBTOOL) $(INSTALL) -c libuninameslist.la $(DESTDIR)$(libdir)/libuninameslist.la
+-	$(LIBTOOL) $(INSTALL) -c libuninameslist-fr.la $(DESTDIR)$(libdir)/libuninameslist-fr.la
+-	$(LIBTOOL) --finish $(DESTDIR)$(libdir)
++	$(LIBTOOL) --mode=install $(INSTALL) -c libuninameslist.la $(DESTDIR)$(libdir)/libuninameslist.la
++	$(LIBTOOL) --mode=install $(INSTALL) -c libuninameslist-fr.la $(DESTDIR)$(libdir)/libuninameslist-fr.la
++	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
+ 	mkdir -p $(DESTDIR)$(incdir)
+ 	$(INSTALL_DATA) nameslist.h $(DESTDIR)$(incdir)/uninameslist.h