From 3cd7b17d43a7717f7e5ac56987c7ca7341c1ccfd Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 13 Oct 2005 20:41:51 +0000
Subject: libtoolize. Now installs a shared library too. Bump PKGREVISION.

---
 devel/libmimedir/Makefile         |  4 ++-
 devel/libmimedir/PLIST            |  4 +--
 devel/libmimedir/buildlink3.mk    |  5 ++--
 devel/libmimedir/distinfo         |  3 ++-
 devel/libmimedir/patches/patch-aa | 54 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 devel/libmimedir/patches/patch-aa

(limited to 'devel')

diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile
index e04691246bc..ff55c0286a0 100644
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/13 15:15:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/10/13 20:41:51 wiz Exp $
 #
 
 DISTNAME=		libmimedir-0.4
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=synce/}
 
@@ -10,5 +11,6 @@ HOMEPAGE=		http://sourceforge.net/projects/libmimedir/
 COMMENT=		MIME Directory Profile parser library (RFC 2425)
 
 GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmimedir/PLIST b/devel/libmimedir/PLIST
index 1ecf5db6379..e3b939aa144 100644
--- a/devel/libmimedir/PLIST
+++ b/devel/libmimedir/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/13 15:15:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/13 20:41:51 wiz Exp $
 include/libmimedir.h
-lib/libmimedir.a
+lib/libmimedir.la
diff --git a/devel/libmimedir/buildlink3.mk b/devel/libmimedir/buildlink3.mk
index c8cb355538f..a0ac2c6b1bb 100644
--- a/devel/libmimedir/buildlink3.mk
+++ b/devel/libmimedir/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/13 15:15:28 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/10/13 20:41:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIMEDIR_BUILDLINK3_MK:=	${LIBMIMEDIR_BUILDLINK3_MK}+
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibmimedir}
 BUILDLINK_PACKAGES+=	libmimedir
 
 .if !empty(LIBMIMEDIR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libmimedir+=	libmimedir>=0.4
+BUILDLINK_DEPENDS.libmimedir+=	libmimedir>=0.4nb1
 BUILDLINK_PKGSRCDIR.libmimedir?=	../../devel/libmimedir
-BUILDLINK_DEPMETHOD.libmimedir?=	build
 .endif	# LIBMIMEDIR_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libmimedir/distinfo b/devel/libmimedir/distinfo
index 66ba3c1cfe4..bedff410134 100644
--- a/devel/libmimedir/distinfo
+++ b/devel/libmimedir/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/13 15:15:28 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/10/13 20:41:51 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
diff --git a/devel/libmimedir/patches/patch-aa b/devel/libmimedir/patches/patch-aa
new file mode 100644
index 00000000000..f2eed13ed66
--- /dev/null
+++ b/devel/libmimedir/patches/patch-aa
@@ -0,0 +1,54 @@
+$NetBSD: patch-aa,v 1.1 2005/10/13 20:41:51 wiz Exp $
+
+--- Makefile.in.orig	2005-03-04 07:35:50.000000000 +0100
++++ 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
+ 
+ TESTS = test
+ 
+-all: libmimedir.a $(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
+ 
+ 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
+ 
+ clean:
+ 	rm -f *.o *.a *.core
-- 
cgit v1.2.3