- Update to 1.1.1

PR:		ports/143828
Submitted by:	Robert Jenssen <robertjenssen@ozemail.com.au> (maintainer)

6 files changed, 32 insertions, 25 deletions

diff --git a/math/qrupdate/Makefile b/math/qrupdate/Makefile
index 727081161e2c..f69e41289852 100644
--- a/math/qrupdate/Makefile
+++ b/math/qrupdate/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	qrupdate
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	math
-MASTER_SITES=	http://downloads.sourceforge.net/project/qrupdate/qrupdate/1.0/ \
-		http://transact.dl.sourceforge.net/project/qrupdate/qrupdate/1.0/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	qrupdate/qrupdate/1.1
 
 MAINTAINER=	robertjenssen@ozemail.com.au
 COMMENT=	Fortran library for fast updates of QR and Cholesky decomposition
 
+LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas lapack.4:${PORTSDIR}/math/lapack
+
 FETCH_ARGS=	-p
 
 .include <bsd.port.pre.mk>
diff --git a/math/qrupdate/distinfo b/math/qrupdate/distinfo
index 776f020b2c5d..b62ef274e623 100644
--- a/math/qrupdate/distinfo
+++ b/math/qrupdate/distinfo
@@ -1,3 +1,3 @@
-MD5 (qrupdate-1.0.1.tar.gz) = 73d87b081e6fb89c9dc5b0ef0773b4dc
-SHA256 (qrupdate-1.0.1.tar.gz) = 45ba0b4e6b15236a219b5b380e15fc9acfe6760a9ca5e53484de9b534969ba0d
-SIZE (qrupdate-1.0.1.tar.gz) = 42179
+MD5 (qrupdate-1.1.1.tar.gz) = 7782c7ee6c234e56a72d6b86c1856fa0
+SHA256 (qrupdate-1.1.1.tar.gz) = 9f0100d358f96cae9394c28c97dbf1fd359675671d2a2c9ac88cfd121a46662a
+SIZE (qrupdate-1.1.1.tar.gz) = 50063
diff --git a/math/qrupdate/files/patch-Makeconf b/math/qrupdate/files/patch-Makeconf
index 72b60f78b524..a26e9ce70f98 100644
--- a/math/qrupdate/files/patch-Makeconf
+++ b/math/qrupdate/files/patch-Makeconf
@@ -1,5 +1,5 @@
---- Makeconf.orig	2009-03-11 15:08:32.000000000 +0900
-+++ Makeconf	2009-08-06 12:30:47.000000000 +0900
+--- Makeconf
++++ Makeconf
 @@ -1,14 +1,14 @@
  # set this to your compiler's executable name (e.g. gfortran, g77)
 -FC=gfortran
@@ -19,4 +19,4 @@
 +#LAPACK=-llapack
  
  # Library version
- VERSION=1.0
+ VERSION=1.1
diff --git a/math/qrupdate/files/patch-Makefile b/math/qrupdate/files/patch-Makefile
index b3ad7c4c67d9..715cf100a0c3 100644
--- a/math/qrupdate/files/patch-Makefile
+++ b/math/qrupdate/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-02-06 20:12:00.000000000 +1100
-+++ Makefile	2009-08-06 01:20:12.000000000 +1000
+--- Makefile
++++ Makefile
 @@ -21,6 +21,8 @@
  
  include Makeconf
@@ -34,4 +34,5 @@
 +	gmake -C src/ install-shlib
  
  install-staticlib:
- 	make -C src/ install-staticlib
+-	make -C src/ install-staticlib
++	gmake -C src/ install-staticlib
diff --git a/math/qrupdate/files/patch-src-Makefile b/math/qrupdate/files/patch-src-Makefile
index a57f0d780a84..7e18d07e9843 100644
--- a/math/qrupdate/files/patch-src-Makefile
+++ b/math/qrupdate/files/patch-src-Makefile
@@ -1,14 +1,19 @@
---- src/Makefile.orig	2009-08-06 01:21:58.000000000 +1000
-+++ src/Makefile	2009-08-06 01:28:32.000000000 +1000
-@@ -52,9 +52,9 @@
- install: install-shlib install-staticlib
+--- src/Makefile
++++ src/Makefile
+@@ -65,14 +65,9 @@
+ install-shlib: ../libqrupdate$(SOEXT) install-lib$(SOEXT)
  
- install-shlib: ../libqrupdate.so
--	install -D -m644 ../libqrupdate.so $(PREFIX)/lib/libqrupdate.so.$(VERSION)
-+	install -s ../libqrupdate.so $(PREFIX)/lib/libqrupdate.so.$(VERSION)
- 	ln -s libqrupdate.so.$(VERSION) $(PREFIX)/lib/libqrupdate.so.$(MAJOR)
- 	ln -s libqrupdate.so.$(VERSION) $(PREFIX)/lib/libqrupdate.so
+ install-lib.so:
+-	install -D -m644 ../libqrupdate.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.so.$(VERSION)
++	install -s ../libqrupdate.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.so.$(VERSION)
+ 	ln -s libqrupdate.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.so.$(MAJOR)
+ 	ln -s libqrupdate.so.$(VERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.so
  
+-install-lib.dylib:
+-	install -D -m644 ../libqrupdate.dylib $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.$(VERSION).dylib
+-	ln -s libqrupdate.$(VERSION).dylib $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.$(MAJOR).dylib
+-	ln -s libqrupdate.$(VERSION).dylib $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.dylib
+-
  install-staticlib: ../libqrupdate.a
--	install -D -m644 ../libqrupdate.a $(PREFIX)/lib/libqrupdate.a
-+	install -s ../libqrupdate.a $(PREFIX)/lib/libqrupdate.a
+-	install -D -m644 ../libqrupdate.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.a
++	install -s ../libqrupdate.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libqrupdate.a
diff --git a/math/qrupdate/pkg-plist b/math/qrupdate/pkg-plist
index 50cb181f955b..028d8ea764aa 100644
--- a/math/qrupdate/pkg-plist
+++ b/math/qrupdate/pkg-plist
@@ -1,4 +1,4 @@
-lib/libqrupdate.so.1.0
+lib/libqrupdate.so.1.1
 lib/libqrupdate.so.1
 lib/libqrupdate.so
 lib/libqrupdate.a