Import of pkgsrc-2016Q3

math/liblinear/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2014/10/19 09:57:21 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2016/01/28 11:34:48 jperkin Exp $
 
-DISTNAME=	liblinear-1.94
+DISTNAME=	liblinear-2.1
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 
@@ -10,6 +11,7 @@ COMMENT=	Library for large linear classification
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=	c c++
+USE_LIBTOOL=	yes
 
 BUILD_TARGET=	all lib
 AUTO_MKDIRS=	yes
@@ -17,8 +19,7 @@ AUTO_MKDIRS=	yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/liblinear-predict
 	${INSTALL_PROGRAM} ${WRKSRC}/train ${DESTDIR}${PREFIX}/bin/liblinear-train
-	${INSTALL_LIB} ${WRKSRC}/liblinear.so.1 ${DESTDIR}${PREFIX}/lib
-	${LN} -s liblinear.so.1 ${DESTDIR}${PREFIX}/lib/liblinear.so
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/liblinear.la ${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/linear.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

math/liblinear/PLIST

@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2014/10/19 09:57:21 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/11/20 14:47:20 adam Exp $
 bin/liblinear-predict
 bin/liblinear-train
 include/linear.h
-lib/liblinear.so
-lib/liblinear.so.1
+lib/liblinear.la
 share/doc/liblinear/README
 share/examples/liblinear/heart_scale

math/liblinear/buildlink3.mk

@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/11/20 14:47:20 adam Exp $
+
+BUILDLINK_TREE+=	liblinear
+
+.if !defined(LIBLINEAR_BUILDLINK3_MK)
+LIBLINEAR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.liblinear+=	liblinear>=2.1
+BUILDLINK_PKGSRCDIR.liblinear?=	../../math/liblinear
+.endif	# LIBLINEAR_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-liblinear

math/liblinear/distinfo

@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2014/10/19 09:57:21 cheusov Exp $
+$NetBSD: distinfo,v 1.4 2016/01/28 11:34:48 jperkin Exp $
 
-SHA1 (liblinear-1.94.tar.gz) = 19678355e6c933b7ec133e07fef77796e50df0d5
-RMD160 (liblinear-1.94.tar.gz) = 56cc112d3e4397804d67eea4e266b363c822307b
-Size (liblinear-1.94.tar.gz) = 335400 bytes
+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) = 88e7188f9e5a8bb5da90a1cac23a5de98dbe5817
+SHA1 (patch-blas_Makefile) = 48a27b5b7bc285ebb65d87cab027b9f7ed5e2183

math/liblinear/patches/patch-Makefile

@@ -0,0 +1,55 @@
+$NetBSD: patch-Makefile,v 1.2 2016/01/28 11:34:48 jperkin Exp $
+
+Use LIBTOOL.
+
+--- Makefile.orig	2015-09-26 22:03:26.000000000 +0000
++++ Makefile
+@@ -1,34 +1,27 @@
+ CXX ?= g++
+ CC ?= gcc
+-CFLAGS = -Wall -Wconversion -O3 -fPIC
+-LIBS = blas/blas.a
++LIBS = blas/libblas.la
+ SHVER = 3
+-OS = $(shell uname)
+ #LIBS = -lblas
+ 
+ all: train predict
+ 
+-lib: linear.o tron.o blas/blas.a
+-	if [ "$(OS)" = "Darwin" ]; then \
+-		SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \
+-	else \
+-		SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \
+-	fi; \
+-	$(CXX) $${SHARED_LIB_FLAG} linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER)
+-
+-train: tron.o linear.o train.c blas/blas.a
+-	$(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS)
+-
+-predict: tron.o linear.o predict.c blas/blas.a
+-	$(CXX) $(CFLAGS) -o predict predict.c tron.o linear.o $(LIBS)
++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
++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
++
++$(LIBS): blas/*.c blas/*.h
+ 	make -C blas OPTFLAGS='$(CFLAGS)' CC='$(CC)';
+ 
+ clean:

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 $<
+ 
+