Update to 0.5:

0.5:    2005-Oct-13

        * Generating shared library using libtool.
          Based on a patch by Thomas Klausner

3 files changed, 18 insertions, 50 deletions

diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index ff55c0286a0..e49fb63b42f 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/10/13 20:41:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/17 08:28:57 wiz Exp $
 #
 
-DISTNAME=		libmimedir-0.4
-PKGREVISION=		1
+DISTNAME=		libmimedir-0.5
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=synce/}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmimedir/}
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://sourceforge.net/projects/libmimedir/
diff --git a/devel/libmimedir/distinfo b/devel/libmimedir/distinfo
index bedff410134..feaed148785 100644
--- a/devel/libmimedir/distinfo
+++ b/devel/libmimedir/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/10/13 20:41:51 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/10/17 08:28:57 wiz Exp $
 
-SHA1 (libmimedir-0.4.tar.gz) = 7fd4eb92f48a30b2067d5d265458981f61b03630
-RMD160 (libmimedir-0.4.tar.gz) = d6dd6aa74858990c1029c93aefae20fc890ce7ad
-Size (libmimedir-0.4.tar.gz) = 65883 bytes
-SHA1 (patch-aa) = 5a4a002b1d1f08c25b2d52ceb1f7d49aea21b6b1
+SHA1 (libmimedir-0.5.tar.gz) = d54856d19d360ade0fa3b503e7c7e3cab0dfc59a
+RMD160 (libmimedir-0.5.tar.gz) = e943e0a9c0191b38168fa2a0c75f5ab9b8d997a4
+Size (libmimedir-0.5.tar.gz) = 283581 bytes
+SHA1 (patch-aa) = 568302422397960a36e4f5581d22023457d15937
diff --git a/devel/libmimedir/patches/patch-aa b/devel/libmimedir/patches/patch-aa
index f2eed13ed66..9de7bb45c7b 100644
--- a/devel/libmimedir/patches/patch-aa
+++ b/devel/libmimedir/patches/patch-aa
@@ -1,54 +1,23 @@
-$NetBSD: patch-aa,v 1.1 2005/10/13 20:41:51 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/17 08:28:58 wiz Exp $
 
---- Makefile.in.orig	2005-03-04 07:35:50.000000000 +0100
+--- Makefile.in.orig	2005-10-17 01:19:55.000000000 +0200
 +++ Makefile.in
-@@ -13,20 +13,19 @@ YACC= @YACC@
- LEX= @LEX@
- INSTALL= @INSTALL@
- RANLIB= @RANLIB@
--LIBS= -L. -lmimedir
-+LIBS= -L. libmimedir.la
- 
--OBJS= dirlex.o dirsynt.o parse.o get.o dup.o free.o memmem.o add.o count.o del.o
-+OBJS= dirlex.lo dirsynt.lo parse.lo get.lo dup.lo free.lo memmem.lo add.lo count.lo del.lo
+@@ -22,7 +22,7 @@ LOBJS= dirlex.lo dirsynt.lo parse.lo get
  
  TESTS = test
  
--all: libmimedir.a $(TESTS)
+-all: libmimedir.a libmimedir.la $(TESTS)
 +all: libmimedir.la $(TESTS)
  
--libmimedir.a: ${OBJS}
--	ar rc libmimedir.a ${OBJS}
--	$(RANLIB) libmimedir.a
-+libmimedir.la: ${OBJS}
-+	libtool --mode=link ${CC} ${CFLAGS} -rpath ${PREFIX}/lib -o libmimedir.la ${OBJS}
- 
--test: test.o libmimedir.a
--	${CC} ${CFLAGS} -o test test.o ${LIBS}
-+test: test.o libmimedir.la
-+	libtool --mode=link ${CC} ${CFLAGS} ${LDFLAGS} -o test test.o ${LIBS}
- 
- dirsynt.c dirsynt.h: dirsynt.y
- 	${YACC} -p_mdir_ -d dirsynt.y
-@@ -37,17 +36,17 @@ dirlex.c: dirlex.l dirsynt.h
- 	${LEX} -Cem -odirlex.c -P_mdir_ dirlex.l
- 
- .SUFFIXES:
--.SUFFIXES: .c .o
-+.SUFFIXES: .c .o .lo
- 
--.c.o:
--	${CC} ${CFLAGS} -o $@ -c $<
-+.c.lo:
-+	libtool --mode=compile ${CC} ${CFLAGS} -o $@ -c $<
- 
- check: all
- 	./test
+ libmimedir.a: ${OBJS}
+ 	ar rc libmimedir.a ${OBJS}
+@@ -56,8 +56,7 @@ check: all
  
  install: all
  	${INSTALL} -m 444 libmimedir.h ${includedir}
 -	${INSTALL} -m 444 libmimedir.a ${libdir}
-+	libtool --mode=install ${BSD_INSTALL_LIB} libmimedir.la ${libdir}/libmimedir.la
+-	$(LIBTOOL) --mode=install ${INSTALL} -c -m 444 libmimedir.la ${libdir}/libmimedir.la
++	$(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} libmimedir.la ${libdir}/libmimedir.la
  
  clean:
- 	rm -f *.o *.a *.core
+ 	rm -f $(OBJS) $(LOBJS) *.a *.la *.core