Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
math/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.263 2014/02/20 11:30:45 fhajny Exp $
# $NetBSD: Makefile,v 1.303 2015/02/04 17:37:44 ryoon Exp $
COMMENT= Mathematics
@@ -73,6 +73,8 @@ SUBDIR+= cgal
SUBDIR+= clisp-pari
SUBDIR+= cln
SUBDIR+= cloog
SUBDIR+= coinmp
SUBDIR+= crfsuite
SUBDIR+= dcdflib.c
SUBDIR+= dcdflib.f
SUBDIR+= dfftpack
@@ -117,6 +119,11 @@ SUBDIR+= gtklife
SUBDIR+= harminv
SUBDIR+= heirloom-factor
SUBDIR+= heirloom-units
SUBDIR+= hs-distributive
SUBDIR+= hs-mwc-random
SUBDIR+= hs-nats
SUBDIR+= hs-scientific
SUBDIR+= hs-semigroups
SUBDIR+= ipopt
SUBDIR+= isl
SUBDIR+= itpp
@@ -126,7 +133,11 @@ SUBDIR+= kseg
SUBDIR+= lapack
SUBDIR+= libffm
SUBDIR+= libint
SUBDIR+= liblbfgs
SUBDIR+= liblinear
SUBDIR+= libmatheval
SUBDIR+= libshorttext
SUBDIR+= libsvm
SUBDIR+= linpack
SUBDIR+= lp_solve
SUBDIR+= ltm
@@ -183,6 +194,7 @@ SUBDIR+= p5-Math-Spline
SUBDIR+= p5-Math-VecStat
SUBDIR+= p5-Number-Compare
SUBDIR+= p5-Number-Latin
SUBDIR+= p5-Number-Range
SUBDIR+= p5-Number-Tolerant
SUBDIR+= p5-Roman
SUBDIR+= p5-Set-Crontab
@@ -193,6 +205,8 @@ SUBDIR+= p5-Spreadsheet-ReadSXC
SUBDIR+= p5-Spreadsheet-WriteExcel
SUBDIR+= p5-Spreadsheet-XLSX
SUBDIR+= p5-Statistics-Descriptive
SUBDIR+= p5-Statistics-Distributions
SUBDIR+= p5-Statistics-TTest
SUBDIR+= p5-Test-Number-Delta
SUBDIR+= pari
SUBDIR+= pari-galdata
@@ -206,11 +220,14 @@ SUBDIR+= pspp
SUBDIR+= py-Numeric
SUBDIR+= py-Scientific
SUBDIR+= py-Scientific-doc
SUBDIR+= py-almost
SUBDIR+= py-cdecimal
SUBDIR+= py-ephem
SUBDIR+= py-ephem3
SUBDIR+= py-fpconst
SUBDIR+= py-gmpy
SUBDIR+= py-infinity
SUBDIR+= py-intervals
SUBDIR+= py-mpmath
SUBDIR+= py-munkres
SUBDIR+= py-networkx
@@ -253,7 +270,7 @@ SUBDIR+= tochnog
SUBDIR+= udunits
SUBDIR+= units
SUBDIR+= vista
SUBDIR+= wxMaxima
SUBDIR+= wxmaxima
SUBDIR+= xeukleides10
SUBDIR+= xfractint
SUBDIR+= xgap

14
math/R-DAAG/Makefile
View File

@@ -1,19 +1,17 @@
# $NetBSD: Makefile,v 1.9 2012/04/15 13:33:06 brook Exp $
# $NetBSD: Makefile,v 1.11 2014/09/19 19:42:13 brook Exp $
CATEGORIES= databases math
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/DAAG/
COMMENT= Example data sets and functions implemented in R
# LICENSE= Unlimited
COMMENT= Data Analysis And Graphics data and functions
LICENSE= gnu-gpl-v3
R_PKGNAME= DAAG
R_PKGVER= 1.12
R_PKGVER= 1.20
DEPENDS+= R-randomForest>=4.6.6:../../math/R-randomForest
INSTALLATION_DIRS+= lib/R/doc/html/search
DEPENDS+= R-latticeExtra>=0.6.26:../../graphics/R-latticeExtra
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

8
math/R-DAAG/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.5 2012/04/15 13:33:06 brook Exp $
$NetBSD: distinfo,v 1.6 2014/08/26 15:48:39 brook Exp $
SHA1 (R/DAAG_1.12.tar.gz) = 6621bb76a65e51b59779d876c163ea77b4034309
RMD160 (R/DAAG_1.12.tar.gz) = 024e9e0a34305cfa36a26432483a0943849374b4
Size (R/DAAG_1.12.tar.gz) = 973803 bytes
SHA1 (R/DAAG_1.20.tar.gz) = 146818a5fc61a5fa42358bc7056343bbf3b0f470
RMD160 (R/DAAG_1.20.tar.gz) = eb2952a7996940eba58ea4ba0e247b3d4ce5d94d
Size (R/DAAG_1.20.tar.gz) = 1416985 bytes

3
math/R-GRASS/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2013/12/07 19:32:48 dholland Exp $
# $NetBSD: Makefile,v 1.8 2014/09/29 15:11:43 jperkin Exp $
CATEGORIES= databases math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -13,5 +13,6 @@ R_PKGVER= 0.3-8
post-extract:
echo 'exportPattern("^[^\\.]")' > ${WRKSRC}/NAMESPACE
.include "../../devel/zlib/buildlink3.mk"
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

4
math/R-RPostgreSQL/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2012/08/05 10:02:12 obache Exp $
# $NetBSD: Makefile,v 1.3 2014/06/10 14:21:37 joerg Exp $
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}

4
math/R-chron/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2012/04/15 15:18:34 brook Exp $
# $NetBSD: Makefile,v 1.7 2014/08/26 14:08:02 brook Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -9,7 +9,7 @@ COMMENT= Chronological objects which can handle dates and times
LICENSE= gnu-gpl-v2
R_PKGNAME= chron
R_PKGVER= 2.3-42
R_PKGVER= 2.3-45
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

8
math/R-chron/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2012/04/15 15:18:34 brook Exp $
$NetBSD: distinfo,v 1.5 2014/08/26 14:08:02 brook Exp $
SHA1 (R/chron_2.3-42.tar.gz) = 5e44e98c3c45de8c56028c35e263d1db16f01579
RMD160 (R/chron_2.3-42.tar.gz) = e1fe5ae1d396af0ee6b27ab6aa4f0436e18a8f1a
Size (R/chron_2.3-42.tar.gz) = 34806 bytes
SHA1 (R/chron_2.3-45.tar.gz) = 63ca63d330a31f04cbdcf997fb30f3ed247b47f0
RMD160 (R/chron_2.3-45.tar.gz) = 27a1be0d6ce550b6730a44aa67782fdb4f6677bd
Size (R/chron_2.3-45.tar.gz) = 36242 bytes

6
math/R-date/Makefile
View File

@@ -1,15 +1,15 @@
# $NetBSD: Makefile,v 1.6 2012/04/15 15:22:37 brook Exp $
# $NetBSD: Makefile,v 1.7 2014/08/28 03:14:39 brook Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/date/
COMMENT= R functions for handling dates
COMMENT= Functions for handling dates
LICENSE= gnu-gpl-v2
R_PKGNAME= date
R_PKGVER= 1.2-32
R_PKGVER= 1.2-34
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

8
math/R-date/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2012/04/15 15:22:37 brook Exp $
$NetBSD: distinfo,v 1.5 2014/08/28 03:14:39 brook Exp $
SHA1 (R/date_1.2-32.tar.gz) = c21982e2023af090f7f677c1c03050f1c4db7f75
RMD160 (R/date_1.2-32.tar.gz) = a92157ee7ad60e9a0dbbe7c5fdce1ccd79628b46
Size (R/date_1.2-32.tar.gz) = 9563 bytes
SHA1 (R/date_1.2-34.tar.gz) = da06368bca031a563d5f1b81ed85955305270414
RMD160 (R/date_1.2-34.tar.gz) = 4dcb0ad1d0c1f9b8e49389c7f0b31fda7b7bef7e
Size (R/date_1.2-34.tar.gz) = 9791 bytes

4
math/R-gdata/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2013/05/31 12:41:21 wiz Exp $
# $NetBSD: Makefile,v 1.8 2014/05/29 23:36:52 wiz Exp $
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}

4
math/R-genetics/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.7 2013/05/31 12:41:21 wiz Exp $
# $NetBSD: Makefile,v 1.8 2014/05/29 23:36:52 wiz Exp $
#
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}

4
math/R-lmm/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2012/04/15 13:46:13 brook Exp $
# $NetBSD: Makefile,v 1.11 2014/11/01 13:31:10 wen Exp $
#
CATEGORIES= math
@@ -10,7 +10,7 @@ COMMENT= Improved procedures for linear mixed models with R
# LICENSE= file LICENSE
R_PKGNAME= lmm
R_PKGVER= 0.5
R_PKGVER= 0.9
USE_LANGUAGES+= c fortran

8
math/R-lmm/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.4 2012/04/15 13:46:13 brook Exp $
$NetBSD: distinfo,v 1.5 2014/11/01 13:31:10 wen Exp $
SHA1 (R/lmm_0.5.tar.gz) = 8bd440e0f2af203f2de93165473e28f32f2e1b50
RMD160 (R/lmm_0.5.tar.gz) = 275d11471dcda200e062b1f380b58ac934fb6d70
Size (R/lmm_0.5.tar.gz) = 451290 bytes
SHA1 (R/lmm_0.9.tar.gz) = 16aed9fa0650ab38bac62b3969f911042b156799
RMD160 (R/lmm_0.9.tar.gz) = 8b060bf2a6a073106a4a01eac56cf0edbba9dc6c
Size (R/lmm_0.9.tar.gz) = 450226 bytes
SHA1 (patch-aa) = 85195d02f6be923e38aa5536f48f19b91d47269c

14
math/R-lmm/patches/patch-aa
View File

@@ -1,14 +0,0 @@
$NetBSD: patch-aa,v 1.2 2008/10/14 22:41:44 markd Exp $
--- src/lmm.f.orig 2003-12-04 09:19:01.000000000 +1300
+++ src/lmm.f
@@ -549,7 +549,8 @@ C 3 = inadequate information to obta
C 4 = value of xi or inv(Ui) became non-pos.def. during iterations
C 5 = t(X)%*%W%*%X became non-pos.def. during iterations
C 6 = supplied xihat is non-pos.def.
- integer gmax/50/
+ integer gmax
+ data gmax/50/
double precision estarhat(0:50)
integer ntot,subj(ntot),m,ist(m),ifin(m),occ(ntot),nmax,
/ pcol,q,zcol(q),iflag,err,msg,iter,p,xcol(p),i,j,

7
math/R-plyr/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/08/15 09:22:21 wen Exp $
# $NetBSD: Makefile,v 1.3 2014/09/19 21:19:40 brook Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -9,7 +9,10 @@ COMMENT= Tools for splitting, applying and combining data
LICENSE= mit
R_PKGNAME= plyr
R_PKGVER= 1.8
R_PKGVER= 1.8.1
USE_LANGUAGES+= c++
.include "../../math/R/Makefile.extension"
.include "../../devel/R-Rcpp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

8
math/R-plyr/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1 2013/08/15 09:22:21 wen Exp $
$NetBSD: distinfo,v 1.2 2014/08/26 16:40:40 brook Exp $
SHA1 (R/plyr_1.8.tar.gz) = 30eed163006591c5916294628b64757c185ec670
RMD160 (R/plyr_1.8.tar.gz) = 28e4734e8ebc5f0aad1bada9d52eb71bf90217f5
Size (R/plyr_1.8.tar.gz) = 384462 bytes
SHA1 (R/plyr_1.8.1.tar.gz) = 28435911667715950113104dbfa38a58667593d8
RMD160 (R/plyr_1.8.1.tar.gz) = 7a240c771d5f3c24ef8303fbdf4f88984d361810
Size (R/plyr_1.8.1.tar.gz) = 393233 bytes

6
math/R-sp/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2014/03/09 14:38:25 wen Exp $
# $NetBSD: Makefile,v 1.7 2014/07/13 13:40:10 wen Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -6,10 +6,10 @@ MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/sp/
COMMENT= Classes and methods for spatial data
LICENSE= gnu-gpl-v2
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
R_PKGNAME= sp
R_PKGVER= 1.0-14
R_PKGVER= 1.0-15
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

8
math/R-sp/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.6 2014/03/09 14:38:25 wen Exp $
$NetBSD: distinfo,v 1.7 2014/07/13 13:40:10 wen Exp $
SHA1 (R/sp_1.0-14.tar.gz) = d1ff889383a3fd62fb49c6a8890c2a2bc2dbf493
RMD160 (R/sp_1.0-14.tar.gz) = e3578e56027d638d3fa9eabd3fb9407224181923
Size (R/sp_1.0-14.tar.gz) = 1202772 bytes
SHA1 (R/sp_1.0-15.tar.gz) = 64d680802d958a5f52ba911bf03b388c88cfc7b7
RMD160 (R/sp_1.0-15.tar.gz) = 5d0637eac62c99618aa25dff1da84e5ba347884e
Size (R/sp_1.0-15.tar.gz) = 1159056 bytes

6
math/R-splancs/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2013/07/07 11:20:24 wen Exp $
# $NetBSD: Makefile,v 1.3 2014/07/13 13:32:51 wen Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -6,10 +6,10 @@ MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/splancs/
COMMENT= Spatial and space-time point pattern analysis
LICENSE= gnu-gpl-v2
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
R_PKGNAME= splancs
R_PKGVER= 2.01-33
R_PKGVER= 2.01-34
USE_LANGUAGES+= c fortran

8
math/R-splancs/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.2 2013/07/07 11:20:24 wen Exp $
$NetBSD: distinfo,v 1.3 2014/07/13 13:32:51 wen Exp $
SHA1 (R/splancs_2.01-33.tar.gz) = dc82a5ada62b3e7c72ee12f743b2068926c4260d
RMD160 (R/splancs_2.01-33.tar.gz) = ee031be47cb63e89feb7eb4e9150d1411ba650b8
Size (R/splancs_2.01-33.tar.gz) = 106652 bytes
SHA1 (R/splancs_2.01-34.tar.gz) = c4378cc8f0d023db8f3404b335d7856ba944fc54
RMD160 (R/splancs_2.01-34.tar.gz) = 2cdedec0c373579ef832e49d6ef6a2aeb19e5b5c
Size (R/splancs_2.01-34.tar.gz) = 98701 bytes

6
math/R-statmod/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/03/09 14:28:57 wen Exp $
# $NetBSD: Makefile,v 1.10 2014/07/13 12:47:38 wen Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -6,10 +6,10 @@ MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/statmod/
COMMENT= Miscellaneous biostatistical modeling functions
LICENSE= gnu-lgpl-v2
LICENSE= gnu-lgpl-v2 OR gnu-lgpl-v3
R_PKGNAME= statmod
R_PKGVER= 1.4.18
R_PKGVER= 1.4.20
USE_LANGUAGES+= c fortran

8
math/R-statmod/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.7 2014/03/09 14:28:57 wen Exp $
$NetBSD: distinfo,v 1.8 2014/07/13 12:47:38 wen Exp $
SHA1 (R/statmod_1.4.18.tar.gz) = 23e0f9814d18af9c007d3767fe9af962c2423e6d
RMD160 (R/statmod_1.4.18.tar.gz) = 43341893a96ce0706fe1d41c9feb7d2e8bffe16a
Size (R/statmod_1.4.18.tar.gz) = 53411 bytes
SHA1 (R/statmod_1.4.20.tar.gz) = 28ddfed5c1dd0d58d29bed876c7d2fc0f8351409
RMD160 (R/statmod_1.4.20.tar.gz) = cd40f98c6b7b7c1d04e3a8224654e9859ffed0bf
Size (R/statmod_1.4.20.tar.gz) = 55377 bytes

6
math/R-zoo/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2014/03/14 15:20:58 wen Exp $
# $NetBSD: Makefile,v 1.6 2014/07/13 12:06:08 wen Exp $
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
@@ -6,10 +6,10 @@ MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/zoo/
COMMENT= S3 Infrastructure for Regular and Irregular Time Series
LICENSE= gnu-gpl-v2
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
R_PKGNAME= zoo
R_PKGVER= 1.7-10
R_PKGVER= 1.7-11
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"

8
math/R-zoo/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.5 2014/03/14 15:20:58 wen Exp $
$NetBSD: distinfo,v 1.6 2014/07/13 12:06:08 wen Exp $
SHA1 (R/zoo_1.7-10.tar.gz) = f211869ff7651ae71fd1b4de4bcb992519695b7a
RMD160 (R/zoo_1.7-10.tar.gz) = d1637360ca8cff38384f2a690495e430f4df673c
Size (R/zoo_1.7-10.tar.gz) = 813020 bytes
SHA1 (R/zoo_1.7-11.tar.gz) = ea4318de677f78a56c97af465a91ada0131e823f
RMD160 (R/zoo_1.7-11.tar.gz) = d5eaa1340def16a9ef4ca662a0a0923ae01034ba
Size (R/zoo_1.7-11.tar.gz) = 819242 bytes

