Libtoolify trio. Bump revision.

3 files changed, 53 insertions, 15 deletions

diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index ec257545d2a..0fdab8af86d 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:30 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/03/15 16:44:50 joerg Exp $
 #
 
 DISTNAME=	trio-1.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.contactor.se/~dast/stuff/
 
@@ -9,20 +10,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.contactor.se/~dast/trio/
 COMMENT=	Fully matured and stable set of printf and string functions
 
+USE_LIBTOOL=	yes
+
 INSTALLATION_DIRS=	include lib man/man3
 
 post-patch:
-	${SED} "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile			\
-		> ${WRKSRC}/Makefile.done
-	${MV} ${WRKSRC}/Makefile.done ${WRKSRC}/Makefile
-
-do-install:
-	cd ${WRKSRC} &&							\
-		${INSTALL_DATA}	trio.h triop.h ${PREFIX}/include
-	cd ${WRKSRC} &&							\
-		${INSTALL_DATA} libtrio.a ${PREFIX}/lib
-	cd ${WRKSRC}/man/man3 &&					\
-		${INSTALL_MAN} trio_printf.3 trio_scanf.3		\
-		trio_register.3 strio.3 ${PREFIX}/man/man3
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/trio/PLIST b/devel/trio/PLIST
index d60eedfc090..d755f034299 100644
--- a/devel/trio/PLIST
+++ b/devel/trio/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/15 16:44:50 joerg Exp $
 include/trio.h
 include/triop.h
-lib/libtrio.a
+lib/libtrio.la
 man/man3/strio.3
 man/man3/trio_printf.3
 man/man3/trio_register.3
diff --git a/devel/trio/files/Makefile b/devel/trio/files/Makefile
new file mode 100644
index 00000000000..1a08d4e219e
--- /dev/null
+++ b/devel/trio/files/Makefile
@@ -0,0 +1,46 @@
+# $NetBSD: Makefile,v 1.1 2006/03/15 16:44:50 joerg Exp $
+
+LIB=		libtrio
+LIB_VER=	1:0
+LIBS?=		-lm
+
+SRCS=		trio.c strio.c
+HDRS=		trio.h triop.h
+OBJS=		${SRCS:.c=.lo}
+
+PREFIX?=	/usr/local
+LIBDIR?=	${PREFIX}/lib
+INCLUDEDIR?=	${PREFIX}/include
+MANDIR?=	${PREFIX}/${PKGMANDIR}
+MANDIR3?=	${MANDIR}/man3
+
+BSD_INSTALL?=		install
+BSD_INSTALL_DIR?=	${BSD_INSTALL} -d
+BSD_INSTALL_DATA?=	${BSD_INSTALL} -m 444
+BSD_INSTALL_LIB?=	${BSD_INSTALL} -m 644
+LIBTOOL?=	libtool
+LN?=		ln
+RM?=		rm
+
+.SUFFIXES: .lo
+.PHONY: all clean install
+
+.c.lo:
+	${LIBTOOL} --mode=compile ${CC} -o $@ -c ${CFLAGS} ${CPPFLAGS} $<
+
+all: ${LIB}.la
+
+clean:
+	-${LIBTOOL} --mode=clean ${RM} ${OBJS} ${LIB}.la
+
+install:
+	${BSD_INSTALL_DIR} ${LIBDIR} ${INCLUDEDIR}
+	${BSD_INSTALL_DATA} ${HDRS} ${INCLUDEDIR}
+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIB}.la ${LIBDIR}/${LIB}.la
+	${BSD_INSTALL_DIR} ${MANDIR3}
+	${BSD_INSTALL_DATA} man/man3/strio.3 man/man3/trio_printf.3 \
+	    man/man3/trio_register.3 man/man3/trio_scanf.3 ${MANDIR3}
+
+${LIB}.la: ${OBJS}
+	${LIBTOOL} --mode=link ${CC} -o $@ ${CFLAGS} ${LDFLAGS} \
+	    -rpath ${LIBDIR} -version-info ${LIB_VER} ${OBJS} ${LIBS}