CVS commit: pkgsrc/math/liblinear

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Oct 28 19:32:33 UTC 2020

Modified Files:
        pkgsrc/math/liblinear: Makefile distinfo
        pkgsrc/math/liblinear/patches: patch-Makefile

Log Message:
liblinear: updated to 2.41

Version 2.41 released on July 29, 2020 (some bug fixes of version 2.40).

Version 2.40 released on July 22, 2020.
A new solver: dual coordinate descent method for linear one-class SVM; see the paper
The Newton solver is updated to have faster training speed; see the release note
A new option -R to allow users not to regularize bias (when -B 1 is used)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/liblinear/Makefile \
    pkgsrc/math/liblinear/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/liblinear/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/liblinear/Makefile
diff -u pkgsrc/math/liblinear/Makefile:1.6 pkgsrc/math/liblinear/Makefile:1.7
--- pkgsrc/math/liblinear/Makefile:1.6  Wed Nov 15 22:12:56 2017
+++ pkgsrc/math/liblinear/Makefile      Wed Oct 28 19:32:32 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2017/11/15 22:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/28 19:32:32 adam Exp $
 
-DISTNAME=      liblinear-2.11
-PKGREVISION=   1
+DISTNAME=      liblinear-2.41
 CATEGORIES=    math
 MASTER_SITES=  https://www.csie.ntu.edu.tw/~cjlin/liblinear/
 
@@ -14,11 +13,12 @@ USE_LANGUAGES=      c c++
 USE_LIBTOOL=   yes
 
 BUILD_TARGET=  all lib
-AUTO_MKDIRS=   yes
 
 MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 
+INSTALLATION_DIRS+=    bin include lib share/doc/${PKGBASE} share/examples/${PKGBASE}
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/predict ${DESTDIR}${PREFIX}/bin/liblinear-predict
        ${INSTALL_PROGRAM} ${WRKSRC}/train ${DESTDIR}${PREFIX}/bin/liblinear-train
@@ -29,4 +29,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/heart_scale \
                ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 
+.include "../../math/blas/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/liblinear/distinfo
diff -u pkgsrc/math/liblinear/distinfo:1.6 pkgsrc/math/liblinear/distinfo:1.7
--- pkgsrc/math/liblinear/distinfo:1.6  Fri Nov 10 16:18:47 2017
+++ pkgsrc/math/liblinear/distinfo      Wed Oct 28 19:32:32 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2017/11/10 16:18:47 khorben Exp $
+$NetBSD: distinfo,v 1.7 2020/10/28 19:32:32 adam Exp $
 
-SHA1 (liblinear-2.11.tar.gz) = 6c306d0d0b7ea5281ee2b587adc89745ee0d74fa
-RMD160 (liblinear-2.11.tar.gz) = c80d051e8b354de03da3e41bd1bea096ef4076f3
-SHA512 (liblinear-2.11.tar.gz) = c5a33e98ae3c792173d38060b6002cf63af4571b42cdf313f6e5fd8ee5ac7b86caa99d123a028a6ecb3843aac0f839c9ff655f5fb28cfdf26ca7a6cb5f3f359d
-Size (liblinear-2.11.tar.gz) = 506509 bytes
-SHA1 (patch-Makefile) = 1f10259764b0ca07874da35d35b76d4054e92117
+SHA1 (liblinear-2.41.tar.gz) = 2b50ecfab5dc64245cd338dc59d7dc495af56970
+RMD160 (liblinear-2.41.tar.gz) = b65416689d7af97858b7448b1b8bb2c5acb5f7cf
+SHA512 (liblinear-2.41.tar.gz) = f2ce99b675382ff6e7a8e5baee433ba12ddd1042e67ac74dfa72efc3b75ed4c3b088f280a07e001d038777e4637b3eed7a1b584de6d2c90afc2fad4df0b129c9
+Size (liblinear-2.41.tar.gz) = 559241 bytes
+SHA1 (patch-Makefile) = e0e5171d00b484830dc3dcd8134fa9aa0c144701
 SHA1 (patch-blas_Makefile) = d829bdf80671d1eb95e78e4a7592f6fd3ffb7c46

Index: pkgsrc/math/liblinear/patches/patch-Makefile
diff -u pkgsrc/math/liblinear/patches/patch-Makefile:1.3 pkgsrc/math/liblinear/patches/patch-Makefile:1.4
--- pkgsrc/math/liblinear/patches/patch-Makefile:1.3    Fri Nov 10 16:18:47 2017
+++ pkgsrc/math/liblinear/patches/patch-Makefile        Wed Oct 28 19:32:33 2020
@@ -1,61 +1,54 @@
-$NetBSD: patch-Makefile,v 1.3 2017/11/10 16:18:47 khorben Exp $
+$NetBSD: patch-Makefile,v 1.4 2020/10/28 19:32:33 adam Exp $
 
 Use LIBTOOL.
 Add support for LDFLAGS.
 
---- Makefile.orig      2017-03-28 22:22:33.000000000 +0000
+--- Makefile.orig      2020-07-29 09:11:00.000000000 +0000
 +++ Makefile
-@@ -1,37 +1,30 @@
+@@ -1,34 +1,29 @@
  CXX ?= g++
  CC ?= gcc
 -CFLAGS = -Wall -Wconversion -O3 -fPIC
 -LIBS = blas/blas.a
 +LIBS = blas/libblas.la
- SHVER = 3
+ SHVER = 4
 -OS = $(shell uname)
  #LIBS = -lblas
  
  all: train predict
  
--lib: linear.o tron.o blas/blas.a
+-lib: linear.o newton.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)
+-      $(CXX) $${SHARED_LIB_FLAG} linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER)
++lib: linear.lo newton.lo $(LIBS)
 +      ${LIBTOOL} --mode=link $(CXX) -o liblinear.la $(LDFLAGS) $> -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)
+-train: newton.o linear.o train.c blas/blas.a
+-      $(CXX) $(CFLAGS) -o train train.c newton.o linear.o $(LIBS)
++train: newton.lo linear.lo train.c $(LIBS)
 +      ${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o train $(LDFLAGS) $>
  
--linear.o: linear.cpp linear.h
--      $(CXX) $(CFLAGS) -c -o linear.o linear.cpp
-+predict: tron.lo linear.lo predict.c $(LIBS)
+-predict: newton.o linear.o predict.c blas/blas.a
+-      $(CXX) $(CFLAGS) -o predict predict.c newton.o linear.o $(LIBS)
++predict: newton.lo linear.lo predict.c $(LIBS)
 +      ${LIBTOOL} --mode=link $(CXX) $(CFLAGS) -o predict $(LDFLAGS) $>
  
--blas/blas.a: blas/*.c blas/*.h
-+tron.lo: tron.cpp tron.h
-+      ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o tron.o tron.cpp
-+
+-newton.o: newton.cpp newton.h
++newton.lo: newton.cpp newton.h
++      ${LIBTOOL} --mode=compile \
+       $(CXX) $(CFLAGS) -c -o newton.o newton.cpp
+ 
+-linear.o: linear.cpp linear.h
 +linear.lo: linear.cpp linear.h
-+      ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -c -o linear.o linear.cpp
-+
++      ${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:
--      make -C blas clean
--      make -C matlab clean
-+      $(MAKE) -C blas clean
-+      $(MAKE) -C matlab clean
-       rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)