15
math/R/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.147 2014/03/14 20:15:38 markd Exp $
# $NetBSD: Makefile,v 1.153 2014/10/09 14:06:41 wiz Exp $
DISTNAME= R-3.0.3
DISTNAME= R-3.1.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-3/}
@@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v2
NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_GCC_RUNTIME= yes
BUILD_TARGET= all info
@@ -22,7 +20,6 @@ INSTALL_TARGET= install install-info
TEST_TARGET= check
USE_TOOLS+= gmake gzip:run makeinfo perl:run sed unzip:run xmkmf
USE_TOOLS+= pkg-config
USE_GNU_ICONV= yes # latin1 support, iconvlist
USE_LANGUAGES= c c++ fortran
USE_LIBTOOL= yes
TEXINFO_REQD= 4.7
@@ -48,6 +45,10 @@ CONFIGURE_ARGS+= --with-system-xz
CONFIGURE_ARGS+= --enable-long-double=no
.endif
.if ${OPSYS} != "Linux"
USE_GNU_ICONV= yes # latin1 support, iconvlist
.endif
# Disable Mac OS specific support used by R.app
CONFIGURE_ARGS+= --disable-R-framework
CONFIGURE_ARGS+= --without-aqua
@@ -126,6 +127,10 @@ INSTALL_SCRIPT= ${INSTALL} ${COPY} -m ${BINMODE}
#BUILD_DEPENDS+= tex-mptopdf-[0-9]*:../../graphics/tex-mptopdf
#BUILD_DEPENDS+= tex-pdftex-def-[0-9]*:../../print/tex-pdftex
SUBST_CLASSES+= fixwrap
SUBST_STAGE.fixwrap= post-build
SUBST_FILES.fixwrap= libtool
SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/libtool-fortran,${PKG_LIBTOOL},g"
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
BUILDLINK_API_DEPENDS.bzip2+= bzip2>=1.0.5

4
math/R/Makefile.extension
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.extension,v 1.18 2013/01/17 11:09:44 mishka Exp $
# $NetBSD: Makefile.extension,v 1.19 2014/10/09 14:06:41 wiz Exp $
#
# This Makefile fragment is included by packages for R library packages.
#
@@ -14,8 +14,6 @@ MASTER_SITES?= ${MASTER_SITE_R_CRAN:=contrib/}
DIST_SUBDIR?= R
CATEGORIES+= math
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${R_PKGNAME}
INSTALLATION_DIRS= ${R_LIB}

39
math/R/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.19 2014/03/14 20:15:38 markd Exp $
@comment $NetBSD: PLIST,v 1.20 2014/05/03 22:29:42 markd Exp $
bin/R
bin/Rscript
info/R-FAQ.info.gz
@@ -8,18 +8,7 @@ info/R-exts.info.gz
info/R-intro.info.gz
info/R-ints.info.gz
info/R-lang.info.gz
lib/R/doc/manual/images/QQ.png
lib/R/doc/manual/images/ecdf.png
lib/R/doc/manual/images/fig11.png
lib/R/doc/manual/images/fig12.png
lib/R/doc/manual/images/hist.png
lib/R/doc/manual/images/ice.png
lib/R/COPYING
lib/R/NEWS
lib/R/NEWS.0
lib/R/NEWS.1
lib/R/NEWS.2
lib/R/NEWS.pdf
lib/R/SVN-REVISION
lib/R/bin/BATCH
lib/R/bin/COMPILE
@@ -53,6 +42,11 @@ lib/R/doc/CRAN_mirrors.csv
lib/R/doc/FAQ
lib/R/doc/KEYWORDS
lib/R/doc/KEYWORDS.db
lib/R/doc/NEWS
lib/R/doc/NEWS.0
lib/R/doc/NEWS.1
lib/R/doc/NEWS.2
lib/R/doc/NEWS.pdf
lib/R/doc/NEWS.rds
lib/R/doc/RESOURCES
lib/R/doc/THANKS
@@ -78,6 +72,12 @@ lib/R/doc/manual/R-exts.html
lib/R/doc/manual/R-intro.html
lib/R/doc/manual/R-ints.html
lib/R/doc/manual/R-lang.html
lib/R/doc/manual/images/QQ.png
lib/R/doc/manual/images/ecdf.png
lib/R/doc/manual/images/fig11.png
lib/R/doc/manual/images/fig12.png
lib/R/doc/manual/images/hist.png
lib/R/doc/manual/images/ice.png
lib/R/etc/Makeconf
lib/R/etc/Renviron
lib/R/etc/javaconf
@@ -96,6 +96,7 @@ lib/R/include/R_ext/Error.h
lib/R/include/R_ext/GetX11Image.h
lib/R/include/R_ext/GraphicsDevice.h
lib/R/include/R_ext/GraphicsEngine.h
lib/R/include/R_ext/Itermacros.h
lib/R/include/R_ext/Lapack.h
lib/R/include/R_ext/Linpack.h
lib/R/include/R_ext/MathThreads.h
@@ -107,6 +108,7 @@ lib/R/include/R_ext/QuartzDevice.h
lib/R/include/R_ext/R-ftp-http.h
lib/R/include/R_ext/RS.h
lib/R/include/R_ext/RStartup.h
lib/R/include/R_ext/Rallocators.h
lib/R/include/R_ext/Random.h
lib/R/include/R_ext/Rdynload.h
lib/R/include/R_ext/Riconv.h
@@ -147,6 +149,7 @@ lib/R/library/KernSmooth/html/R.css
lib/R/library/KernSmooth/libs/KernSmooth.so
lib/R/library/KernSmooth/po/de/LC_MESSAGES/R-KernSmooth.mo
lib/R/library/KernSmooth/po/en@quot/LC_MESSAGES/R-KernSmooth.mo
lib/R/library/KernSmooth/po/fr/LC_MESSAGES/R-KernSmooth.mo
lib/R/library/KernSmooth/po/ko/LC_MESSAGES/R-KernSmooth.mo
lib/R/library/KernSmooth/po/pl/LC_MESSAGES/R-KernSmooth.mo
lib/R/library/MASS/CITATION
@@ -262,6 +265,7 @@ lib/R/library/Matrix/po/de/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/de/LC_MESSAGES/R-Matrix.mo
lib/R/library/Matrix/po/en@quot/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/en@quot/LC_MESSAGES/R-Matrix.mo
lib/R/library/Matrix/po/fr/LC_MESSAGES/R-Matrix.mo
lib/R/library/Matrix/po/pl/LC_MESSAGES/Matrix.mo
lib/R/library/Matrix/po/pl/LC_MESSAGES/R-Matrix.mo
lib/R/library/Matrix/test-tools-1.R
@@ -303,6 +307,7 @@ lib/R/library/boot/NAMESPACE
lib/R/library/boot/R/boot
lib/R/library/boot/R/boot.rdb
lib/R/library/boot/R/boot.rdx
lib/R/library/boot/bd.q
lib/R/library/boot/data/Rdata.rdb
lib/R/library/boot/data/Rdata.rds
lib/R/library/boot/data/Rdata.rdx
@@ -371,6 +376,8 @@ lib/R/library/cluster/html/R.css
lib/R/library/cluster/libs/cluster.so
lib/R/library/cluster/po/de/LC_MESSAGES/R-cluster.mo
lib/R/library/cluster/po/en@quot/LC_MESSAGES/R-cluster.mo
lib/R/library/cluster/po/en@quot/LC_MESSAGES/cluster.mo
lib/R/library/cluster/po/fr/LC_MESSAGES/R-cluster.mo
lib/R/library/cluster/po/pl/LC_MESSAGES/R-cluster.mo
lib/R/library/codetools/DESCRIPTION
lib/R/library/codetools/INDEX
@@ -471,6 +478,10 @@ lib/R/library/grDevices/NAMESPACE
lib/R/library/grDevices/R/grDevices
lib/R/library/grDevices/R/grDevices.rdb
lib/R/library/grDevices/R/grDevices.rdx
lib/R/library/grDevices/afm/ArialMT-Bold.afm.gz
lib/R/library/grDevices/afm/ArialMT-BoldItalic.afm.gz
lib/R/library/grDevices/afm/ArialMT-Italic.afm.gz
lib/R/library/grDevices/afm/ArialMT.afm.gz
lib/R/library/grDevices/afm/CM_boldx_10.afm.gz
lib/R/library/grDevices/afm/CM_boldx_italic_10.afm.gz
lib/R/library/grDevices/afm/CM_italic_10.afm.gz
@@ -635,6 +646,7 @@ lib/R/library/grid/NAMESPACE
lib/R/library/grid/R/grid
lib/R/library/grid/R/grid.rdb
lib/R/library/grid/R/grid.rdx
lib/R/library/grid/doc/DivByZero.txt
lib/R/library/grid/doc/changes.txt
lib/R/library/grid/doc/displaylist.pdf
lib/R/library/grid/doc/frame.pdf
@@ -691,7 +703,7 @@ lib/R/library/lattice/po/de/LC_MESSAGES/R-lattice.mo
lib/R/library/lattice/po/en@quot/LC_MESSAGES/R-lattice.mo
lib/R/library/lattice/po/fr/LC_MESSAGES/R-lattice.mo
lib/R/library/lattice/po/ko/LC_MESSAGES/R-lattice.mo
lib/R/library/lattice/po/pl_PL/LC_MESSAGES/R-lattice.mo
lib/R/library/lattice/po/pl/LC_MESSAGES/R-lattice.mo
lib/R/library/methods/DESCRIPTION
lib/R/library/methods/INDEX
lib/R/library/methods/Meta/Rd.rds
@@ -1126,6 +1138,7 @@ lib/R/library/translations/de/LC_MESSAGES/splines.mo
lib/R/library/translations/de/LC_MESSAGES/stats.mo
lib/R/library/translations/de/LC_MESSAGES/tcltk.mo
lib/R/library/translations/de/LC_MESSAGES/tools.mo
lib/R/library/translations/de/LC_MESSAGES/utils.mo
lib/R/library/translations/en/LC_MESSAGES/R.mo
lib/R/library/translations/en@quot/LC_MESSAGES/R-base.mo
lib/R/library/translations/en@quot/LC_MESSAGES/R-compiler.mo

14
math/R/distinfo
View File

@@ -1,7 +1,9 @@
$NetBSD: distinfo,v 1.58 2014/03/14 20:15:38 markd Exp $
$NetBSD: distinfo,v 1.63 2015/01/23 15:06:44 joerg Exp $
SHA1 (R-3.0.3.tar.gz) = 82e83415d27a2fbbdcacb41c4aa14d8b36fdf470
RMD160 (R-3.0.3.tar.gz) = 9a7378732d3bc705092078e95e9c51d25c4be417
Size (R-3.0.3.tar.gz) = 28075821 bytes
SHA1 (patch-ac) = cbfe9853a6b1bdfa68d21c0a291f39545b131333
SHA1 (patch-ad) = 21c2f74ceb41afa72b0b268ba4b1dcb57f01e106
SHA1 (R-3.1.1.tar.gz) = e974ecc92e49266529e8e791e02a80c75e50b696
RMD160 (R-3.1.1.tar.gz) = 72e5d7a9ec4dc9c960321e7fc8d939cb59d63c31
Size (R-3.1.1.tar.gz) = 28606569 bytes
SHA1 (patch-ac) = 9c6de78be36766ceefa8aafa8a7b5d5af3f83cac
SHA1 (patch-ad) = b40536fac079e2cc348a020fafac687f2f8b1dfe
SHA1 (patch-src_library_stats_src_Makefile.in) = b468becd011fa4828e50f5d13d700825655c89e8
SHA1 (patch-src_main_character.c) = 29d302b4530bdc3b49afff6b10f94277e1a94b43

12
math/R/patches/patch-ac
View File

@@ -1,6 +1,7 @@
$NetBSD: patch-ac,v 1.32 2014/01/13 11:25:54 jperkin Exp $
$NetBSD: patch-ac,v 1.33 2014/06/26 20:34:54 asau Exp $
Do not include system paths in R_LD_LIBRARY_PATH.
FreeBSD 10 is not FreeBSD 1.
--- configure.orig 2013-05-08 22:06:02.000000000 +0000
+++ configure
@@ -22,6 +23,15 @@ Do not include system paths in R_LD_LIBRARY_PATH.
LTOALL=-flto
fi
@@ -19899,7 +19899,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -20375,7 +20375,7 @@ case "${host_os}" in
## look-up sequence. Such automatic override has proven to break things
## like system frameworks (e.g. ImageIO or OpenGL framework).

8
math/R/patches/patch-ad
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-ad,v 1.16 2013/08/13 19:53:30 markd Exp $
$NetBSD: patch-ad,v 1.17 2014/05/03 22:29:42 markd Exp $
Adjust EXTRA_LIBS and @WANT_R_SHLIB_TRUE@R_bin_LDADD
--- src/main/Makefile.in.orig 2013-03-05 23:02:40.000000000 +0000
--- src/main/Makefile.in.orig 2014-04-13 11:25:39.000000000 +0000
+++ src/main/Makefile.in
@@ -95,13 +95,13 @@ EXTRA_STATIC_LIBS = \
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL)
@@ -98,13 +98,13 @@ EXTRA_STATIC_LIBS = \
$(R_ZLIBS) $(R_BZLIBS) $(R_PCRE) $(R_TRE) $(R_XDR) $(R_XZ) $(R_LIBINTL) $(R_TZONE)
STATIC_LIBS = $(MAIN_LIBS) $(EXTRA_STATIC_LIBS)
-EXTRA_LIBS = $(BLAS_LIBS) $(FLIBS) $(R_XTRA_LIBS) @LIBINTL@ $(READLINE_LIBS) $(LIBS)

14
math/R/patches/patch-src_library_stats_src_Makefile.in Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-src_library_stats_src_Makefile.in,v 1.1 2014/11/29 22:04:51 joerg Exp $
${R_INCLUDE_DIR} is used in the default compiler flags.
--- src/library/stats/src/Makefile.in.orig 2014-11-29 20:35:23.000000000 +0000
+++ src/library/stats/src/Makefile.in
@@ -10,6 +10,7 @@ top_srcdir = @top_srcdir@
top_builddir = ../../../..
subdir = src/library/$(pkg)/src
R_HOME = $(top_builddir)
+R_INCLUDE_DIR = $(R_HOME)/include
## for $(R_HOME)/etc${R_ARCH}/Makeconf
R_SHARE_DIR = $(R_HOME)/share

22
math/R/patches/patch-src_main_character.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-src_main_character.c,v 1.1 2015/01/23 15:06:44 joerg Exp $
--- src/main/character.c.orig 2015-01-22 19:20:05.000000000 +0000
+++ src/main/character.c
@@ -1311,7 +1311,7 @@ SEXP attribute_hidden do_strtrim(SEXP ca
return s;
}
-static int strtoi(SEXP s, int base)
+static int my_strtoi(SEXP s, int base)
{
long int res;
char *endp;
@@ -1345,7 +1345,7 @@ SEXP attribute_hidden do_strtoi(SEXP cal
PROTECT(ans = allocVector(INTSXP, n = LENGTH(x)));
for(i = 0; i < n; i++)
- INTEGER(ans)[i] = strtoi(STRING_ELT(x, i), base);
+ INTEGER(ans)[i] = my_strtoi(STRING_ELT(x, i), base);
UNPROTECT(1);
return ans;

4
math/TinySVM/Makefile
View File

@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.2 2012/09/11 23:04:16 asau Exp $
# $NetBSD: Makefile,v 1.3 2015/03/15 17:25:55 hiramatsu Exp $
#
DISTNAME= TinySVM-0.09
CATEGORIES= math
MASTER_SITES= http://www.chasen.org/~taku/software/TinySVM/src/
MAINTAINER= obache@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.chasen.org/~taku/software/TinySVM/
COMMENT= Tiny Support Vector Machines
LICENSE= gnu-lgpl-v2.1

4
math/analitza/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.22 2014/02/12 23:18:10 tron Exp $
# $NetBSD: Makefile,v 1.27 2014/11/13 19:24:23 markd Exp $
DISTNAME= analitza-${_KDE_VERSION}
PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE library for mathematical features
@@ -12,6 +11,7 @@ BROKEN_READLINE_DETECTION= yes
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

11
math/analitza/PLIST
View File

@@ -1,14 +1,20 @@
@comment $NetBSD: PLIST,v 1.3 2013/11/07 11:59:58 markd Exp $
@comment $NetBSD: PLIST,v 1.4 2014/11/13 19:24:23 markd Exp $
bin/calgebra
include/analitza/abstractexpressionvisitor.h
include/analitza/abstractlexer.h
include/analitza/analitzaexport.h
include/analitza/analitzautils.h
include/analitza/analyzer.h
include/analitza/apply.h
include/analitza/builtinmethods.h
include/analitza/container.h
include/analitza/customobject.h
include/analitza/expression.h
include/analitza/expressionstream.h
include/analitza/expressiontype.h
include/analitza/importqobjectmetatype.h
include/analitza/list.h
include/analitza/matrix.h
include/analitza/object.h
include/analitza/operations.h
include/analitza/operator.h
@@ -47,4 +53,7 @@ lib/libanalitzagui.so.5.0.0
lib/libanalitzaplot.so
lib/libanalitzaplot.so.5
lib/libanalitzaplot.so.5.0.0
share/kde/apps/libanalitza/plots/3Ds.plots
share/kde/apps/libanalitza/plots/basic_curves.plots
share/kde/apps/libanalitza/plots/conics.plots
share/kde/apps/libanalitza/plots/polar.plots

4
math/analitza/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.16 2014/02/12 23:18:10 tron Exp $
# $NetBSD: buildlink3.mk,v 1.20 2014/11/07 19:39:25 adam Exp $
BUILDLINK_TREE+= analitza
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= analitza
ANALITZA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.analitza+= analitza>=4.8.0
BUILDLINK_ABI_DEPENDS.analitza?= analitza>=4.11.5nb1
BUILDLINK_ABI_DEPENDS.analitza?= analitza>=4.11.5nb5
BUILDLINK_PKGSRCDIR.analitza?= ../../math/analitza
.include "../../x11/kdelibs4/buildlink3.mk"

8
math/analitza/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.7 2014/02/01 02:20:48 markd Exp $
$NetBSD: distinfo,v 1.8 2014/11/13 19:24:23 markd Exp $
SHA1 (analitza-4.11.5.tar.xz) = 03ca2ac0b41049a345162c5c6d7dcb7e7018162c
RMD160 (analitza-4.11.5.tar.xz) = bb0c3f1017da474de8c0ab0efa2488a8217cb7aa
Size (analitza-4.11.5.tar.xz) = 181160 bytes
SHA1 (analitza-4.14.3.tar.xz) = 49277482fe8831772ce61657ef0933358ed5639e
RMD160 (analitza-4.14.3.tar.xz) = 5c6281f247afd15fd445d4b8ca15f073ef2e65bd
Size (analitza-4.14.3.tar.xz) = 199964 bytes

4
math/antixls/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.9 2013/05/31 12:41:21 wiz Exp $
# $NetBSD: Makefile,v 1.10 2014/05/29 23:36:52 wiz Exp $
#
DISTNAME= antixls-0.2b
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= math
MASTER_SITES= http://www.af0.net/~dan/
EXTRACT_SUFX= .perl

5
math/arpack/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2012/09/11 23:04:16 asau Exp $
# $NetBSD: Makefile,v 1.3 2014/10/15 22:06:23 joerg Exp $
DISTNAME= arpack96
PKGNAME= arpack-96
@@ -11,6 +11,9 @@ HOMEPAGE= http://www.caam.rice.edu/software/ARPACK/SRC/
COMMENT= Library of subroutines to solve eigenvalue problems
LICENSE= original-bsd
# unsafe library creation
MAKE_JOBS_SAFE= no
WRKSRC= ${WRKDIR}/ARPACK
USE_LANGUAGES= fortran77
MAKE_ENV+= WRKSRC=${WRKSRC}

3
math/blas/Makefile
View File

@@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.32 2014/02/28 09:39:56 adam Exp $
# $NetBSD: Makefile,v 1.33 2014/08/19 13:37:14 joerg Exp $
.include "../../math/lapack/Makefile.common"
PKGNAME= ${DISTNAME:S/lapack/blas/}
PKGREVISION= 1
COMMENT= Basic Linear Algebra Subprograms (Fortran)

24
math/blitz++/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.18 2013/04/06 20:27:24 rodent Exp $
# $NetBSD: Makefile,v 1.20 2014/12/29 01:41:09 obache Exp $
DISTNAME= blitz-0.8
PKGNAME= blitz++-0.8
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= math devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blitz/}
@@ -17,4 +17,24 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-doxygen
INFO_FILES= yes
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:MIntel*)
COMPILER_SPECIFIC_HEADER= intel
.elif !empty(CC_VERSION:MIBM*)
COMPILER_SPECIFIC_HEADER= ibm
.elif !empty(CC_VERSION:MCCC*)
COMPILER_SPECIFIC_HEADER= compaq
.elif !empty(CC_VERSION:Mhp*)
COMPILER_SPECIFIC_HEADER= hp
.elif !empty(CC_VERSION:MMIPSpro*)
COMPILER_SPECIFIC_HEADER= sgi
.elif !empty(CC_VERSION:Mgcc*)
COMPILER_SPECIFIC_HEADER= gnu
.endif
.if defined(COMPILER_SPECIFIC_HEADER)
CONFIGURE_ENV+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER}/bzconfig.h
.endif
PLIST_SUBST+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER:Dinclude/blitz/${COMPILER_SPECIFIC_HEADER}/bzconfig.h:U@comment}
.include "../../mk/bsd.pkg.mk"

