pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bump version 4.10.2, remove a patch



Module Name:	pkgsrc-wip
Committed By:	Litvinov Sergey <slitvinov%gmail.com@localhost>
Pushed By:	slitvinov
Date:		Thu Nov 26 10:09:02 2015 +0100
Changeset:	4f2560fb2e9b166d9320b3ea1b86567d1943fa12

Modified Files:
	silo/Makefile
	silo/PLIST
	silo/distinfo
Removed Files:
	silo/patches/patch-aa

Log Message:
bump version 4.10.2, remove a patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4f2560fb2e9b166d9320b3ea1b86567d1943fa12

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

diffstat:
 silo/Makefile         | 18 +++++++++++-------
 silo/PLIST            |  5 ++++-
 silo/distinfo         |  8 ++++----
 silo/patches/patch-aa | 28 ----------------------------
 4 files changed, 19 insertions(+), 40 deletions(-)

diffs:
diff --git a/silo/Makefile b/silo/Makefile
index 74f25db..8eb137a 100644
--- a/silo/Makefile
+++ b/silo/Makefile
@@ -1,10 +1,11 @@
 # $NetBSD: Makefile,v 1.4 2014/06/01 12:49:48 thomasklausner Exp $
 #
 
-DISTNAME=	silo-4.8-bsd
+VER=		4.10.2
+DISTNAME=	silo-${VER}-bsd
 PKGNAME=	${DISTNAME:S/-bsd//}
 CATEGORIES=	math
-MASTER_SITES=	https://wci.llnl.gov/codes/silo/silo-4.8/
+MASTER_SITES=	https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-${VER}/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	https://wci.llnl.gov/codes/silo/
@@ -18,15 +19,18 @@ USE_LIBTOOL=	yes
 # pkgsrc is not currently able to fetch distfiles from https web servers
 # (see mk/fetch/fetch.mk), so you have to use a browser for now.
 FETCH_BEFORE_ARGS=	--no-check-certificate
-
-
-CONFIGURE_ARGS+=	--with-readline
+CONFIGURE_ARGS+=	--with-qt
 #CONFIGURE_ARGS+=	--with-hdf5=${BUILDLINK_PREFIX.hdf5}/lib
 #CONFIGURE_ARGS+=	--with-hdf5=${BUILDLINK_PREFIX.hdf5}/include
-CONFIGURE_ARGS+=	--with-qt
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=	--with-readline=no
+.else
+.include "../../devel/readline/buildlink3.mk"
+.endif
 
 #.include "../../devel/hdf5/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/silo/PLIST b/silo/PLIST
index cfe7d6f..bd95863 100644
--- a/silo/PLIST
+++ b/silo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/03/07 12:20:06 jihbed Exp $
+@comment $NetBSD$
 bin/browser
 bin/silock
 bin/silodiff
@@ -7,5 +7,8 @@ include/ioperf.h
 include/pmpio.h
 include/silo.h
 include/silo.inc
+include/silo_exports.h
+include/silo_f77.inc
+include/silo_f9x.inc
 lib/libsilo.la
 lib/libsilo.settings
diff --git a/silo/distinfo b/silo/distinfo
index 1b308ae..9957858 100644
--- a/silo/distinfo
+++ b/silo/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.2 2012/11/13 14:44:37 othyro Exp $
 
-SHA1 (silo-4.8-bsd.tar.gz) = 8850c82e66d1d00f80041594e6f9b15f8efdfd4d
-RMD160 (silo-4.8-bsd.tar.gz) = c5a9d278ce71808a421e1b1f10d18c83b51d98fd
-Size (silo-4.8-bsd.tar.gz) = 11890001 bytes
-SHA1 (patch-aa) = 0463d2ec1dd1a590b66aa148b84b6b558ead6066
+SHA1 (silo-4.10.2-bsd.tar.gz) = aa1c82a586d9bdd8fe9694af5d858ec0fd7407d1
+RMD160 (silo-4.10.2-bsd.tar.gz) = f15098dfc58f86146bf87fc651bd6580aca71178
+SHA512 (silo-4.10.2-bsd.tar.gz) = 5764a1e309c938bd0ab271dc274f446532dcf22580ee7506b193b0d85fa814277741351bca241b25bf3452de68f5bf03f6623cfd3f2b0d83a11746bfcd19a95e
+Size (silo-4.10.2-bsd.tar.gz) = 13067837 bytes
diff --git a/silo/patches/patch-aa b/silo/patches/patch-aa
deleted file mode 100644
index 681194a..0000000
--- a/silo/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/11/13 14:41:41 othyro Exp $
-
-Fixes comparison operator.
-
---- configure.orig	2010-11-19 21:13:36.000000000 +0000
-+++ configure	2010-11-19 21:14:16.000000000 +0000
-@@ -27000,10 +27000,10 @@
-     consumeCount=-1
-     toks=`$QT_BIN/qmake --version`
-     for tok in $toks; do
--        if test "$tok" == "Qt"; then
-+        if test "$tok" = "Qt"; then
-             consumeCount=2
-         fi
--        if test $consumeCount == 0; then
-+        if test $consumeCount = 0; then
-             QtVersion2=$tok
-             break
-         else
-@@ -27015,7 +27015,7 @@
-     for ver in  4.4.0 4.4.1 4.4.2 4.4.3 4.4.4 4.4.5 \
-                 4.5.0 4.5.1 4.5.2 4.5.3 4.5.4 4.5.5 \
-                 4.6.0 4.6.1 4.6.2 4.6.3 4.6.4 4.6.5 ; do
--       if test "$QtVersion2" == "$ver"; then
-+       if test "$QtVersion2" = "$ver"; then
-            QtVersion=$ver
-            break
-        fi


Home | Main Index | Thread Index | Old Index