Build blas.a using libtool, fixes build on SunOS. Bump PKGREVISION.

4 files changed, 58 insertions, 18 deletions

diff --git a/math/liblinear/Makefile b/math/liblinear/Makefile
index e74044a2f4b..dbe5b3f6808 100644
--- a/math/liblinear/Makefile
+++ b/math/liblinear/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/11/20 14:47:20 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/28 11:34:48 jperkin Exp $
 
 DISTNAME=	liblinear-2.1
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 
@@ -9,8 +10,8 @@ HOMEPAGE=	http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 COMMENT=	Library for large linear classification
 LICENSE=	modified-bsd
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 
 BUILD_TARGET=	all lib
 AUTO_MKDIRS=	yes
diff --git a/math/liblinear/distinfo b/math/liblinear/distinfo
index 2cef0ca7870..c36552fa535 100644
--- a/math/liblinear/distinfo
+++ b/math/liblinear/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/20 14:47:20 adam Exp $
+$NetBSD: distinfo,v 1.4 2016/01/28 11:34:48 jperkin Exp $
 
 SHA1 (liblinear-2.1.tar.gz) = 071e1c86c400bfa3605b1a5e45dace250c6a4574
 RMD160 (liblinear-2.1.tar.gz) = bb325a017a0044039c3ad2a058d56af7dc063ade
 SHA512 (liblinear-2.1.tar.gz) = e70d96c8119682258066433e0e79bcc55e20a8f6cb229da555b225a4677e19b17961b32e3502d8f85e5638dff56314aa83e0fdcda059df6d0cb056bb2a2b0495
 Size (liblinear-2.1.tar.gz) = 382326 bytes
-SHA1 (patch-Makefile) = 023e282c4f89293256c7ef9b3129df4c3a1e21fa
+SHA1 (patch-Makefile) = 88e7188f9e5a8bb5da90a1cac23a5de98dbe5817
+SHA1 (patch-blas_Makefile) = 48a27b5b7bc285ebb65d87cab027b9f7ed5e2183
diff --git a/math/liblinear/patches/patch-Makefile b/math/liblinear/patches/patch-Makefile
index b8d17738bf8..9d19e3e2ddf 100644
--- a/math/liblinear/patches/patch-Makefile
+++ b/math/liblinear/patches/patch-Makefile
@@ -1,14 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2015/11/20 14:47:20 adam Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/01/28 11:34:48 jperkin Exp $
 
 Use LIBTOOL.
 
---- Makefile.orig	2015-11-20 13:39:37.000000000 +0000
+--- Makefile.orig	2015-09-26 22:03:26.000000000 +0000
 +++ Makefile
-@@ -1,32 +1,25 @@
+@@ -1,34 +1,27 @@
  CXX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
- LIBS = blas/blas.a
+-LIBS = blas/blas.a
++LIBS = blas/libblas.la
  SHVER = 3
 -OS = $(shell uname)
  #LIBS = -lblas
@@ -25,26 +26,30 @@ Use LIBTOOL.
 -
 -train: tron.o linear.o train.c blas/blas.a
 -	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
-+lib: linear.lo tron.lo blas/blas.a
-+	${LIBTOOL} --mode=link $(CXX) -o liblinear.la $> -rpath ${PREFIX}/lib -version-info ${SHVER}:0
- 
+-
 -predict: tron.o linear.o predict.c blas/blas.a
 -	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
-+train: tron.lo linear.lo train.c blas/blas.a
-+	${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o train $>
++lib: linear.lo tron.lo $(LIBS)
++	${LIBTOOL} --mode=link $(CXX) -o liblinear.la $> -rpath ${PREFIX}/lib -version-info ${SHVER}:0
  
 -tron.o: tron.cpp tron.h
 -	$(CXX) $(CFLAGS) -c -o tron.o tron.cpp
-+predict: tron.lo linear.lo predict.c blas/blas.a
-+	${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o predict $>
++train: tron.lo linear.lo train.c $(LIBS)
++	${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o train $>
  
 -linear.o: linear.cpp linear.h
 -	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
++predict: tron.lo linear.lo predict.c $(LIBS)
++	${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o predict $>
+ 
+-blas/blas.a: blas/*.c blas/*.h
 +tron.lo: tron.cpp tron.h
 +	${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o tron.o tron.cpp
 +
 +linear.lo: linear.cpp linear.h
 +	${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o linear.o linear.cpp
- 
- blas/blas.a: blas/*.c blas/*.h
++
++$(LIBS): blas/*.c blas/*.h
  	make -C blas OPTFLAGS='$(CFLAGS)' CC='$(CC)';
+ 
+ clean:
diff --git a/math/liblinear/patches/patch-blas_Makefile b/math/liblinear/patches/patch-blas_Makefile
new file mode 100644
index 00000000000..e4cf0d79613
--- /dev/null
+++ b/math/liblinear/patches/patch-blas_Makefile
@@ -0,0 +1,33 @@
+$NetBSD: patch-blas_Makefile,v 1.1 2016/01/28 11:34:48 jperkin Exp $
+
+Use libtool.
+
+--- blas/Makefile.orig	2015-09-26 22:03:28.000000000 +0000
++++ blas/Makefile
+@@ -2,21 +2,21 @@ AR     = ar rcv
+ RANLIB = ranlib 
+ 
+ HEADERS = blas.h blasp.h
+-FILES = dnrm2.o daxpy.o ddot.o dscal.o 
++FILES = dnrm2.lo daxpy.lo ddot.lo dscal.lo
+ 
+ CFLAGS = $(OPTFLAGS) 
+ FFLAGS = $(OPTFLAGS)
+ 
+ blas: $(FILES) $(HEADERS)
+-	$(AR) blas.a $(FILES)  
+-	$(RANLIB) blas.a
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libblas.la $(FILES)
+ 
+ clean:
+ 	- rm -f *.o
+ 	- rm -f *.a
+ 	- rm -f *~
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) -c $*.c
++.SUFFIXES: .lo
++.c.lo:
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+ 
+