3
math/blitz++/PLIST
View File

@@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:05:41 joerg Exp $
@comment $NetBSD: PLIST,v 1.5 2014/12/25 06:27:57 obache Exp $
${COMPILER_SPECIFIC_HEADER}
include/blitz/applics.h
include/blitz/array-impl.h
include/blitz/array-old.h

4
math/calcoo/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.30 2013/10/10 14:42:21 ryoon Exp $
# $NetBSD: Makefile,v 1.31 2014/05/05 00:48:07 ryoon Exp $
#
DISTNAME= calcoo-1.3.18
PKGREVISION= 19
PKGREVISION= 20
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calcoo/}

6
math/cantor/Makefile
View File

@@ -1,18 +1,18 @@
# $NetBSD: Makefile,v 1.21 2014/02/12 23:18:11 tron Exp $
# $NetBSD: Makefile,v 1.26 2014/11/13 19:24:23 markd Exp $
DISTNAME= cantor-${_KDE_VERSION}
PKGREVISION= 1
CATEGORIES= math
COMMENT= KDE frontend to mathematical software
.include "../../meta-pkgs/kde4/Makefile.kde4"
CMAKE_ARGS+= -DWITH_Qalculate=OFF
CMAKE_ARGS+= -DWITH_R=OFF
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../lang/python/application.mk"
.include "../../math/analitza/buildlink3.mk"
.include "../../math/qalculate/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../print/libspectre/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"

25
math/cantor/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:57 markd Exp $
@comment $NetBSD: PLIST,v 1.3 2014/11/13 19:24:23 markd Exp $
bin/cantor
include/cantor/animationresult.h
include/cantor/backend.h
@@ -23,6 +23,7 @@ lib/kde4/cantor_differentiateassistant.so
lib/kde4/cantor_eigenvaluesassistant.so
lib/kde4/cantor_eigenvectorsassistant.so
lib/kde4/cantor_helppanelplugin.so
lib/kde4/cantor_importpackageassistant.so
lib/kde4/cantor_integrateassistant.so
lib/kde4/cantor_invertmatrixassistant.so
lib/kde4/cantor_kalgebrabackend.so
@@ -31,6 +32,9 @@ lib/kde4/cantor_nullbackend.so
lib/kde4/cantor_octavebackend.so
lib/kde4/cantor_plot2dassistant.so
lib/kde4/cantor_plot3dassistant.so
lib/kde4/cantor_python2backend.so
lib/kde4/cantor_qalculatebackend.so
lib/kde4/cantor_qalculateplotassistant.so
lib/kde4/cantor_runscriptassistant.so
lib/kde4/cantor_sagebackend.so
lib/kde4/cantor_scilabbackend.so
@@ -41,6 +45,7 @@ lib/libcantor_config.so
lib/libcantorlibs.so
lib/libcantorlibs.so.0.0.4
lib/libcantorlibs.so.1
share/appdata/cantor.appdata.xml
share/applications/kde4/cantor.desktop
share/doc/kde/HTML/en/cantor/common
share/doc/kde/HTML/en/cantor/index.cache.bz2
@@ -50,8 +55,10 @@ share/doc/kde/HTML/en/cantor/screenshot.png
share/icons/hicolor/16x16/apps/cantor.png
share/icons/hicolor/32x32/apps/cantor.png
share/icons/hicolor/48x48/apps/cantor.png
share/icons/hicolor/48x48/apps/luabackend.png
share/icons/hicolor/48x48/apps/maximabackend.png
share/icons/hicolor/48x48/apps/octavebackend.png
share/icons/hicolor/48x48/apps/pythonbackend.png
share/icons/hicolor/48x48/apps/qalculatebackend.png
share/icons/hicolor/48x48/apps/rbackend.png
share/icons/hicolor/48x48/apps/sagebackend.png
@@ -61,11 +68,13 @@ share/kde/apps/cantor/cantor_create_matrix_assistant.rc
share/kde/apps/cantor/cantor_differentiate_assistant.rc
share/kde/apps/cantor/cantor_eigenvalues_assistant.rc
share/kde/apps/cantor/cantor_eigenvectors_assistant.rc
share/kde/apps/cantor/cantor_import_package_assistant.rc
share/kde/apps/cantor/cantor_integrate_assistant.rc
share/kde/apps/cantor/cantor_invert_matrix_assistant.rc
share/kde/apps/cantor/cantor_part.rc
share/kde/apps/cantor/cantor_plot2d_assistant.rc
share/kde/apps/cantor/cantor_plot3d_assistant.rc
share/kde/apps/cantor/cantor_qalculateplotassistant.rc
share/kde/apps/cantor/cantor_runscript_assistant.rc
share/kde/apps/cantor/cantor_scripteditor.rc
share/kde/apps/cantor/cantor_shell.rc
@@ -76,19 +85,27 @@ share/kde/apps/cantor/octavebackend/cantor_eigenvectors.m
share/kde/apps/cantor/octavebackend/cantor_plot2d.m
share/kde/apps/cantor/octavebackend/cantor_plot3d.m
share/kde/apps/cantor/octavebackend/cantor_print.m
share/kde/apps/cantor/python2backend/keywords.xml
share/kde/apps/cantor/sagebackend/keywords.xml
share/kde/apps/cantor/scilabbackend/keywords.xml
share/kde/apps/cantor/xslt/latex.xsl
share/kde/config.kcfg/cantor.kcfg
share/kde/config.kcfg/cantor_libs.kcfg
share/kde/config.kcfg/kalgebrabackend.kcfg
share/kde/config.kcfg/maximabackend.kcfg
share/kde/config.kcfg/octavebackend.kcfg
share/kde/config.kcfg/python2backend.kcfg
share/kde/config.kcfg/qalculatebackend.kcfg
share/kde/config.kcfg/sagebackend.kcfg
share/kde/config.kcfg/scilabbackend.kcfg
share/kde/config/cantor.knsrc
share/kde/config/cantor_kalgebra.knsrc
share/kde/config/cantor_lua.knsrc
share/kde/config/cantor_maxima.knsrc
share/kde/config/cantor_octave.knsrc
share/kde/config/cantor_python2.knsrc
share/kde/config/cantor_qalculate.knsrc
share/kde/config/cantor_sage.knsrc
share/kde/config/cantor_scilab.knsrc
share/kde4/services/cantor/advancedplotassistant.desktop
share/kde4/services/cantor/cantor_part.desktop
share/kde4/services/cantor/creatematrixassistant.desktop
@@ -96,6 +113,7 @@ share/kde4/services/cantor/differentiateassistant.desktop
share/kde4/services/cantor/eigenvaluesassistant.desktop
share/kde4/services/cantor/eigenvectorsassistant.desktop
share/kde4/services/cantor/helppanelplugin.desktop
share/kde4/services/cantor/importpackageassistant.desktop
share/kde4/services/cantor/integrateassistant.desktop
share/kde4/services/cantor/invertmatrixassistant.desktop
share/kde4/services/cantor/kalgebrabackend.desktop
@@ -104,6 +122,9 @@ share/kde4/services/cantor/nullbackend.desktop
share/kde4/services/cantor/octavebackend.desktop
share/kde4/services/cantor/plot2dassistant.desktop
share/kde4/services/cantor/plot3dassistant.desktop
share/kde4/services/cantor/python2backend.desktop
share/kde4/services/cantor/qalculatebackend.desktop
share/kde4/services/cantor/qalculateplotassistant.desktop
share/kde4/services/cantor/runscriptassistant.desktop
share/kde4/services/cantor/sagebackend.desktop
share/kde4/services/cantor/scilabbackend.desktop

8
math/cantor/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.7 2014/02/01 02:20:48 markd Exp $
$NetBSD: distinfo,v 1.8 2014/11/13 19:24:23 markd Exp $
SHA1 (cantor-4.11.5.tar.xz) = f6774e335cdf8257ce19ba2708d87cd83d95f768
RMD160 (cantor-4.11.5.tar.xz) = c7a54571d88f2accc8288148dc1a95daa083ccbb
Size (cantor-4.11.5.tar.xz) = 302036 bytes
SHA1 (cantor-4.14.3.tar.xz) = e4df7b28c77a094930d695bd5bf15333f2f202f4
RMD160 (cantor-4.14.3.tar.xz) = eb7e59e11c2d7582110f392f29d62391940d5c2d
Size (cantor-4.14.3.tar.xz) = 342140 bytes

8
math/cgal/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.23 2014/02/12 23:18:11 tron Exp $
# $NetBSD: Makefile,v 1.26 2015/03/31 15:48:32 joerg Exp $
PKGNAME= cgal-3.9
DISTNAME= CGAL-3.9
PKGREVISION= 21
PKGREVISION= 23
CATEGORIES= math
MASTER_SITES= https://gforge.inria.fr/frs/download.php/29125/
@@ -14,8 +14,8 @@ LICENSE= gnu-lgpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++
post-patch:
cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig
pre-install:
cd ${WRKSRC} && rm -f include/CGAL/Mesh_2/Do_not_refine_edges.h.orig include/CGAL/config.h.orig
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"

4
math/cgal/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.19 2014/02/12 23:18:11 tron Exp $
# $NetBSD: buildlink3.mk,v 1.21 2014/11/07 19:39:25 adam Exp $
BUILDLINK_TREE+= cgal
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cgal
CGAL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cgal+= cgal>=3.9
BUILDLINK_ABI_DEPENDS.cgal+= cgal>=3.9nb21
BUILDLINK_ABI_DEPENDS.cgal+= cgal>=3.9nb23
BUILDLINK_PKGSRCDIR.cgal?= ../../math/cgal
.include "../../devel/boost-headers/buildlink3.mk"

3
math/cgal/distinfo
View File

@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.2 2014/02/08 12:16:12 wiedi Exp $
$NetBSD: distinfo,v 1.3 2015/03/31 15:48:32 joerg Exp $
SHA1 (CGAL-3.9.tar.gz) = cc99fad7116f221b6301326834f71ff65cebf2eb
RMD160 (CGAL-3.9.tar.gz) = 0a5a929ecedeeac3833ec90f802b7f5ac069ad47
Size (CGAL-3.9.tar.gz) = 14276059 bytes
SHA1 (patch-include_CGAL_Mesh__2_Do__not__refine__edges.h) = 5a66b2ff56d3e20e554ab73829e3c8c735144489
SHA1 (patch-include_CGAL_config.h) = ba29667305fc4868a9995048801408e95d75bd41
SHA1 (patch-manpage-installation) = c664f64ccc9507871c1ada46b983f0d006b13fe6

20
math/cgal/patches/patch-include_CGAL_config.h Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-include_CGAL_config.h,v 1.1 2015/03/31 15:48:32 joerg Exp $
--- include/CGAL/config.h.orig 2015-03-27 19:26:56.000000000 +0000
+++ include/CGAL/config.h
@@ -109,6 +109,15 @@
# else
# error Unknown endianness
# endif
+#elif defined(__NetBSD__)
+# include <sys/endian.h>
+# if _BYTE_ORDER == _LITTLE_ENDIAN
+# define CGAL_LITTLE_ENDIAN
+# elif _BYTE_ORDER == _BIG_ENDIAN
+# define CGAL_BIG_ENDIAN
+# else
+# error Unknown endianness
+# endif
#elif defined(__sparc) || defined(__sparc__) \
|| defined(_POWER) || defined(__powerpc__) \
|| defined(__ppc__) || defined(__hppa) \

6
math/clisp-pari/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2013/10/20 18:02:58 joerg Exp $
# $NetBSD: Makefile,v 1.8 2014/12/11 22:12:33 joerg Exp $
#
CLISP_MODULE= pari
@@ -18,9 +18,9 @@ MAKE_JOBS_SAFE= no
.include "../../math/pari/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
ac_cv_libpari_libs= -l${PARI_LIB}
ac_cv_libpari_libs= -L${BUILDLINK_PREFIX.pari}/lib -l${PARI_LIB}
.if ${PARI_LIB} == "pari-gmp"
ac_cv_libpari_libs+= -lgmp
ac_cv_libpari_libs+= -L${BUILDLINK_PREFIX.gmp}/lib -lgmp
.endif
CONFIGURE_ENV+= "ac_cv_libpari_libs=${ac_cv_libpari_libs} ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"

3
math/cln/distinfo
View File

@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.11 2013/05/04 12:59:47 joerg Exp $
$NetBSD: distinfo,v 1.13 2015/02/07 20:18:39 jdc Exp $
SHA1 (cln-1.3.2.tar.bz2) = c30dca80e75f45e2107f233075e6d0339ea884b0
RMD160 (cln-1.3.2.tar.bz2) = 8644a278e99c3e15ebf83f5e641758bdecad8b23
Size (cln-1.3.2.tar.bz2) = 1275638 bytes
SHA1 (patch-include_cln_exception.h) = 2d7ec63ee174793ad69ae3b54599f1c347b20c9f
SHA1 (patch-include_cln_types.h) = 2e685a55babc03756ff2c170ad23b86c8888f7dc

31
math/cln/patches/patch-include_cln_types.h Normal file
View File

@@ -0,0 +1,31 @@
$NetBSD: patch-include_cln_types.h,v 1.2 2015/02/07 20:18:06 jdc Exp $
--- include/cln/types.h.orig 2009-06-14 20:49:32.000000000 +0100
+++ include/cln/types.h 2015-02-07 20:03:43.000000000 +0000
@@ -76,7 +76,7 @@
// Integer type used for counters.
// Constraint: sizeof(uintC) >= sizeof(uintL)
- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)))
+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__sparc64__)))
#define intCsize long_bitsize
typedef long sintC;
typedef unsigned long uintC;
@@ -88,7 +88,7 @@
// Integer type used for lfloat exponents.
// Constraint: sizeof(uintE) >= sizeof(uintC)
-#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__)))
+#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__) || defined(__sparc64__)))
#define intEsize 64
typedef sint64 sintE;
typedef uint64 uintE;
@@ -127,7 +127,7 @@
typedef int sintD;
typedef unsigned int uintD;
#else // we are not using GMP, so just guess something reasonable
- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)))
+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) || defined(__sparc64__)))
#define intDsize 64
typedef sint64 sintD;
typedef uint64 uintD;

5
math/cloog/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.6 2013/02/20 21:36:52 wiz Exp $
# $NetBSD: Makefile,v 1.7 2014/04/25 21:01:27 wiz Exp $
DISTNAME= cloog-0.18.0
PKGREVISION= 1
DISTNAME= cloog-0.18.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/infrastructure/}

4
math/cloog/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2013/02/17 22:17:41 wiz Exp $
@comment $NetBSD: PLIST,v 1.5 2014/04/25 21:01:27 wiz Exp $
bin/cloog
include/cloog/block.h
include/cloog/clast.h
@@ -23,5 +23,7 @@ include/cloog/statement.h
include/cloog/stride.h
include/cloog/union_domain.h
include/cloog/version.h
lib/cloog-isl/cloog-isl-config.cmake
lib/isl/isl-config.cmake
lib/libcloog-isl.la
lib/pkgconfig/cloog-isl.pc

