build shared lib, bump PKGREV

5 files changed, 50 insertions, 8 deletions

diff --git a/math/ltm/Makefile b/math/ltm/Makefile
index 946e74e0d72..31b8ba91666 100644
--- a/math/ltm/Makefile
+++ b/math/ltm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/11/24 01:09:48 agc Exp $
+# $NetBSD: Makefile,v 1.14 2011/03/10 09:52:24 drochner Exp $
 #
 
 DISTNAME=		ltm-0.42.0
+PKGREVISION=		1
 CATEGORIES=		math
 MASTER_SITES=		http://libtom.org/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -15,7 +16,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/libtommath-0.42.0
-MAKE_FILE=		makefile
+USE_LIBTOOL=		yes
+MAKE_FILE=		makefile.shared
 BUILD_TARGET=		default
 USE_TOOLS+=		gmake
 
@@ -25,7 +27,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tommath.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/tommath_class.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/tommath_superclass.h ${DESTDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libtommath.a ${DESTDIR}${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libtommath.la \
+		${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/bn.pdf ${DESTDIR}${PREFIX}/share/doc/ltm
 	${INSTALL_DATA} ${WRKSRC}/poster.pdf ${DESTDIR}${PREFIX}/share/doc/ltm
 	${INSTALL_DATA} ${WRKSRC}/tommath.pdf ${DESTDIR}${PREFIX}/share/doc/ltm
diff --git a/math/ltm/PLIST b/math/ltm/PLIST
index 3b0f2831d35..b3c6f01fbc7 100644
--- a/math/ltm/PLIST
+++ b/math/ltm/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:05:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/03/10 09:52:24 drochner Exp $
 include/tommath.h
 include/tommath_class.h
 include/tommath_superclass.h
-lib/libtommath.a
+lib/libtommath.la
 share/doc/ltm/bn.pdf
 share/doc/ltm/poster.pdf
 share/doc/ltm/tommath.pdf
diff --git a/math/ltm/buildlink3.mk b/math/ltm/buildlink3.mk
index 74219529cc2..a86c1357795 100644
--- a/math/ltm/buildlink3.mk
+++ b/math/ltm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:57 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2011/03/10 09:52:24 drochner Exp $
 
 BUILDLINK_TREE+=	ltm
 
@@ -8,7 +8,6 @@ LTM_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.ltm+=	ltm>=0.30
 BUILDLINK_ABI_DEPENDS.ltm?=	ltm>=0.30nb1
 BUILDLINK_PKGSRCDIR.ltm?=	../../math/ltm
-BUILDLINK_DEPMETHOD.ltm?=	build
 .endif # LTM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ltm
diff --git a/math/ltm/distinfo b/math/ltm/distinfo
index 373ca7caa29..80e505fbc08 100644
--- a/math/ltm/distinfo
+++ b/math/ltm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2010/11/24 01:09:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2011/03/10 09:52:24 drochner Exp $
 
 SHA1 (ltm-0.42.0.tar.bz2) = 9b192701cf62b85e9bd65fbb4d622d04cfa5ee0d
 RMD160 (ltm-0.42.0.tar.bz2) = 9994d60d7e847a066715d8c644ce9b125932bf92
 Size (ltm-0.42.0.tar.bz2) = 1968961 bytes
+SHA1 (patch-aa) = 97729991d4c6541d726c0fb1b565794388816ba1
diff --git a/math/ltm/patches/patch-aa b/math/ltm/patches/patch-aa
new file mode 100644
index 00000000000..ed40d49d287
--- /dev/null
+++ b/math/ltm/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1 2011/03/10 09:52:25 drochner Exp $
+
+--- makefile.shared.orig	2010-07-23 14:27:20.000000000 +0000
++++ makefile.shared
+@@ -3,7 +3,7 @@
+ #Tom St Denis
+ VERSION=0:41
+ 
+-CC = libtool --mode=compile --tag=CC gcc
++#CC = libtool --mode=compile --tag=CC gcc
+ 
+ CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
+ 
+@@ -48,8 +48,8 @@ HEADERS=tommath.h tommath_class.h tommat
+ #INCPATH-The directory to install the header files for libtommath.
+ #DATAPATH-The directory to install the pdf docs.
+ DESTDIR=
+-LIBPATH=/usr/lib
+-INCPATH=/usr/include
++LIBPATH=${PREFIX}/lib
++INCPATH=${PREFIX}/include
+ DATAPATH=/usr/share/doc/libtommath/pdf
+ 
+ OBJECTS=bncore.o bn_mp_init.o bn_mp_clear.o bn_mp_exch.o bn_mp_grow.o bn_mp_shrink.o \
+@@ -82,8 +82,12 @@ bn_mp_to_signed_bin_n.o bn_mp_to_unsigne
+ 
+ objs: $(OBJECTS)
+ 
+-$(LIBNAME):  $(OBJECTS)
+-	libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++.SUFFIXES: .lo
++.c.lo:
++	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} $< -o $@
++
++$(LIBNAME):  $(OBJECTS:.o=.lo)
++	libtool --mode=link ${CC} *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+ 
+ install: $(LIBNAME)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)