11
math/cloog/distinfo
View File

@@ -1,6 +1,9 @@
$NetBSD: distinfo,v 1.4 2013/02/20 21:37:13 wiz Exp $
$NetBSD: distinfo,v 1.5 2014/04/25 21:01:27 wiz Exp $
SHA1 (cloog-0.18.0.tar.gz) = 85f620a26aabf6a934c44ca40a9799af0952f863
RMD160 (cloog-0.18.0.tar.gz) = abe274a5ff95c8a08e73c58e5d891a804d057ece
Size (cloog-0.18.0.tar.gz) = 3776262 bytes
SHA1 (cloog-0.18.1.tar.gz) = 2dc70313e8e2c6610b856d627bce9c9c3f848077
RMD160 (cloog-0.18.1.tar.gz) = 5c4a182efc0d42e7d5c30e6fcca5832776a2e69a
Size (cloog-0.18.1.tar.gz) = 3857324 bytes
SHA1 (patch-include_cloog_isl_constraintset.h) = ec640f64d8b40038abeff65122363bcd5aeb2e58
SHA1 (patch-source_isl_constraints.c) = 377d1662787e389e00816fe42e529a26d28a7928
SHA1 (patch-source_isl_domain.c) = 8afc17ec42ca25b702cfff644f5a5d3ae36d0419
SHA1 (patch-test_checker.sh) = a62a4fba0f433e6c6685f2d7a92f0cb039a1d1f0

28
math/cloog/patches/patch-include_cloog_isl_constraintset.h Normal file
View File

@@ -0,0 +1,28 @@
$NetBSD: patch-include_cloog_isl_constraintset.h,v 1.1 2014/04/25 21:01:27 wiz Exp $
From: Taj Muhammad Khan <taj.khan@lri.fr>
Date: Thu, 5 Dec 2013 02:25:16 +0000 (+0530)
Subject: Use isl_val instead of isl_int
X-Git-Url: http://repo.or.cz/w/cloog.git/commitdiff_plain/2d8b7c6b43ee46fee978a57fa6877de49675f357?hp=d02b7193c157b61ddeabae55718793c078d73961
Use isl_val instead of isl_int
isl is moving from the macro-based isl_int to a more generic
integer type isl_val, so CLooG does with this patch.
Authors are Uday Bondhugula, Taj Muhammad Khan and Cedric Bastoul.
--- include/cloog/isl/constraintset.h.orig 2013-10-11 07:27:03.000000000 +0000
+++ include/cloog/isl/constraintset.h
@@ -27,6 +27,12 @@ CloogConstraintSet *cloog_constraint_set
CloogConstraint *cloog_constraint_from_isl_constraint(struct isl_constraint *constraint);
isl_constraint *cloog_constraint_to_isl(CloogConstraint *constraint);
+__isl_give isl_val *cloog_int_to_isl_val(isl_ctx* ctx, cloog_int_t c);
+void isl_val_to_cloog_int(__isl_keep isl_val *val, cloog_int_t *cint);
+
+__isl_give isl_val *cloog_constraint_coefficient_get_val(CloogConstraint *constraint,
+ int var);
+
#if defined(__cplusplus)
}
#endif

443
math/cloog/patches/patch-source_isl_constraints.c Normal file
View File

@@ -0,0 +1,443 @@
$NetBSD: patch-source_isl_constraints.c,v 1.1 2014/04/25 21:01:27 wiz Exp $
From: Taj Muhammad Khan <taj.khan@lri.fr>
Date: Thu, 5 Dec 2013 02:25:16 +0000 (+0530)
Subject: Use isl_val instead of isl_int
X-Git-Url: http://repo.or.cz/w/cloog.git/commitdiff_plain/2d8b7c6b43ee46fee978a57fa6877de49675f357?hp=d02b7193c157b61ddeabae55718793c078d73961
Use isl_val instead of isl_int
isl is moving from the macro-based isl_int to a more generic
integer type isl_val, so CLooG does with this patch.
Authors are Uday Bondhugula, Taj Muhammad Khan and Cedric Bastoul.
--- source/isl/constraints.c.orig 2013-10-11 07:27:03.000000000 +0000
+++ source/isl/constraints.c
@@ -5,11 +5,51 @@
#include <cloog/isl/backend.h>
#include <isl/aff.h>
#include <isl/set.h>
+#include <isl/val.h>
+#include <isl/val_gmp.h>
#define ALLOC(type) (type*)malloc(sizeof(type))
#define ALLOCN(type,n) (type*)malloc((n)*sizeof(type))
+__isl_give isl_val *cloog_int_to_isl_val(isl_ctx* ctx, cloog_int_t c)
+{
+ isl_val *v;
+#if defined(CLOOG_INT_INT)
+ v = isl_val_int_from_si(ctx, c);
+#elif defined(CLOOG_INT_LONG)
+ v = isl_val_int_from_si(ctx, c);
+#elif defined(CLOOG_INT_LONG_LONG)
+ v = isl_val_int_from_si(ctx, c);
+#elif defined(CLOOG_INT_GMP)
+ v = isl_val_int_from_gmp(ctx, c);
+#else
+#error "No integer type defined"
+#endif
+ return v;
+}
+
+/*
+ * CLooG'll be dealing in integers so we expect numerator/1 form
+ * from isl_val. Thus get numerator to assign to cloog_int
+ */
+void isl_val_to_cloog_int(__isl_keep isl_val *val, cloog_int_t *cint)
+{
+ assert(isl_val_is_int(val));
+#if defined(CLOOG_INT_INT)
+ *cint = isl_val_get_num_si(val);
+#elif defined(CLOOG_INT_LONG)
+ *cint = isl_val_get_num_si(val);
+#elif defined(CLOOG_INT_LONG_LONG)
+ *cint = isl_val_get_num_si(val);
+#elif defined(CLOOG_INT_GMP)
+ isl_val_get_num_gmp(val, *cint);
+#else
+#error "No integer type defined"
+#endif
+}
+
+
CloogConstraintSet *cloog_constraint_set_from_isl_basic_set(struct isl_basic_set *bset)
{
return (CloogConstraintSet *)bset;
@@ -266,53 +306,65 @@ int cloog_equal_count(CloogEqualities *e
static int cloog_constraint_equal_type(CloogConstraint *cc, int level)
{
int i;
- isl_int c;
+ isl_val *c;
int type = EQTYPE_NONE;
struct isl_constraint *constraint = cloog_constraint_to_isl(cc);
- isl_int_init(c);
- isl_constraint_get_constant(constraint, &c);
- if (!isl_int_is_zero(c))
+ c = isl_constraint_get_constant_val(constraint);
+ if (!isl_val_is_zero(c))
type = EQTYPE_CONSTANT;
- isl_constraint_get_coefficient(constraint, isl_dim_set, level - 1, &c);
- if (!isl_int_is_one(c) && !isl_int_is_negone(c))
+ isl_val_free(c);
+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_set, level - 1);
+ if (!isl_val_is_one(c) && !isl_val_is_negone(c))
type = EQTYPE_EXAFFINE;
+ isl_val_free(c);
for (i = 0; i < isl_constraint_dim(constraint, isl_dim_param); ++i) {
- isl_constraint_get_coefficient(constraint, isl_dim_param, i, &c);
- if (isl_int_is_zero(c))
+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_param, i);
+ if (isl_val_is_zero(c)){
+ isl_val_free(c);
continue;
- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
+ }
+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
type != EQTYPE_NONE) {
type = EQTYPE_EXAFFINE;
+ isl_val_free(c);
break;
}
type = EQTYPE_PUREITEM;
+ isl_val_free(c);
}
for (i = 0; i < isl_constraint_dim(constraint, isl_dim_set); ++i) {
if (i == level - 1)
continue;
- isl_constraint_get_coefficient(constraint, isl_dim_set, i, &c);
- if (isl_int_is_zero(c))
+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_set, i);
+ if (isl_val_is_zero(c)){
+ isl_val_free(c);
continue;
- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
+ }
+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
type != EQTYPE_NONE) {
type = EQTYPE_EXAFFINE;
+ isl_val_free(c);
break;
}
type = EQTYPE_PUREITEM;
+ isl_val_free(c);
}
for (i = 0; i < isl_constraint_dim(constraint, isl_dim_div); ++i) {
- isl_constraint_get_coefficient(constraint, isl_dim_div, i, &c);
- if (isl_int_is_zero(c))
+ c = isl_constraint_get_coefficient_val(constraint, isl_dim_div, i);
+ if (isl_val_is_zero(c)){
+ isl_val_free(c);
continue;
- if ((!isl_int_is_one(c) && !isl_int_is_negone(c)) ||
+ }
+ if ((!isl_val_is_one(c) && !isl_val_is_negone(c)) ||
type != EQTYPE_NONE) {
type = EQTYPE_EXAFFINE;
+ isl_val_free(c);
break;
}
type = EQTYPE_PUREITEM;
+ isl_val_free(c);
}
- isl_int_clear(c);
if (type == EQTYPE_NONE)
type = EQTYPE_CONSTANT;
@@ -447,27 +499,31 @@ static struct clast_expr *div_expr(Cloog
{
int i, nb_elts;
unsigned dim = cloog_constraint_total_dimension(constraint);
- cloog_int_t c;
+ isl_val *c;
struct clast_reduction *r;
struct clast_expr *e = NULL;
isl_aff *div;
+ cloog_int_t cint;
+ cloog_int_init(cint);
div = isl_constraint_get_div(cloog_constraint_to_isl(constraint), pos);
- cloog_int_init(c);
for (i = 0, nb_elts = 0; i < dim; ++i) {
struct cloog_isl_dim dim;
dim = constraint_cloog_dim_to_isl_dim(constraint, i);
if (dim.type == isl_dim_set)
dim.type = isl_dim_in;
- isl_aff_get_coefficient(div, dim.type, dim.pos, &c);
- if (!cloog_int_is_zero(c))
+ c = isl_aff_get_coefficient_val(div, dim.type, dim.pos);
+ if (!isl_val_is_zero(c))
++nb_elts;
+
+ isl_val_free(c);
}
- isl_aff_get_constant(div, &c);
- if (!cloog_int_is_zero(c))
+ c = isl_aff_get_constant_val(div);
+ if (!isl_val_is_zero(c))
++nb_elts;
+ isl_val_free(c);
r = new_clast_reduction(clast_red_sum, nb_elts);
for (i = 0, nb_elts = 0; i < dim; ++i) {
@@ -477,22 +533,35 @@ static struct clast_expr *div_expr(Cloog
dim = constraint_cloog_dim_to_isl_dim(constraint, i);
if (dim.type == isl_dim_set)
dim.type = isl_dim_in;
- isl_aff_get_coefficient(div, dim.type, dim.pos, &c);
- if (cloog_int_is_zero(c))
+ c = isl_aff_get_coefficient_val(div, dim.type, dim.pos);
+ if (isl_val_is_zero(c)){
+ isl_val_free(c);
continue;
+ }
v = cloog_constraint_variable_expr(constraint, 1 + i, names);
- r->elts[nb_elts++] = &new_clast_term(c, v)->expr;
+ /* We are interested only in the numerator */
+ cloog_int_set_si(cint, isl_val_get_num_si(c));
+ r->elts[nb_elts++] = &new_clast_term(cint, v)->expr;
+
+ isl_val_free(c);
}
- isl_aff_get_constant(div, &c);
- if (!cloog_int_is_zero(c))
- r->elts[nb_elts++] = &new_clast_term(c, NULL)->expr;
- isl_aff_get_denominator(div, &c);
- e = &new_clast_binary(clast_bin_fdiv, &r->expr, c)->expr;
+ c = isl_aff_get_constant_val(div);
+ if (!isl_val_is_zero(c)) {
+ /* We are interested only in the numerator */
+ cloog_int_set_si(cint, isl_val_get_num_si(c));
+ r->elts[nb_elts++] = &new_clast_term(cint, NULL)->expr;
+ }
+ isl_val_free(c);
- cloog_int_clear(c);
+ c = isl_aff_get_denominator_val(div);
+ isl_val_to_cloog_int(c, &cint);
+ isl_val_free(c);
+ e = &new_clast_binary(clast_bin_fdiv, &r->expr, cint)->expr;
+
+ cloog_int_clear(cint);
isl_aff_free(div);
@@ -529,37 +598,34 @@ struct clast_expr *cloog_constraint_vari
*/
int cloog_constraint_involves(CloogConstraint *constraint, int v)
{
- isl_int c;
+ isl_val *c;
int res;
- isl_int_init(c);
- cloog_constraint_coefficient_get(constraint, v, &c);
- res = !isl_int_is_zero(c);
- isl_int_clear(c);
+ c = cloog_constraint_coefficient_get_val(constraint, v);
+ res = !isl_val_is_zero(c);
+ isl_val_free(c);
return res;
}
int cloog_constraint_is_lower_bound(CloogConstraint *constraint, int v)
{
- isl_int c;
+ isl_val *c;
int res;
- isl_int_init(c);
- cloog_constraint_coefficient_get(constraint, v, &c);
- res = isl_int_is_pos(c);
- isl_int_clear(c);
+ c = cloog_constraint_coefficient_get_val(constraint, v);
+ res = isl_val_is_pos(c);
+ isl_val_free(c);
return res;
}
int cloog_constraint_is_upper_bound(CloogConstraint *constraint, int v)
{
- isl_int c;
+ isl_val *c;
int res;
- isl_int_init(c);
- cloog_constraint_coefficient_get(constraint, v, &c);
- res = isl_int_is_neg(c);
- isl_int_clear(c);
+ c = cloog_constraint_coefficient_get_val(constraint, v);
+ res = isl_val_is_neg(c);
+ isl_val_free(c);
return res;
}
@@ -585,15 +651,37 @@ void cloog_constraint_coefficient_get(Cl
{
struct cloog_isl_dim dim;
isl_constraint *c;
+ isl_val *ival;
if (!constraint)
- return;
+ val = NULL;
dim = constraint_cloog_dim_to_isl_dim(constraint, var);
c = cloog_constraint_to_isl(constraint);
- isl_constraint_get_coefficient(c, dim.type, dim.pos, val);
+ ival = isl_constraint_get_coefficient_val(c, dim.type, dim.pos);
+
+ isl_val_to_cloog_int(ival, val);
+ isl_val_free(ival);
}
+isl_val *cloog_constraint_coefficient_get_val(CloogConstraint *constraint,
+ int var)
+{
+ struct cloog_isl_dim dim;
+ isl_constraint *c;
+ isl_val *val;
+
+ if (!constraint)
+ return NULL;
+
+ dim = constraint_cloog_dim_to_isl_dim(constraint, var);
+ c = cloog_constraint_to_isl(constraint);
+ val = isl_constraint_get_coefficient_val(c, dim.type, dim.pos);
+ return val;
+}
+
+
+
void cloog_constraint_coefficient_set(CloogConstraint *constraint,
int var, cloog_int_t val)
{
@@ -604,14 +692,26 @@ void cloog_constraint_coefficient_set(Cl
dim = constraint_cloog_dim_to_isl_dim(constraint, var);
c = cloog_constraint_to_isl(constraint);
- isl_constraint_set_coefficient(c, dim.type, dim.pos, val);
+ isl_constraint_set_coefficient_val(c, dim.type, dim.pos,
+ cloog_int_to_isl_val(isl_constraint_get_ctx(c), val));
}
void cloog_constraint_constant_get(CloogConstraint *constraint, cloog_int_t *val)
{
- isl_constraint_get_constant(cloog_constraint_to_isl(constraint), val);
+ isl_val *ival;
+ ival = isl_constraint_get_constant_val(cloog_constraint_to_isl(constraint));
+ isl_val_to_cloog_int(ival, val);
+ isl_val_free(ival);
}
+
+__isl_give isl_val *cloog_constraint_constant_get_val(CloogConstraint *constraint)
+{
+ return isl_constraint_get_constant_val(cloog_constraint_to_isl(constraint));
+}
+
+
+
/**
* Copy the coefficient of constraint c into dst in PolyLib order,
* i.e., first the coefficients of the variables, then the coefficients
@@ -700,15 +800,11 @@ CloogConstraintSet *cloog_constraint_set
static int add_constant_term(CloogConstraint *c, void *user)
{
- isl_int *bound = (isl_int *)user;
- isl_int v;
-
- isl_int_init(v);
+ isl_val **bound = (isl_val **)user;
+ isl_val *v;
- cloog_constraint_constant_get(c, &v);
- isl_int_add(*bound, *bound, v);
-
- isl_int_clear(v);
+ v = cloog_constraint_constant_get_val(c);
+ *bound = isl_val_add(*bound, v);
return 0;
}
@@ -822,11 +918,14 @@ CloogConstraintSet *cloog_constraint_set
c = isl_constraint_set_coefficient_si(c, isl_dim_set, dim.pos, -1);
bset = isl_basic_set_add_constraint(bset, c);
- isl_int_set_si(*bound, 0);
+ cloog_int_set_si(*bound, 0);
+ isl_val *v = cloog_int_to_isl_val(isl_basic_set_get_ctx(bset), *bound);
constraints = cloog_constraint_set_from_isl_basic_set(bset);
cloog_constraint_set_foreach_constraint(constraints,
- add_constant_term, bound);
+ add_constant_term, &v);
+ isl_val_to_cloog_int(v, bound); //return the value to bound
+ isl_val_free(v);
isl_basic_set_free(orig);
return cloog_constraint_set_from_isl_basic_set(bset);
}
@@ -896,31 +995,27 @@ static isl_aff *extract_stride_offset(__
isl_space *dim = isl_constraint_get_space(c);
isl_local_space *ls = isl_local_space_from_space(dim);
isl_aff *offset = isl_aff_zero_on_domain(ls);
- isl_int u;
+ isl_val *u;
unsigned nparam, nvar;
- isl_int_init(u);
-
nparam = isl_constraint_dim(c, isl_dim_param);
nvar = isl_constraint_dim(c, isl_dim_set);
for (i = 0; i < nparam; ++i) {
- isl_constraint_get_coefficient(c, isl_dim_param, i, &u);
- isl_int_mul(u, u, stride->factor);
- offset = isl_aff_set_coefficient(offset, isl_dim_param, i, u);
+ u = isl_constraint_get_coefficient_val(c, isl_dim_param, i);
+ u = isl_val_mul(u, cloog_int_to_isl_val(isl_constraint_get_ctx(c), stride->factor));
+ offset = isl_aff_set_coefficient_val(offset, isl_dim_param, i, u);
}
for (i = 0; i < nvar; ++i) {
if (i == level - 1)
continue;
- isl_constraint_get_coefficient(c, isl_dim_set, i, &u);
- isl_int_mul(u, u, stride->factor);
- offset = isl_aff_set_coefficient(offset, isl_dim_in, i, u);
- }
- isl_constraint_get_constant(c, &u);
- isl_int_mul(u, u, stride->factor);
- offset = isl_aff_set_constant(offset, u);
-
- isl_int_clear(u);
+ u = isl_constraint_get_coefficient_val(c, isl_dim_set, i);
+ u = isl_val_mul(u, cloog_int_to_isl_val(isl_constraint_get_ctx(c), stride->factor));
+ offset = isl_aff_set_coefficient_val(offset, isl_dim_in, i, u);
+ }
+ u = isl_constraint_get_constant_val(c);
+ u = isl_val_mul(u, cloog_int_to_isl_val(isl_constraint_get_ctx(c), stride->factor));
+ offset = isl_aff_set_constant_val(offset, u);
return offset;
}
@@ -953,9 +1048,9 @@ CloogConstraint *cloog_constraint_stride
offset = extract_stride_offset(stride_c, level, stride);
lower = isl_aff_sub(lower, isl_aff_copy(offset));
- lower = isl_aff_scale_down(lower, stride->stride);
+ lower = isl_aff_scale_down_val(lower, cloog_int_to_isl_val(isl_constraint_get_ctx(stride_c), stride->stride));
lower = isl_aff_ceil(lower);
- lower = isl_aff_scale(lower, stride->stride);
+ lower = isl_aff_scale_val(lower, cloog_int_to_isl_val(isl_constraint_get_ctx(stride_c), stride->stride));
lower = isl_aff_add(lower, offset);
lower = isl_aff_neg(lower);
lower = isl_aff_add_coefficient_si(lower, isl_dim_in, level - 1, 1);

634
math/cloog/patches/patch-source_isl_domain.c Normal file
View File

@@ -0,0 +1,634 @@
$NetBSD: patch-source_isl_domain.c,v 1.1 2014/04/25 21:01:27 wiz Exp $
From: Taj Muhammad Khan <taj.khan@lri.fr>
Date: Thu, 5 Dec 2013 02:25:16 +0000 (+0530)
Subject: Use isl_val instead of isl_int
X-Git-Url: http://repo.or.cz/w/cloog.git/commitdiff_plain/2d8b7c6b43ee46fee978a57fa6877de49675f357?hp=d02b7193c157b61ddeabae55718793c078d73961
Use isl_val instead of isl_int
isl is moving from the macro-based isl_int to a more generic
integer type isl_val, so CLooG does with this patch.
Authors are Uday Bondhugula, Taj Muhammad Khan and Cedric Bastoul.
--- source/isl/domain.c.orig 2013-10-11 07:27:03.000000000 +0000
+++ source/isl/domain.c
@@ -7,7 +7,11 @@
#include <isl/list.h>
#include <isl/constraint.h>
#include <isl/ilp.h>
+#include <isl/lp.h>
#include <isl/aff.h>
+#include <isl/map.h>
+#include <isl/val.h>
+#include <isl/val_gmp.h>
#ifdef OSL_SUPPORT
#include <osl/macros.h>
@@ -510,15 +514,18 @@ static struct isl_constraint *isl_constr
else
constraint = isl_inequality_alloc(ls);
- for (j = 0; j < nvariables; ++j)
- isl_constraint_set_coefficient(constraint, isl_dim_out, j,
- row[1 + j]);
-
- for (j = 0; j < nparam; ++j)
- isl_constraint_set_coefficient(constraint, isl_dim_param, j,
- row[1 + nvariables + j]);
+ for (j = 0; j < nvariables; ++j) {
+ isl_val *val = cloog_int_to_isl_val(isl_constraint_get_ctx(constraint), row[1 + j]);
+ isl_constraint_set_coefficient_val(constraint, isl_dim_out, j, val);
+ }
+
+ for (j = 0; j < nparam; ++j) {
+ isl_val *val = cloog_int_to_isl_val(isl_constraint_get_ctx(constraint), row[1 + nvariables + j]);
+ isl_constraint_set_coefficient_val(constraint, isl_dim_param, j, val);
+ }
- isl_constraint_set_constant(constraint, row[1 + nvariables + nparam]);
+ isl_val *val = cloog_int_to_isl_val(isl_constraint_get_ctx(constraint), row[1 + nvariables + nparam]);
+ isl_constraint_set_constant_val(constraint, val);
return constraint;
}
@@ -631,7 +638,6 @@ CloogDomain *cloog_domain_from_osl_relat
return domain;
}
-
/**
* Converts an openscop scattering relation to a CLooG scattering.
* \param[in,out] state CLooG state.
@@ -779,10 +785,22 @@ int cloog_domain_is_otl(CloogDomain *dom
void cloog_domain_stride(CloogDomain *domain, int strided_level,
cloog_int_t *stride, cloog_int_t *offset)
{
+ int ret = -1;
isl_set *set = isl_set_from_cloog_domain(domain);
- isl_set_dim_residue_class(set, strided_level - 1, stride, offset);
- if (!isl_int_is_zero(*offset))
- isl_int_sub(*offset, *stride, *offset);
+ isl_val *stride_val = NULL;
+ isl_val *offset_val = NULL;
+ ret = isl_set_dim_residue_class_val(set, strided_level - 1, &stride_val, &offset_val);
+ if (ret != 0)
+ cloog_die("failure to compute stride.\n");
+ isl_val_to_cloog_int(stride_val, stride);
+ isl_val_to_cloog_int(offset_val, offset);
+
+ if (!cloog_int_is_zero(*offset))
+ cloog_int_sub(*offset, *stride, *offset);
+
+ isl_val_free(stride_val);
+ isl_val_free(offset_val);
+
return;
}
@@ -796,7 +814,7 @@ static int constraint_can_stride(__isl_t
{
struct cloog_can_stride *ccs = (struct cloog_can_stride *)user;
int i;
- isl_int v;
+ isl_val *v;
unsigned n_div;
if (isl_constraint_is_equality(c)) {
@@ -804,21 +822,22 @@ static int constraint_can_stride(__isl_t
return 0;
}
- isl_int_init(v);
- isl_constraint_get_coefficient(c, isl_dim_set, ccs->level - 1, &v);
- if (isl_int_is_pos(v)) {
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, ccs->level - 1);
+ if (isl_val_is_pos(v)) {
n_div = isl_constraint_dim(c, isl_dim_div);
+
for (i = 0; i < n_div; ++i) {
- isl_constraint_get_coefficient(c, isl_dim_div, i, &v);
- if (!isl_int_is_zero(v))
+ isl_val_free(v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_div, i);
+ if (!isl_val_is_zero(v))
break;
}
if (i < n_div)
ccs->can_stride = 0;
}
- isl_int_clear(v);
- isl_constraint_free(c);
+ isl_val_free(v);
+ isl_constraint_free(c);
return 0;
}
@@ -903,7 +922,7 @@ struct cloog_stride_lower {
static int constraint_stride_lower(__isl_take isl_constraint *c, void *user)
{
struct cloog_stride_lower *csl = (struct cloog_stride_lower *)user;
- isl_int v;
+ isl_val *v;
isl_constraint *bound;
isl_aff *b;
@@ -912,31 +931,31 @@ static int constraint_stride_lower(__isl
return 0;
}
- isl_int_init(v);
- isl_constraint_get_coefficient(c, isl_dim_set, csl->level - 1, &v);
- if (!isl_int_is_pos(v)) {
- isl_int_clear(v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, csl->level - 1);
+ if (!isl_val_is_pos(v)) {
+ isl_val_free(v);
isl_constraint_free(c);
return 0;
}
+ isl_val_free(v);
b = isl_constraint_get_bound(c, isl_dim_set, csl->level - 1);
b = isl_aff_neg(b);
- b = isl_aff_add_constant(b, csl->stride->offset);
- b = isl_aff_scale_down(b, csl->stride->stride);
+ b = isl_aff_add_constant_val(b, cloog_int_to_isl_val(isl_constraint_get_ctx(c), csl->stride->offset));
+ b = isl_aff_scale_down_val(b, cloog_int_to_isl_val(isl_constraint_get_ctx(c), csl->stride->stride));
b = isl_aff_floor(b);
- b = isl_aff_scale(b, csl->stride->stride);
- isl_int_neg(v, csl->stride->offset);
- b = isl_aff_add_constant(b, v);
+ b = isl_aff_scale_val(b, cloog_int_to_isl_val(isl_constraint_get_ctx(c), csl->stride->stride));
+ v = cloog_int_to_isl_val(isl_constraint_get_ctx(c), csl->stride->offset);
+ v = isl_val_neg(v);
+ b = isl_aff_add_constant_val(b, v);
b = isl_aff_add_coefficient_si(b, isl_dim_in, csl->level - 1, 1);
bound = isl_inequality_from_aff(b);
csl->bounds = isl_basic_set_add_constraint(csl->bounds, bound);
- isl_int_clear(v);
isl_constraint_free(c);
return 0;
@@ -960,7 +979,7 @@ static int constraint_stride_lower(__isl
static int constraint_stride_lower_c(__isl_take isl_constraint *c, void *user)
{
struct cloog_stride_lower *csl = (struct cloog_stride_lower *)user;
- isl_int v;
+ isl_val *v;
isl_constraint *bound;
isl_constraint *csl_c;
isl_aff *d, *b;
@@ -970,10 +989,9 @@ static int constraint_stride_lower_c(__i
return 0;
}
- isl_int_init(v);
- isl_constraint_get_coefficient(c, isl_dim_set, csl->level - 1, &v);
- if (!isl_int_is_pos(v)) {
- isl_int_clear(v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, csl->level - 1);
+ if (!isl_val_is_pos(v)) {
+ isl_val_free(v);
isl_constraint_free(c);
return 0;
@@ -984,15 +1002,15 @@ static int constraint_stride_lower_c(__i
d = isl_constraint_get_aff(csl_c);
d = isl_aff_drop_dims(d, isl_dim_div, 0, isl_aff_dim(d, isl_dim_div));
d = isl_aff_set_coefficient_si(d, isl_dim_in, csl->level - 1, 0);
- d = isl_aff_scale(d, csl->stride->factor);
+ d = isl_aff_scale_val(d, cloog_int_to_isl_val(isl_constraint_get_ctx(csl_c), csl->stride->factor));
b = isl_constraint_get_bound(c, isl_dim_set, csl->level - 1);
b = isl_aff_neg(b);
b = isl_aff_add(b, isl_aff_copy(d));
- b = isl_aff_scale_down(b, csl->stride->stride);
+ b = isl_aff_scale_down_val(b, cloog_int_to_isl_val(isl_constraint_get_ctx(csl_c), csl->stride->stride));
b = isl_aff_floor(b);
- b = isl_aff_scale(b, csl->stride->stride);
+ b = isl_aff_scale_val(b, cloog_int_to_isl_val(isl_constraint_get_ctx(csl_c), csl->stride->stride));
b = isl_aff_sub(b, d);
b = isl_aff_add_coefficient_si(b, isl_dim_in, csl->level - 1, 1);
@@ -1000,7 +1018,7 @@ static int constraint_stride_lower_c(__i
csl->bounds = isl_basic_set_add_constraint(csl->bounds, bound);
- isl_int_clear(v);
+ isl_val_free(v);
isl_constraint_free(c);
return 0;
@@ -1090,28 +1108,30 @@ struct cloog_bound_split {
static int constraint_bound_split(__isl_take isl_constraint *c, void *user)
{
struct cloog_bound_split *cbs = (struct cloog_bound_split *)user;
- isl_int v;
+ isl_val *v;
int i;
int handle = 0;
- isl_int_init(v);
- isl_constraint_get_coefficient(c, isl_dim_set, cbs->level - 1, &v);
- if (!cbs->lower && isl_int_is_pos(v))
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, cbs->level - 1);
+ if (!cbs->lower && isl_val_is_pos(v))
cbs->lower = handle = 1;
- else if (!cbs->upper && isl_int_is_neg(v))
+ else if (!cbs->upper && isl_val_is_neg(v))
cbs->upper = handle = 1;
+
if (handle) {
for (i = 0; i < isl_set_dim(cbs->set, isl_dim_param); ++i) {
- isl_constraint_get_coefficient(c, isl_dim_param, i, &v);
- if (isl_int_is_zero(v))
+ isl_val_free(v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_param, i);
+ if (isl_val_is_zero(v))
continue;
+
cbs->set = isl_set_split_dims(cbs->set,
isl_dim_param, i, 1);
}
}
- isl_int_clear(v);
- isl_constraint_free(c);
+ isl_val_free(v);
+ isl_constraint_free(c);
return (cbs->lower && cbs->upper) ? -1 : 0;
}
@@ -1203,7 +1223,7 @@ static int injective_scattering(CloogSca
* - scattdims is the total number of scattering dimentions.
*/
int cloog_scattering_lazy_block(CloogScattering *s1, CloogScattering *s2,
- CloogScatteringList *scattering, int scattdims)
+ CloogScatteringList *scattering, int scattdims)
{
int i;
struct isl_space *dim;
@@ -1211,8 +1231,8 @@ int cloog_scattering_lazy_block(CloogSca
struct isl_set *delta;
isl_map *map1 = isl_map_from_cloog_scattering(s1);
isl_map *map2 = isl_map_from_cloog_scattering(s2);
- int fixed, block;
- isl_int cst;
+ int block;
+ isl_val *cst;
unsigned n_scat;
n_scat = isl_map_dim(map1, isl_dim_out);
@@ -1225,22 +1245,33 @@ int cloog_scattering_lazy_block(CloogSca
rel = isl_map_apply_domain(rel, isl_map_copy(map1));
rel = isl_map_apply_range(rel, isl_map_copy(map2));
delta = isl_map_deltas(rel);
- isl_int_init(cst);
+ cst = NULL;
for (i = 0; i < n_scat; ++i) {
- fixed = isl_set_fast_dim_is_fixed(delta, i, &cst);
- if (fixed != 1)
+ cst = isl_set_plain_get_val_if_fixed(delta, isl_dim_set, i);
+ if (!cst){
+ isl_val_free(cst);
break;
- if (isl_int_is_zero(cst))
+ }
+ if (isl_val_is_zero(cst)){
+ isl_val_free(cst);
continue;
- if (i + 1 < n_scat)
+ }
+ if (i + 1 < n_scat){
+ isl_val_free(cst);
break;
- if (!isl_int_is_one(cst))
+ }
+ if (!isl_val_is_one(cst)){
+ isl_val_free(cst);
break;
- if (!injective_scattering(scattering))
+ }
+ if (!injective_scattering(scattering)){
+ isl_val_free(cst);
break;
+ }
+
+ isl_val_free(cst);
}
block = i >= n_scat;
- isl_int_clear(cst);
isl_set_free(delta);
return block;
}
@@ -1345,10 +1376,25 @@ CloogDomain *cloog_domain_simplify_union
* If value is not NULL, then it is set to the constant value of dimension.
*/
int cloog_scattering_lazy_isscalar(CloogScattering *scatt, int dimension,
- cloog_int_t *value)
+ cloog_int_t *value)
{
isl_map *map = isl_map_from_cloog_scattering(scatt);
- return isl_map_fast_is_fixed(map, isl_dim_out, dimension, value);
+ isl_val *v = isl_map_plain_get_val_if_fixed(map, isl_dim_out, dimension);
+ if (v != NULL) {
+ if (!isl_val_is_nan(v)){
+ if (value != NULL)
+ isl_val_to_cloog_int(v, value);
+
+ isl_val_free(v);
+ return 1;
+ }
+ else {
+ isl_val_free(v);
+ return 0;
+ }
+ }
+
+ return 0;
}
@@ -1362,7 +1408,22 @@ int cloog_domain_lazy_isconstant(CloogDo
cloog_int_t *value)
{
isl_set *set = isl_set_from_cloog_domain(domain);
- return isl_set_fast_dim_is_fixed(set, dimension, value);
+ isl_val *cst = isl_set_plain_get_val_if_fixed(set, isl_dim_set, dimension);
+ if (cst != NULL) {
+ if (!isl_val_is_nan(cst)){
+ if (value != NULL)
+ isl_val_to_cloog_int(cst, value);
+
+ isl_val_free(cst);
+ return 1;
+ }
+ else {
+ isl_val_free(cst);
+ return 0;
+ }
+ }
+
+ return 0;
}
@@ -1595,7 +1656,7 @@ static void Euclid(cloog_int_t a, cloog_
cloog_int_mul(tmp, tmp, d);
cloog_int_sub(c, c, tmp);
cloog_int_swap(c, d);
- cloog_int_swap(e, f);
+ cloog_int_swap(e, f);
}
cloog_int_set(*g, c);
if (cloog_int_is_zero(a))
@@ -1631,49 +1692,70 @@ static void Euclid(cloog_int_t a, cloog_
static CloogStride *construct_stride(isl_constraint *c, int level)
{
int i, n, sign;
- isl_int v, m, gcd, stride, factor;
+ isl_val *v, *m, *gcd, *stride;
+ isl_val *v_copy, *m_copy, *gcd_copy;
+ cloog_int_t c_v, c_m, c_gcd, c_stride, c_factor;
CloogStride *s;
+ isl_ctx *ctx = isl_constraint_get_ctx(c);;
if (!c)
return NULL;
- isl_int_init(v);
- isl_int_init(m);
- isl_int_init(gcd);
- isl_int_init(factor);
- isl_int_init(stride);
-
- isl_constraint_get_coefficient(c, isl_dim_set, level - 1, &v);
- sign = isl_int_sgn(v);
- isl_int_abs(m, v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, level - 1);
- isl_int_set_si(gcd, 0);
+ sign = isl_val_sgn(v);
+ m = isl_val_abs(v); /* *takes* v. */
+
+ gcd = isl_val_int_from_si(ctx, 0);
n = isl_constraint_dim(c, isl_dim_div);
for (i = 0; i < n; ++i) {
- isl_constraint_get_coefficient(c, isl_dim_div, i, &v);
- isl_int_gcd(gcd, gcd, v);
+ v = isl_constraint_get_coefficient_val(c, isl_dim_div, i);
+ gcd = isl_val_gcd(gcd, v);
}
- isl_int_gcd(v, m, gcd);
- isl_int_divexact(stride, gcd, v);
+ m_copy = isl_val_copy(m);
+ gcd_copy = isl_val_copy(gcd);
+
+ v = isl_val_gcd(m, gcd);
+
+ v_copy = isl_val_copy(v);
+ gcd = isl_val_copy(gcd_copy);
+ stride = isl_val_div(gcd, v);
- if (isl_int_is_zero(stride) || isl_int_is_one(stride))
+ if (isl_val_is_zero(stride) || isl_val_is_one(stride))
s = NULL;
else {
- Euclid(m, stride, &factor, &v, &gcd);
+ cloog_int_init(c_m);
+ cloog_int_init(c_stride);
+ cloog_int_init(c_v);
+ cloog_int_init(c_gcd);
+ cloog_int_init(c_factor);
+
+ isl_val_to_cloog_int(m_copy, &c_m);
+ isl_val_to_cloog_int(stride, &c_stride);
+ isl_val_to_cloog_int(v_copy, &c_v);
+ isl_val_to_cloog_int(gcd_copy, &c_gcd);
+
+ Euclid(c_m, c_stride, &c_factor, &c_v, &c_gcd);
if (sign > 0)
- isl_int_neg(factor, factor);
+ cloog_int_neg(c_factor, c_factor);
c = isl_constraint_copy(c);
- s = cloog_stride_alloc_from_constraint(stride,
- cloog_constraint_from_isl_constraint(c), factor);
+ s = cloog_stride_alloc_from_constraint(c_stride,
+ cloog_constraint_from_isl_constraint(c), c_factor);
+
+
+ cloog_int_clear(c_m);
+ cloog_int_clear(c_stride);
+ cloog_int_clear(c_v);
+ cloog_int_clear(c_gcd);
+ cloog_int_clear(c_factor);
}
- isl_int_clear(stride);
- isl_int_clear(factor);
- isl_int_clear(gcd);
- isl_int_clear(m);
- isl_int_clear(v);
+ isl_val_free(stride);
+ isl_val_free(gcd_copy);
+ isl_val_free(m_copy);
+ isl_val_free(v_copy);
return s;
}
@@ -1694,7 +1776,7 @@ static int find_stride(__isl_take isl_co
{
struct cloog_isl_find_stride_data *data;
int n;
- isl_int v;
+ isl_val *v;
if (!isl_constraint_is_equality(c)) {
isl_constraint_free(c);
@@ -1714,13 +1796,11 @@ static int find_stride(__isl_take isl_co
return 0;
}
- isl_int_init(v);
-
- isl_constraint_get_coefficient(c, isl_dim_set, data->level - 1, &v);
- if (!isl_int_is_zero(v))
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, data->level - 1);
+ if (!isl_val_is_zero(v))
data->stride = construct_stride(c, data->level);
- isl_int_clear(v);
+ isl_val_free(v);
isl_constraint_free(c);
@@ -1769,7 +1849,7 @@ struct cloog_can_unroll {
int level;
isl_constraint *c;
isl_set *set;
- isl_int *n;
+ isl_val *n;
};
@@ -1782,11 +1862,11 @@ struct cloog_can_unroll {
* with l the given lower bound and i the iterator identified by level.
*/
static int is_valid_unrolling_lower_bound(struct cloog_can_unroll *ccu,
- __isl_keep isl_constraint *c, isl_int *v)
+ __isl_keep isl_constraint *c, isl_val **v)
{
unsigned n_div;
isl_aff *aff;
- enum isl_lp_result res;
+ enum isl_lp_result;
n_div = isl_constraint_dim(c, isl_dim_div);
if (isl_constraint_involves_dims(c, isl_dim_div, 0, n_div))
@@ -1796,15 +1876,19 @@ static int is_valid_unrolling_lower_boun
aff = isl_aff_ceil(aff);
aff = isl_aff_neg(aff);
aff = isl_aff_add_coefficient_si(aff, isl_dim_in, ccu->level - 1, 1);
- res = isl_set_max(ccu->set, aff, v);
+ *v = isl_set_max_val(ccu->set, aff);
isl_aff_free(aff);
- if (res == isl_lp_unbounded)
- return 0;
+ if (!*v || isl_val_is_nan(*v))
+ cloog_die("Fail to decide about unrolling (cannot find max)");
- assert(res == isl_lp_ok);
+ if (isl_val_is_infty(*v) || isl_val_is_neginfty(*v)){
+ isl_val_free(*v);
+ *v = NULL;
+ return 0;
+ }
- cloog_int_add_ui(*v, *v, 1);
+ *v = isl_val_add_ui(*v, 1);
return 1;
}
@@ -1818,21 +1902,21 @@ static int is_valid_unrolling_lower_boun
static int constraint_can_unroll(__isl_take isl_constraint *c, void *user)
{
struct cloog_can_unroll *ccu = (struct cloog_can_unroll *)user;
- isl_int v;
- isl_int count;
+ isl_val *v;
+ isl_val *count = NULL;
- isl_int_init(v);
- isl_int_init(count);
- isl_constraint_get_coefficient(c, isl_dim_set, ccu->level - 1, &v);
- if (isl_int_is_pos(v) &&
- is_valid_unrolling_lower_bound(ccu, c, &count) &&
- (!ccu->c || isl_int_lt(count, *ccu->n))) {
+ v = isl_constraint_get_coefficient_val(c, isl_dim_set, ccu->level - 1);
+ if (isl_val_is_pos(v) &&
+ is_valid_unrolling_lower_bound(ccu, c, &count) &&
+ (!ccu->c || (isl_val_lt(count, ccu->n))) ) {
isl_constraint_free(ccu->c);
ccu->c = isl_constraint_copy(c);
- isl_int_set(*ccu->n, count);
+ if (ccu->n)
+ isl_val_free(ccu->n);
+ ccu->n = isl_val_copy(count);
}
- isl_int_clear(count);
- isl_int_clear(v);
+ isl_val_free(count);
+ isl_val_free(v);
isl_constraint_free(c);
return 0;
@@ -1872,7 +1956,8 @@ int cloog_domain_can_unroll(CloogDomain
CloogConstraint **lb)
{
isl_set *set = isl_set_from_cloog_domain(domain);
- struct cloog_can_unroll ccu = { 1, level, NULL, set, n };
+ isl_val *v = cloog_int_to_isl_val(isl_set_get_ctx(set), *n);
+ struct cloog_can_unroll ccu = { 1, level, NULL, set, v };
int r;
*lb = NULL;
@@ -1887,6 +1972,11 @@ int cloog_domain_can_unroll(CloogDomain
*lb = cloog_constraint_from_isl_constraint(ccu.c);
+ isl_val_to_cloog_int(ccu.n, n);
+ /* Note: we have to free ccu.n and not v because v has been
+ * freed and replaced in ccu during isl_set_foreach_basic_set
+ */
+ isl_val_free(ccu.n);
return ccu.can_unroll;
}
@@ -1904,6 +1994,7 @@ CloogDomain *cloog_domain_fixed_offset(C
{
isl_aff *aff;
isl_set *set = isl_set_from_cloog_domain(domain);
+ isl_ctx *ctx = isl_set_get_ctx(set);
isl_constraint *c;
isl_constraint *eq;
@@ -1911,7 +2002,7 @@ CloogDomain *cloog_domain_fixed_offset(C
aff = isl_constraint_get_bound(c, isl_dim_set, level - 1);
aff = isl_aff_ceil(aff);
aff = isl_aff_add_coefficient_si(aff, isl_dim_in, level - 1, -1);
- aff = isl_aff_add_constant(aff, offset);
+ aff = isl_aff_add_constant_val(aff, cloog_int_to_isl_val(ctx, offset));
eq = isl_equality_from_aff(aff);
set = isl_set_add_constraint(set, eq);

3
math/coinmp/DESCR Normal file
View File

@@ -0,0 +1,3 @@
CoinMP is a C-API library that supports most of the functionality
of CLP (Coin LP), CBC (Coin Branch-and-Cut), and CGL (Cut Generation
Library) projects.

43
math/coinmp/Makefile Normal file
View File

@@ -0,0 +1,43 @@
# $NetBSD: Makefile,v 1.1 2015/02/04 17:36:34 ryoon Exp $
DISTNAME= CoinMP-1.7.6
PKGNAME= ${DISTNAME:tl}
CATEGORIES= math
MASTER_SITES= http://www.coin-or.org/download/source/CoinMP/
EXTRACT_SUFX= .tgz
MAINTAINER= ryoon@NetBSD.org
HOMEPAGE= https://projects.coin-or.org/CoinMP
COMMENT= CoinMP is a C-API library that supports CLP, CBC, and CGL
LICENSE= cpl-1.0
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++ fortran
PKGCONFIG_OVERRIDE+= Cbc/cbc.pc.in
PKGCONFIG_OVERRIDE+= Cbc/osi-cbc.pc.in
PKGCONFIG_OVERRIDE+= Cgl/cgl.pc.in
PKGCONFIG_OVERRIDE+= Clp/src/OsiClp/osi-clp.pc.in
PKGCONFIG_OVERRIDE+= Clp/clp.pc.in
PKGCONFIG_OVERRIDE+= CoinMP/coinmp.pc.in
PKGCONFIG_OVERRIDE+= CoinUtils/coinutils.pc.in
PKGCONFIG_OVERRIDE+= Data/Sample/coindatasample.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiGlpk/osi-glpk.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiSpx/osi-soplex.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiMsk/osi-mosek.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiCpx/osi-cplex.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiXpr/osi-xpress.pc.in
PKGCONFIG_OVERRIDE+= Osi/src/OsiGrb/osi-gurobi.pc.in
PKGCONFIG_OVERRIDE+= Osi/osi-unittests.pc.in
PKGCONFIG_OVERRIDE+= Osi/osi.pc.in
SUBST_CLASSES+= pkgconfig
SUBST_STAGE.pkgconfig= pre-configure
SUBST_MESSAGE.pkgconfig=Set temporary pkg-config directory
SUBST_FILES.pkgconfig+= */Makefile.in
SUBST_SED.pkgconfig+= -e 's,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@,PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
SUBST_SED.pkgconfig+= -e 's,PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@",PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:${DESTDIR}${PREFIX}/lib/pkgconfig,'
.include "../../mk/bsd.pkg.mk"

312
math/coinmp/PLIST Normal file
View File

@@ -0,0 +1,312 @@
@comment $NetBSD: PLIST,v 1.1 2015/02/04 17:36:34 ryoon Exp $
bin/cbc
bin/clp
include/coin/CbcBranchActual.hpp
include/coin/CbcBranchAllDifferent.hpp
include/coin/CbcBranchBase.hpp
include/coin/CbcBranchCut.hpp
include/coin/CbcBranchDecision.hpp
include/coin/CbcBranchDefaultDecision.hpp
include/coin/CbcBranchDynamic.hpp
include/coin/CbcBranchLotsize.hpp
include/coin/CbcBranchToFixLots.hpp
include/coin/CbcBranchingObject.hpp
include/coin/CbcClique.hpp
include/coin/CbcCompare.hpp
include/coin/CbcCompareActual.hpp
include/coin/CbcCompareBase.hpp
include/coin/CbcCompareDefault.hpp
include/coin/CbcCompareDepth.hpp
include/coin/CbcCompareEstimate.hpp
include/coin/CbcCompareObjective.hpp
include/coin/CbcConfig.h
include/coin/CbcConsequence.hpp
include/coin/CbcCountRowCut.hpp
include/coin/CbcCutGenerator.hpp
include/coin/CbcCutModifier.hpp
include/coin/CbcCutSubsetModifier.hpp
include/coin/CbcDummyBranchingObject.hpp
include/coin/CbcEventHandler.hpp
include/coin/CbcFathom.hpp
include/coin/CbcFathomDynamicProgramming.hpp
include/coin/CbcFeasibilityBase.hpp
include/coin/CbcFixVariable.hpp
include/coin/CbcFollowOn.hpp
include/coin/CbcFullNodeInfo.hpp
include/coin/CbcGeneral.hpp
include/coin/CbcGeneralDepth.hpp
include/coin/CbcHeuristic.hpp
include/coin/CbcHeuristicDINS.hpp
include/coin/CbcHeuristicDive.hpp
include/coin/CbcHeuristicDiveCoefficient.hpp
include/coin/CbcHeuristicDiveFractional.hpp
include/coin/CbcHeuristicDiveGuided.hpp
include/coin/CbcHeuristicDiveLineSearch.hpp
include/coin/CbcHeuristicDivePseudoCost.hpp
include/coin/CbcHeuristicDiveVectorLength.hpp
include/coin/CbcHeuristicFPump.hpp
include/coin/CbcHeuristicGreedy.hpp
include/coin/CbcHeuristicLocal.hpp
include/coin/CbcHeuristicPivotAndFix.hpp
include/coin/CbcHeuristicRENS.hpp
include/coin/CbcHeuristicRINS.hpp
include/coin/CbcHeuristicRandRound.hpp
include/coin/CbcHeuristicVND.hpp
include/coin/CbcLinked.hpp
include/coin/CbcMessage.hpp
include/coin/CbcMipStartIO.hpp
include/coin/CbcModel.hpp
include/coin/CbcNWay.hpp
include/coin/CbcNode.hpp
include/coin/CbcNodeInfo.hpp
include/coin/CbcObject.hpp
include/coin/CbcObjectUpdateData.hpp
include/coin/CbcOrClpParam.cpp
include/coin/CbcOrClpParam.hpp
include/coin/CbcPartialNodeInfo.hpp
include/coin/CbcSOS.hpp
include/coin/CbcSimpleInteger.hpp
include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp
include/coin/CbcSimpleIntegerPseudoCost.hpp
include/coin/CbcSolver.hpp
include/coin/CbcStrategy.hpp
include/coin/CbcSubProblem.hpp
include/coin/CbcTree.hpp
include/coin/CbcTreeLocal.hpp
include/coin/Cbc_C_Interface.h
include/coin/Cgl012cut.hpp
include/coin/CglAllDifferent.hpp
include/coin/CglClique.hpp
include/coin/CglConfig.h
include/coin/CglCutGenerator.hpp
include/coin/CglDuplicateRow.hpp
include/coin/CglFlowCover.hpp
include/coin/CglGMI.hpp
include/coin/CglGMIParam.hpp
include/coin/CglGomory.hpp
include/coin/CglKnapsackCover.hpp
include/coin/CglLandP.hpp
include/coin/CglLandPValidator.hpp
include/coin/CglLiftAndProject.hpp
include/coin/CglMessage.hpp
include/coin/CglMixedIntegerRounding.hpp
include/coin/CglMixedIntegerRounding2.hpp
include/coin/CglOddHole.hpp
include/coin/CglParam.hpp
include/coin/CglPreProcess.hpp
include/coin/CglProbing.hpp
include/coin/CglRedSplit.hpp
include/coin/CglRedSplit2.hpp
include/coin/CglRedSplit2Param.hpp
include/coin/CglRedSplitParam.hpp
include/coin/CglResidualCapacity.hpp
include/coin/CglSimpleRounding.hpp
include/coin/CglStored.hpp
include/coin/CglTreeInfo.hpp
include/coin/CglTwomir.hpp
include/coin/CglZeroHalf.hpp
include/coin/ClpAmplObjective.hpp
include/coin/ClpCholeskyBase.hpp
include/coin/ClpCholeskyDense.hpp
include/coin/ClpConfig.h
include/coin/ClpConstraint.hpp
include/coin/ClpConstraintAmpl.hpp
include/coin/ClpConstraintLinear.hpp
include/coin/ClpConstraintQuadratic.hpp
include/coin/ClpDualRowDantzig.hpp
include/coin/ClpDualRowPivot.hpp
include/coin/ClpDualRowSteepest.hpp
include/coin/ClpDummyMatrix.hpp
include/coin/ClpDynamicExampleMatrix.hpp
include/coin/ClpDynamicMatrix.hpp
include/coin/ClpEventHandler.hpp
include/coin/ClpFactorization.hpp
include/coin/ClpGubDynamicMatrix.hpp
include/coin/ClpGubMatrix.hpp
include/coin/ClpInterior.hpp
include/coin/ClpLinearObjective.hpp
include/coin/ClpMatrixBase.hpp
include/coin/ClpMessage.hpp
include/coin/ClpModel.hpp
include/coin/ClpNetworkMatrix.hpp
include/coin/ClpNode.hpp
include/coin/ClpNonLinearCost.hpp
include/coin/ClpObjective.hpp
include/coin/ClpPackedMatrix.hpp
include/coin/ClpParameters.hpp
include/coin/ClpPdcoBase.hpp
include/coin/ClpPlusMinusOneMatrix.hpp
include/coin/ClpPresolve.hpp
include/coin/ClpPrimalColumnDantzig.hpp
include/coin/ClpPrimalColumnPivot.hpp
include/coin/ClpPrimalColumnSteepest.hpp
include/coin/ClpQuadraticObjective.hpp
include/coin/ClpSimplex.hpp
include/coin/ClpSimplexDual.hpp
include/coin/ClpSimplexNonlinear.hpp
include/coin/ClpSimplexOther.hpp
include/coin/ClpSimplexPrimal.hpp
include/coin/ClpSolve.hpp
include/coin/Clp_C_Interface.h
include/coin/CoinAlloc.hpp
include/coin/CoinBuild.hpp
include/coin/CoinDenseFactorization.hpp
include/coin/CoinDenseVector.hpp
include/coin/CoinDistance.hpp
include/coin/CoinError.hpp
include/coin/CoinFactorization.hpp
include/coin/CoinFileIO.hpp
include/coin/CoinFinite.hpp
include/coin/CoinFloatEqual.hpp
include/coin/CoinHelperFunctions.hpp
include/coin/CoinIndexedVector.hpp
include/coin/CoinLpIO.hpp
include/coin/CoinMP.h
include/coin/CoinMPConfig.h
include/coin/CoinMessage.hpp
include/coin/CoinMessageHandler.hpp
include/coin/CoinModel.hpp
include/coin/CoinModelUseful.hpp
include/coin/CoinMpsIO.hpp
include/coin/CoinOslFactorization.hpp
include/coin/CoinPackedMatrix.hpp
include/coin/CoinPackedVector.hpp
include/coin/CoinPackedVectorBase.hpp
include/coin/CoinParam.hpp
include/coin/CoinPragma.hpp
include/coin/CoinPresolveDoubleton.hpp
include/coin/CoinPresolveDual.hpp
include/coin/CoinPresolveDupcol.hpp
include/coin/CoinPresolveEmpty.hpp
include/coin/CoinPresolveFixed.hpp
include/coin/CoinPresolveForcing.hpp
include/coin/CoinPresolveImpliedFree.hpp
include/coin/CoinPresolveIsolated.hpp
include/coin/CoinPresolveMatrix.hpp
include/coin/CoinPresolveMonitor.hpp
include/coin/CoinPresolvePsdebug.hpp
include/coin/CoinPresolveSingleton.hpp
include/coin/CoinPresolveSubst.hpp
include/coin/CoinPresolveTighten.hpp
include/coin/CoinPresolveTripleton.hpp
include/coin/CoinPresolveUseless.hpp
include/coin/CoinPresolveZeros.hpp
include/coin/CoinSearchTree.hpp
include/coin/CoinShallowPackedVector.hpp
include/coin/CoinSignal.hpp
include/coin/CoinSimpFactorization.hpp
include/coin/CoinSmartPtr.hpp
include/coin/CoinSnapshot.hpp
include/coin/CoinSort.hpp
include/coin/CoinStructuredModel.hpp
include/coin/CoinTime.hpp
include/coin/CoinTypes.hpp
include/coin/CoinUtility.hpp
include/coin/CoinUtilsConfig.h
include/coin/CoinWarmStart.hpp
include/coin/CoinWarmStartBasis.hpp
include/coin/CoinWarmStartDual.hpp
include/coin/CoinWarmStartPrimalDual.hpp
include/coin/CoinWarmStartVector.hpp
include/coin/Coin_C_defines.h
include/coin/Idiot.hpp
include/coin/OsiAuxInfo.hpp
include/coin/OsiBranchingObject.hpp
include/coin/OsiCbcSolverInterface.hpp
include/coin/OsiChooseVariable.hpp
include/coin/OsiClpSolverInterface.hpp
include/coin/OsiColCut.hpp
include/coin/OsiCollections.hpp
include/coin/OsiConfig.h
include/coin/OsiCut.hpp
include/coin/OsiCuts.hpp
include/coin/OsiPresolve.hpp
include/coin/OsiRowCut.hpp
include/coin/OsiRowCutDebugger.hpp
include/coin/OsiSolverBranch.hpp
include/coin/OsiSolverInterface.hpp
include/coin/OsiSolverParameters.hpp
include/coin/OsiUnitTests.hpp
lib/libCbc.la
lib/libCbcSolver.la
lib/libCgl.la
lib/libClp.la
lib/libCoinMP.la
lib/libCoinUtils.la
lib/libOsi.la
lib/libOsiCbc.la
lib/libOsiClp.la
lib/libOsiCommonTests.la
lib/pkgconfig/cbc.pc
lib/pkgconfig/cgl.pc
lib/pkgconfig/clp.pc
lib/pkgconfig/coindatasample.pc
lib/pkgconfig/coinmp.pc
lib/pkgconfig/coinutils.pc
lib/pkgconfig/osi-cbc.pc
lib/pkgconfig/osi-clp.pc
lib/pkgconfig/osi-unittests.pc
lib/pkgconfig/osi.pc
share/coin/Data/Sample/afiro.mps
share/coin/Data/Sample/app0110.cor
share/coin/Data/Sample/app0110.stoch
share/coin/Data/Sample/app0110.time
share/coin/Data/Sample/app0110R.cor
share/coin/Data/Sample/app0110R.stoch
share/coin/Data/Sample/app0110R.time
share/coin/Data/Sample/atm_5_10_1.block
share/coin/Data/Sample/atm_5_10_1.mps
share/coin/Data/Sample/brandy.mps
share/coin/Data/Sample/bug.cor
share/coin/Data/Sample/bug.stoch
share/coin/Data/Sample/bug.time
share/coin/Data/Sample/conic.mps
share/coin/Data/Sample/e226.mps
share/coin/Data/Sample/exmip1.5.mps
share/coin/Data/Sample/exmip1.lp
share/coin/Data/Sample/exmip1.mps
share/coin/Data/Sample/finnis.mps
share/coin/Data/Sample/galenet.mps
share/coin/Data/Sample/galenetbnds.mps
share/coin/Data/Sample/hello.mps
share/coin/Data/Sample/input.130
share/coin/Data/Sample/lseu.mps
share/coin/Data/Sample/nw460.mps
share/coin/Data/Sample/p0033.mps
share/coin/Data/Sample/p0201.mps
share/coin/Data/Sample/p0548.mps
share/coin/Data/Sample/pack1.mps
share/coin/Data/Sample/retail3.block
share/coin/Data/Sample/retail3.mps
share/coin/Data/Sample/scOneInt.mps
share/coin/Data/Sample/share2qp.mps
share/coin/Data/Sample/spec_sections.mps
share/coin/Data/Sample/tp3.mps
share/coin/Data/Sample/tp4.mps
share/coin/Data/Sample/tp5.mps
share/coin/Data/Sample/wedding_16.block
share/coin/Data/Sample/wedding_16.mps
share/coin/doc/Cbc/AUTHORS
share/coin/doc/Cbc/LICENSE
share/coin/doc/Cbc/README
share/coin/doc/Cbc/cbc_addlibs.txt
share/coin/doc/Cgl/AUTHORS
share/coin/doc/Cgl/LICENSE
share/coin/doc/Cgl/README
share/coin/doc/Cgl/cgl_addlibs.txt
share/coin/doc/Clp/AUTHORS
share/coin/doc/Clp/LICENSE
share/coin/doc/Clp/README
share/coin/doc/Clp/clp_addlibs.txt
share/coin/doc/CoinMP/AUTHORS
share/coin/doc/CoinMP/LICENSE
share/coin/doc/CoinMP/README
share/coin/doc/CoinMP/coinmp_addlibs.txt
share/coin/doc/CoinUtils/AUTHORS
share/coin/doc/CoinUtils/LICENSE
share/coin/doc/CoinUtils/README
share/coin/doc/CoinUtils/coinutils_addlibs.txt
share/coin/doc/Osi/AUTHORS
share/coin/doc/Osi/LICENSE
share/coin/doc/Osi/README
share/coin/doc/Osi/osi_addlibs.txt

12
math/coinmp/buildlink3.mk Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.1 2015/02/04 17:36:34 ryoon Exp $
BUILDLINK_TREE+= coinmp
.if !defined(COINMP_BUILDLINK3_MK)
COINMP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.coinmp+= coinmp>=1.7.6
BUILDLINK_PKGSRCDIR.coinmp?= ../../math/coinmp
.endif # COINMP_BUILDLINK3_MK
BUILDLINK_TREE+= -coinmp

5
math/coinmp/distinfo Normal file
View File

@@ -0,0 +1,5 @@
$NetBSD: distinfo,v 1.1 2015/02/04 17:36:34 ryoon Exp $
SHA1 (CoinMP-1.7.6.tgz) = f52c74abcbf55c72cd89f709db658ea33ed45154
RMD160 (CoinMP-1.7.6.tgz) = b1634d966a201a94a0ace4769b0216aa7189d8dd
Size (CoinMP-1.7.6.tgz) = 10343849 bytes

9
math/crfsuite/DESCR Normal file
View File

@@ -0,0 +1,9 @@
CRFSuite is an implementation of Conditional Random Fields (CRFs) for
labeling sequential data. The first priority of this software is to
train and use CRF models as fast as possible even at the expense of
its memory space and code generality. CRFsuite runs 5.4 - 61.8 times
faster than C++ implementations for training. CRFsuite supports
parameter estimation with L1 regularization (Laplacian prior) using
Orthant-Wise Limited-memory Quasi-Newton (OW-LQN) method and L2
regularization (Gaussian prior) using Limited-memory BFGS (L-BFGS)
method.

44
math/crfsuite/Makefile Normal file
View File

@@ -0,0 +1,44 @@
# $NetBSD: Makefile,v 1.3 2015/03/31 15:49:15 joerg Exp $
DISTNAME= 0.12
PKGNAME= crfsuite-${DISTNAME}
PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= https://github.com/chokkan/crfsuite/archive/
DIST_SUBDIR= crfsuite
MAINTAINER= cheusov@NetBSD.org
HOMEPAGE= https://github.com/chokkan/crfsuite
COMMENT= Fast implementation of Conditional Random Fields (CRFs)
LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/crfsuite-0.12
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
AUTO_MKDIRS= yes
AUTOCONF_REQD= 2.50
USE_TOOLS+= autoconf autoreconf automake
CONFIGURE_ARGS+= --with-liblbfgs=${PREFIX}
REPLACE_PYTHON= example/*.py
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
CONFIGURE_ARGS+= --disable-sse2
.endif
pre-configure:
set -e; cd ${WRKSRC}; autoreconf -sif
post-install:
set -e; cd ${WRKSRC}; \
${INSTALL_SCRIPT} example/*.py ${DESTDIR}${PREFIX}/share/examples/crfsuite
.include "../../lang/python/application.mk"
.include "../../math/liblbfgs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

17
math/crfsuite/PLIST Normal file
View File

@@ -0,0 +1,17 @@
@comment $NetBSD: PLIST,v 1.2 2014/10/31 00:54:02 cheusov Exp $
bin/crfsuite
include/crfsuite.h
include/crfsuite.hpp
include/crfsuite_api.hpp
lib/libcqdb.la
lib/libcrfsuite.la
share/doc/crfsuite/AUTHORS
share/doc/crfsuite/COPYING
share/doc/crfsuite/ChangeLog
share/doc/crfsuite/INSTALL
share/doc/crfsuite/README
share/examples/crfsuite/chunking.py
share/examples/crfsuite/crfutils.py
share/examples/crfsuite/ner.py
share/examples/crfsuite/pos.py
share/examples/crfsuite/template.py

12
math/crfsuite/buildlink3.mk Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
BUILDLINK_TREE+= crfsuite
.if !defined(CRFSUITE_BUILDLINK3_MK)
CRFSUITE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.crfsuite+= crfsuite>=0.12
BUILDLINK_PKGSRCDIR.crfsuite?= ../../math/crfsuite
.endif # CRFSUITE_BUILDLINK3_MK
BUILDLINK_TREE+= -crfsuite

10
math/crfsuite/distinfo Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: distinfo,v 1.2 2014/10/31 00:54:02 cheusov Exp $
SHA1 (crfsuite/0.12.tar.gz) = f121cee029613c64c32056f68710c69f28347238
RMD160 (crfsuite/0.12.tar.gz) = 10e6abffbca2b05229b292e324533eab59742f22
Size (crfsuite/0.12.tar.gz) = 256160 bytes
SHA1 (patch-configure.in) = 7c7bc744d32509a354e699e6120db76083db3529
SHA1 (patch-example_crfutils.py) = 4dad264055b6fd0268b3133d14a22ef8094586e7
SHA1 (patch-frontend_Makefile.am) = 9ab46935cf7ff0147d138bd5425769dbc3aa9246
SHA1 (patch-lib_cqdb_Makefile.am) = eb7d78cea673193e2b9910c77f9f7602f7ec61ae
SHA1 (patch-lib_crf_Makefile.am) = 1ed872381c404a7ab15f67360a76954d2d58a18d

27
math/crfsuite/patches/patch-configure.in Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-configure.in,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
# Adapted for recent autoconf and automake
--- configure.in.orig 2011-08-11 03:02:41.000000000 +0000
+++ configure.in
@@ -11,7 +11,7 @@ dnl ------------------------------------
dnl Initialization for autoconf
dnl ------------------------------------------------------------------
AC_PREREQ(2.59)
-AC_INIT
+AC_INIT(crfsuite, 0.12)
AC_CONFIG_SRCDIR([frontend/main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -27,10 +27,10 @@ AC_ISC_POSIX
dnl ------------------------------------------------------------------
dnl Initialization for automake
dnl ------------------------------------------------------------------
-AM_INIT_AUTOMAKE(crfsuite, 0.12)
+AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
AM_MAINTAINER_MODE
-AM_C_PROTOTYPES
+# AM_C_PROTOTYPES
dnl ------------------------------------------------------------------

10
math/crfsuite/patches/patch-example_crfutils.py Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: patch-example_crfutils.py,v 1.1 2014/10/31 00:54:02 cheusov Exp $
--- example/crfutils.py.orig 2011-08-11 03:02:41.000000000 +0000
+++ example/crfutils.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
"""
A miscellaneous utility for sequential labeling.
Copyright 2010,2011 Naoaki Okazaki.

14
math/crfsuite/patches/patch-frontend_Makefile.am Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-frontend_Makefile.am,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
# Adapted for recent autoconf and automake
--- frontend/Makefile.am.orig 2011-08-11 03:02:41.000000000 +0000
+++ frontend/Makefile.am
@@ -22,7 +22,7 @@ crfsuite_SOURCES = \
#crfsuite_CPPFLAGS =
AM_CFLAGS = @CFLAGS@
-INCLUDES = @INCLUDES@
+AM_CPPFLAGS = @INCLUDES@
AM_LDFLAGS = @LDFLAGS@
crfsuite_CFLAGS = -I$(top_builddir)/include

11
math/crfsuite/patches/patch-lib_cqdb_Makefile.am Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: patch-lib_cqdb_Makefile.am,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
# Adapted for recent autoconf and automake
--- lib/cqdb/Makefile.am.orig 2011-08-11 03:02:41.000000000 +0000
+++ lib/cqdb/Makefile.am
@@ -18,4 +18,4 @@ libcqdb_la_LDFLAGS = \
libcqdb_la_CFLAGS = -I./include
AM_CFLAGS = @CFLAGS@
-INCLUDES = @INCLUDES@
+AM_CPPFLAGS = @INCLUDES@

11
math/crfsuite/patches/patch-lib_crf_Makefile.am Normal file
View File

@@ -0,0 +1,11 @@
$NetBSD: patch-lib_crf_Makefile.am,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $
# Adapted for recent autoconf and automake
--- lib/crf/Makefile.am.orig 2011-08-11 03:02:41.000000000 +0000
+++ lib/crf/Makefile.am
@@ -43,4 +43,4 @@ libcrfsuite_la_LIBADD = \
$(top_builddir)/lib/cqdb/libcqdb.la
AM_CFLAGS = @CFLAGS@
-INCLUDES = @INCLUDES@
+AM_CPPFLAGS = @INCLUDES@

4
math/ess/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.28 2014/02/19 09:19:01 markd Exp $
# $NetBSD: Makefile,v 1.29 2014/05/29 23:36:52 wiz Exp $
DISTNAME= ess-13.09-1
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-1$/.1/}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/
EXTRACT_SUFX= .tgz

4
math/euler/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.39 2013/10/10 14:42:22 ryoon Exp $
# $NetBSD: Makefile,v 1.40 2014/05/05 00:48:07 ryoon Exp $
DISTNAME= euler-1.61.0
PKGNAME= euler-1.61
EXTRACT_SUFX= .tgz
PKGREVISION= 19
PKGREVISION= 20
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=euler/}

8
math/fftw/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.46 2013/07/09 15:46:45 tsutsui Exp $
# $NetBSD: Makefile,v 1.49 2014/10/09 14:06:41 wiz Exp $
DISTNAME= fftw-3.3.3
PKGREVISION= 2
DISTNAME= fftw-3.3.4
PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
http://www.fftw.org/
@@ -11,8 +11,6 @@ HOMEPAGE= http://www.fftw.org/
COMMENT= Collection of fast C routines to compute DFTs
LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_TOOLS+= gmake

8
math/fftw/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.19 2012/11/26 17:36:50 adam Exp $
$NetBSD: distinfo,v 1.20 2014/03/31 08:33:10 wiz Exp $
SHA1 (fftw-3.3.3.tar.gz) = 11487180928d05746d431ebe7a176b52fe205cf9
RMD160 (fftw-3.3.3.tar.gz) = f45e97f06ffaf59b5022ea5e33ef240cb5e84e74
Size (fftw-3.3.3.tar.gz) = 3920661 bytes
SHA1 (fftw-3.3.4.tar.gz) = fd508bac8ac13b3a46152c54b7ac885b69734262
RMD160 (fftw-3.3.4.tar.gz) = 463b5120d42ec2a3bc1385689176c5e0296d0d4a
Size (fftw-3.3.4.tar.gz) = 3940427 bytes

4
math/fftw2/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:24 rodent Exp $
# $NetBSD: Makefile,v 1.25 2014/10/09 14:06:41 wiz Exp $
DISTNAME= fftw-2.1.5
PKGNAME= fftw2-2.1.5
@@ -11,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fftw.org/
COMMENT= Collection of fast C routines to compute DFTs
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-shared

4
math/fftw2/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.3 2005/02/23 12:06:54 agc Exp $
$NetBSD: distinfo,v 1.4 2015/03/12 16:57:52 tnn Exp $
SHA1 (fftw-2.1.5.tar.gz) = 12020b58edc1b0490a83db4aa912fac5dfdfb26b
RMD160 (fftw-2.1.5.tar.gz) = 723308722d76c12710db6473979adf8d086b0909
Size (fftw-2.1.5.tar.gz) = 1256888 bytes
SHA1 (patch-aa) = 7a451f7aa2d4fe0e5134d014006c63d077951726
SHA1 (patch-aa) = d9337561482d5665441132fe8ad635bf91ef2a7e

20
math/fftw2/patches/patch-aa
View File

@@ -1,6 +1,8 @@
$NetBSD: patch-aa,v 1.1.1.1 2003/06/05 20:50:29 wiz Exp $
$NetBSD: patch-aa,v 1.2 2015/03/12 16:57:52 tnn Exp $
--- doc/fftw.texi.orig Sat Mar 3 16:17:10 2001
Unbreak build with gtexinfo-5.2
--- doc/fftw.texi.orig 2003-03-16 23:43:18.000000000 +0000
+++ doc/fftw.texi
@@ -5,6 +5,11 @@
@settitle FFTW
@@ -14,3 +16,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/06/05 20:50:29 wiz Exp $
@include version.texi
@setchapternewpage odd
@c define constant index (ct)
@@ -46,10 +51,10 @@ approved by the Free Software Foundation
@titlepage
@sp 10
@comment The title is printed in a large font.
-@title{FFTW User's Manual}
+@title FFTW User's Manual
@subtitle For version @value{VERSION}, @value{UPDATED}
-@author{Matteo Frigo}
-@author{Steven G. Johnson}
+@author Matteo Frigo
+@author Steven G. Johnson
@c The following two commands start the copyright page.
@page

4
math/fftwf/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.16 2013/05/31 12:41:22 wiz Exp $
# $NetBSD: Makefile,v 1.17 2014/05/29 23:36:53 wiz Exp $
DISTNAME= fftw-3.3.2
PKGNAME= ${DISTNAME:C/fftw/fftwf/}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
http://www.fftw.org/

4
math/fityk/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.29 2014/03/26 06:57:06 asau Exp $
# $NetBSD: Makefile,v 1.30 2014/05/05 00:48:07 ryoon Exp $
DISTNAME= fityk-0.9.7
PKGREVISION= 16
PKGREVISION= 17
CATEGORIES= math
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fityk/}
MASTER_SITES= https://cloud.github.com/downloads/wojdyr/fityk/

3
math/fricas/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.20 2013/05/19 10:01:00 asau Exp $
# $NetBSD: Makefile,v 1.22 2014/04/30 14:19:41 wiz Exp $
PKGNAME= fricas-1.2.0
DISTNAME= ${PKGNAME_NOREV}-full
PKGREVISION= 2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fricas/}
EXTRACT_SUFX= .tar.bz2

6
math/galculator/Makefile
View File

@@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.40 2013/10/10 14:42:22 ryoon Exp $
# $NetBSD: Makefile,v 1.42 2015/02/03 15:29:48 mef Exp $
#
DISTNAME= galculator-2.1.2
PKGREVISION= 5
DISTNAME= galculator-2.1.3
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galculator/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://galculator.sourceforge.net/
COMMENT= Desktop calculator with scientific / RPN modes
LICENSE= gnu-gpl-v2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes

4
math/galculator/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.6 2013/05/03 16:40:02 drochner Exp $
@comment $NetBSD: PLIST,v 1.7 2015/02/03 15:29:48 mef Exp $
bin/galculator
man/man1/galculator.1
share/applications/galculator.desktop
@@ -24,8 +24,10 @@ share/icons/hicolor/48x48/apps/galculator.png
share/icons/hicolor/scalable/apps/galculator.svg
share/locale/da_DK/LC_MESSAGES/galculator.mo
share/locale/de/LC_MESSAGES/galculator.mo
share/locale/es/LC_MESSAGES/galculator.mo
share/locale/es_MX/LC_MESSAGES/galculator.mo
share/locale/fr/LC_MESSAGES/galculator.mo
share/locale/hu/LC_MESSAGES/galculator.mo
share/locale/ja/LC_MESSAGES/galculator.mo
share/locale/kk_KZ/LC_MESSAGES/galculator.mo
share/locale/lt/LC_MESSAGES/galculator.mo

8
math/galculator/distinfo
View File

@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.7 2013/05/03 16:40:02 drochner Exp $
$NetBSD: distinfo,v 1.8 2015/02/03 15:29:48 mef Exp $
SHA1 (galculator-2.1.2.tar.gz) = 5db96f509d5a85752b3a019d95081238ad0a7e9a
RMD160 (galculator-2.1.2.tar.gz) = fcf5c332d646a312aeb07513ee1092cbc0b7048d
Size (galculator-2.1.2.tar.gz) = 613655 bytes
SHA1 (galculator-2.1.3.tar.gz) = 6c1ab90b22e53c2f745659e5103c4ada7bf1e608
RMD160 (galculator-2.1.3.tar.gz) = b8767ad09ad3219433092dbef663024e8b816fe4
Size (galculator-2.1.3.tar.gz) = 651206 bytes

4
math/gcalctool/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.114 2013/10/10 14:42:22 ryoon Exp $
# $NetBSD: Makefile,v 1.115 2014/05/05 00:48:07 ryoon Exp $
#
DISTNAME= gcalctool-5.32.2
PKGREVISION= 17
PKGREVISION= 18
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gcalctool/5.32/}
EXTRACT_SUFX= .tar.bz2

4
math/genius/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.60 2014/03/12 19:36:44 wiedi Exp $
# $NetBSD: Makefile,v 1.62 2014/05/29 23:36:53 wiz Exp $
#
DISTNAME= genius-1.0.17
PKGREVISION= 2
PKGREVISION= 4
CATEGORIES= math
MASTER_SITES= http://ftp.5z.com/pub/genius/

5
math/genius/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.19 2013/10/27 20:35:48 joerg Exp $
$NetBSD: distinfo,v 1.21 2014/09/23 22:52:01 jperkin Exp $
SHA1 (genius-1.0.17.tar.gz) = 884a12db62de68aa90b078ba9baa124f73c44f51
RMD160 (genius-1.0.17.tar.gz) = 17b6fa3fddf65f4bab8e0d7721f85ea8a666d838
@@ -7,3 +7,6 @@ SHA1 (patch-configure) = a1431b1e521c35eea3df1acc16415806b54f58e7
SHA1 (patch-configure.in) = 73fcc7ba580b7f575bd16fdcf12fe81518904379
SHA1 (patch-gtkextra_gtkplot.c) = 3ea37b0a15454b5d81d62b93dd4a70828259d97f
SHA1 (patch-gtkextra_gtkplotsurface.c) = 5f1e98dc7268ebef3a5edf04496a92b4f620114c
SHA1 (patch-src_genius-readline-helper.c) = 957f2241399a9092e6634b3c105ce7e487bfca07
SHA1 (patch-src_genius.c) = 8621f915101118c6cf123fedafe5e435398f72fb
SHA1 (patch-src_inter.c) = 619a0f553acc0c30960cebfc4fa10146baac5dc4

23
math/genius/patches/patch-src_genius-readline-helper.c Normal file
View File

@@ -0,0 +1,23 @@
$NetBSD: patch-src_genius-readline-helper.c,v 1.1 2014/04/21 18:17:35 joerg Exp $
--- src/genius-readline-helper.c.orig 2014-04-20 18:20:05.000000000 +0000
+++ src/genius-readline-helper.c
@@ -104,7 +104,7 @@ plugin_generator (const char *text, int
/* Note: keep in sync with inter.c */
/* FIXME: make this common */
static char **
-tab_completion (char *text, int start, int end)
+tab_completion (const char *text, int start, int end)
{
char *p;
for(p=rl_line_buffer;*p==' ' || *p=='\t';p++)
@@ -182,8 +182,7 @@ main(int argc, char *argv[])
rl_catch_sigwinch = 1;
rl_terminal_name = "xterm";
rl_readline_name = "Genius";
- rl_attempted_completion_function =
- (CPPFunction *)tab_completion;
+ rl_attempted_completion_function = tab_completion;
while(fgets(buf,4096,infp)) {
int count;

17
math/genius/patches/patch-src_genius.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-src_genius.c,v 1.1 2014/09/23 22:52:01 jperkin Exp $
Don't include termcap.h on SunOS.
--- src/genius.c.orig 2013-04-24 23:18:19.000000000 +0000
+++ src/genius.c
@@ -61,8 +61,10 @@
#include <term.h>
#endif
#else
+#ifndef __sun
#include <termcap.h>
#endif
+#endif
#include <vicious.h>

12
math/genius/patches/patch-src_inter.c Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-src_inter.c,v 1.1 2014/04/21 18:17:35 joerg Exp $
--- src/inter.c.orig 2014-04-20 18:19:20.000000000 +0000
+++ src/inter.c
@@ -366,6 +366,5 @@ void
init_inter(void)
{
rl_readline_name = "Genius";
- rl_attempted_completion_function =
- (CPPFunction *)tab_completion;
+ rl_attempted_completion_function = tab_completion;
}

5
math/glpk/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.39 2014/02/14 09:25:49 adam Exp $
# $NetBSD: Makefile,v 1.41 2014/08/30 11:19:52 adam Exp $
DISTNAME= glpk-4.53
DISTNAME= glpk-4.55
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=glpk/}
@@ -16,4 +16,5 @@ CONFIGURE_ARGS+= --with-gmp
TEST_TARGET= check
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

3
math/glpk/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.10 2010/03/24 21:54:16 asau Exp $
# $NetBSD: buildlink3.mk,v 1.11 2014/04/01 08:38:35 adam Exp $
BUILDLINK_TREE+= glpk
@@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.glpk+= glpk>=4.35nb1
BUILDLINK_PKGSRCDIR.glpk?= ../../math/glpk
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.endif # GLPK_BUILDLINK3_MK
BUILDLINK_TREE+= -glpk

10
math/glpk/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.32 2014/02/14 09:25:49 adam Exp $
$NetBSD: distinfo,v 1.34 2014/08/30 11:19:52 adam Exp $
SHA1 (glpk-4.53.tar.gz) = 7f61e646d4d669805ac252d62005dfd2ff818d23
RMD160 (glpk-4.53.tar.gz) = 457c0ee03c61ab395f5411311e2baf3c3583c9b5
Size (glpk-4.53.tar.gz) = 2803321 bytes
SHA1 (patch-src_glpapi06.c) = 0037423f2a4e85d2e93c659debdf6191c01ef695
SHA1 (glpk-4.55.tar.gz) = 893058aada022a8dfc63c675ebcd7e7e86a3a363
RMD160 (glpk-4.55.tar.gz) = 850fd32e3f7261e9ddbfd87ff05d848cc7d505e1
Size (glpk-4.55.tar.gz) = 3424345 bytes
SHA1 (patch-src_Makefile.in) = 1d9b7a1b668bf7e2452a2466d19ca3a30fc7202f

64
math/glpk/patches/patch-src_Makefile.in Normal file
View File

@@ -0,0 +1,64 @@
$NetBSD: patch-src_Makefile.in,v 1.2 2014/08/30 11:19:52 adam Exp $
Use external zlib.
--- src/Makefile.in.orig 2014-04-01 08:25:18.000000000 +0000
+++ src/Makefile.in
@@ -94,7 +94,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libglpk_la_LIBADD =
+libglpk_la_LIBADD = -lz
am_libglpk_la_OBJECTS = libglpk_la-avl.lo libglpk_la-bfd.lo \
libglpk_la-bfx.lo libglpk_la-glpapi01.lo \
libglpk_la-glpapi02.lo libglpk_la-glpapi03.lo \
@@ -151,13 +151,7 @@ am_libglpk_la_OBJECTS = libglpk_la-avl.l
libglpk_la-strspx.lo libglpk_la-strtrim.lo \
libglpk_la-triang.lo libglpk_la-wclique.lo \
libglpk_la-wclique1.lo libglpk_la-proxy.lo \
- libglpk_la-proxy1.lo libglpk_la-adler32.lo \
- libglpk_la-compress.lo libglpk_la-crc32.lo \
- libglpk_la-deflate.lo libglpk_la-gzclose.lo \
- libglpk_la-gzlib.lo libglpk_la-gzread.lo libglpk_la-gzwrite.lo \
- libglpk_la-inffast.lo libglpk_la-inflate.lo \
- libglpk_la-inftrees.lo libglpk_la-trees.lo \
- libglpk_la-uncompr.lo libglpk_la-zio.lo libglpk_la-zutil.lo
+ libglpk_la-proxy1.lo
libglpk_la_OBJECTS = $(am_libglpk_la_OBJECTS)
libglpk_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -310,8 +304,7 @@ libglpk_la_CPPFLAGS = \
-I$(srcdir)/env \
-I$(srcdir)/minisat \
-I$(srcdir)/misc \
--I$(srcdir)/proxy \
--I$(srcdir)/zlib
+-I$(srcdir)/proxy
libglpk_la_LDFLAGS = \
-version-info 37:2:1 \
@@ -447,22 +440,7 @@ misc/triang.c \
misc/wclique.c \
misc/wclique1.c \
proxy/proxy.c \
-proxy/proxy1.c \
-zlib/adler32.c \
-zlib/compress.c \
-zlib/crc32.c \
-zlib/deflate.c \
-zlib/gzclose.c \
-zlib/gzlib.c \
-zlib/gzread.c \
-zlib/gzwrite.c \
-zlib/inffast.c \
-zlib/inflate.c \
-zlib/inftrees.c \
-zlib/trees.c \
-zlib/uncompr.c \
-zlib/zio.c \
-zlib/zutil.c
+proxy/proxy1.c
all: all-am

15
math/glpk/patches/patch-src_glpapi06.c
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-src_glpapi06.c,v 1.1 2014/02/14 09:25:49 adam Exp $
Function should return a value.
--- src/glpapi06.c.orig 2014-02-14 09:20:28.000000000 +0000
+++ src/glpapi06.c
@@ -815,7 +815,7 @@ int glp_get_it_cnt(glp_prob *P)
int glp_set_it_cnt(glp_prob *P, int it_cnt)
{ /* set simplex solver iteration count */
P->it_cnt = it_cnt;
- return;
+ return P->it_cnt;
}
#endif

7
math/gnome-calculator/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2014/01/25 12:57:30 prlw1 Exp $
# $NetBSD: Makefile,v 1.4 2014/11/25 12:04:19 wiz Exp $
DISTNAME= gnome-calculator-3.10.2
DISTNAME= gnome-calculator-3.14.1
CATEGORIES= math gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-calculator/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
@@ -22,7 +22,8 @@ USE_PKGLOCALEDIR= yes
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../lang/vala018/buildlink3.mk"
.include "../../lang/vala/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/gtksourceview3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

9
math/gnome-calculator/PLIST
View File

@@ -1,11 +1,14 @@
@comment $NetBSD: PLIST,v 1.1 2014/01/25 12:35:19 prlw1 Exp $
@comment $NetBSD: PLIST,v 1.2 2014/11/25 12:04:19 wiz Exp $
bin/gcalccmd
bin/gnome-calculator
libexec/gnome-calculator-search-provider
man/man1/gcalccmd.1
man/man1/gnome-calculator.1
share/appdata/gnome-calculator.appdata.xml
share/applications/gcalctool.desktop
share/applications/gnome-calculator.desktop
share/dbus-1/services/org.gnome.Calculator.SearchProvider.service
share/glib-2.0/schemas/org.gnome.calculator.gschema.xml
share/gnome-shell/search-providers/gnome-calculator-search-provider.ini
share/help/C/gnome-calculator/absolute.page
share/help/C/gnome-calculator/base.page
share/help/C/gnome-calculator/boolean.page
@@ -783,7 +786,6 @@ share/locale/el/LC_MESSAGES/gnome-calculator.mo
share/locale/en@shaw/LC_MESSAGES/gnome-calculator.mo
share/locale/en_CA/LC_MESSAGES/gnome-calculator.mo
share/locale/en_GB/LC_MESSAGES/gnome-calculator.mo
share/locale/en_US/LC_MESSAGES/gnome-calculator.mo
share/locale/eo/LC_MESSAGES/gnome-calculator.mo
share/locale/es/LC_MESSAGES/gnome-calculator.mo
share/locale/et/LC_MESSAGES/gnome-calculator.mo
@@ -792,6 +794,7 @@ share/locale/fa/LC_MESSAGES/gnome-calculator.mo
share/locale/fi/LC_MESSAGES/gnome-calculator.mo
share/locale/fr/LC_MESSAGES/gnome-calculator.mo
share/locale/ga/LC_MESSAGES/gnome-calculator.mo
share/locale/gd/LC_MESSAGES/gnome-calculator.mo
share/locale/gl/LC_MESSAGES/gnome-calculator.mo
share/locale/gu/LC_MESSAGES/gnome-calculator.mo
share/locale/he/LC_MESSAGES/gnome-calculator.mo

Some files were not shown because too many files have changed in this diff Show More