Index: head/audio/snd/Makefile =================================================================== --- head/audio/snd/Makefile (revision 439927) +++ head/audio/snd/Makefile (revision 439928) @@ -1,88 +1,89 @@ # Created by: trevor # $FreeBSD$ PORTNAME= snd PORTVERSION= 15.7 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ccrma-ftp.stanford.edu/pub/Lisp/ \ SF MAINTAINER= portmaster@bsdforge.com COMMENT= Multitracking sound editor and utilities LICENSE= snd LICENSE_NAME= snd license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept OPTIONS_DEFINE= FFTW3 GSL S7 LADSPA MOTIF GTK2 X11 DOCS EXAMPLES OPTIONS_DEFAULT= FFTW3 GSL LADSPA GTK2 X11 FFTW3_DESC= Use FFTW GSL_DESC= Use GNU Scientific Library S7_DESC= Use S7 as the extension language GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-float-samples MAKEFILE= makefile ALL_TARGET= snd snd-info sndplay MAKE_JOBS_UNSAFE= yes CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW3_CONFIGURE_WITH= fftw GSL_LIB_DEPENDS= libgsl.so:math/gsl GSL_CONFIGURE_WITH= gsl S7_CONFIGURE_WITH= s7 LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_CONFIGURE_WITH= ladspa GTK2_USE= GNOME=gtk20 GTK2_CONFIGURE_WITH= gtk MOTIF_USES= motif MOTIF_CONFIGURE_WITH= motif X11_CONFIGURE_ON= --with-no-gui post-patch: @${REINPLACE_CMD} -e 's|^ _Complex| Vaiolate _Complex|g ; \ s|-O2 -I|-I|g ; \ s|LDFLAGS -ldl|LDFLAGS|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|^sndinfo:|snd-info:|g ; \ s|-o sndinfo|-o snd-info|g' ${WRKSRC}/makefile.in do-install: .for i in snd snd-info sndplay ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_MAN} ${WRKSRC}/snd.1 ${STAGEDIR}${MANPREFIX}/man/man1/ do-install-S7-on: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.scm ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}/tools ${INSTALL_DATA} ${WRKSRC}/tools/*.scm ${STAGEDIR}${DATADIR}/tools @${MKDIR} ${STAGEDIR}${DATADIR}/sndins/samples ${INSTALL_DATA} ${WRKSRC}/sndins/samples/*.scm ${STAGEDIR}${DATADIR}/sndins/samples do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in HISTORY.Snd README.Snd ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}/pix ${INSTALL_DATA} ${WRKSRC}/pix/*.png ${STAGEDIR}${DOCSDIR}/pix do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/DotEmacs ${STAGEDIR}${EXAMPLESDIR} .include Index: head/benchmarks/flowgrind/Makefile =================================================================== --- head/benchmarks/flowgrind/Makefile (revision 439927) +++ head/benchmarks/flowgrind/Makefile (revision 439928) @@ -1,27 +1,28 @@ # Created by: Lars Eggert # $FreeBSD$ PORTNAME= flowgrind PORTVERSION= 0.8.0 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= benchmarks MAINTAINER= dbaio@bsd.com.br COMMENT= Measure throughput and other metrics for TCP LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgsl.so:math/gsl \ libxmlrpc.so:net/xmlrpc-c \ libcurl.so:ftp/curl \ libwwwxml.so:www/libwww \ libuuid.so:misc/e2fsprogs-libuuid USE_GITHUB= yes USES= autoreconf ssl GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${LIBS} -lpcap" .include Index: head/biology/bcftools/Makefile =================================================================== --- head/biology/bcftools/Makefile (revision 439927) +++ head/biology/bcftools/Makefile (revision 439928) @@ -1,54 +1,55 @@ # Created by: Reed A. Cartwright # $FreeBSD$ PORTNAME= bcftools PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= biology MAINTAINER= cartwright@asu.edu COMMENT= Tools for manipulating next-generation sequencing data LICENSE= MIT # LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= htslib>=1.3:biology/htslib LIB_DEPENDS= libhts.so:biology/htslib TEST_DEPENDS= bash:shells/bash CONFLICTS_BUILD=openssl USE_GITHUB= yes GH_ACCOUNT= samtools USES= gmake perl5 shebangfix USE_PERL5= test SUB_FILES= pkg-message SHEBANG_FILES= vcfutils.pl plot-vcfstats plugins/color-chrs.pl test/test.pl OPTIONS_DEFINE= GPL GPL_DESC= Enable modules that rely on GPL code OPTIONS_DEFAULT= GPL GPL_LIB_DEPENDS= libgsl.so:math/gsl .include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ INSTALL_DATA="${INSTALL_DATA}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DIR="${MKDIR}" .if ${PORT_OPTIONS:MGPL} MAKE_ENV+= USE_GPL=1 LICENSE= GPLv3 .endif PLIST_SUB= PORTVERSION="${PORTVERSION}" TEST_TARGET= test .include Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile (revision 439927) +++ head/comms/gnuradio/Makefile (revision 439928) @@ -1,125 +1,125 @@ # $FreeBSD$ PORTNAME= gnuradio PORTVERSION= 3.7.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ LOCAL/db MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio Software defined radio LICENSE= GPLv3 BUILD_DEPENDS= sdl-config:devel/sdl12 \ swig2.0:devel/swig20 \ cheetah:devel/py-cheetah \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ xdg-open:devel/xdg-utils \ guile:lang/guile \ aconnect:audio/alsa-utils \ git:devel/git \ ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem LIB_DEPENDS= libcppunit.so:devel/cppunit \ libcodec2.so:audio/codec2 \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libqwt.so:x11-toolkits/qwt5 \ libboost_python.so:devel/boost-python-libs \ libportaudio.so:audio/portaudio \ libjack.so:audio/jack \ libasound.so:audio/alsa-lib \ libgsl.so:math/gsl \ libgsm.so:audio/gsm \ libboost_date_time.so:devel/boost-libs \ liborc-0.4.so:devel/orc RUN_DEPENDS:= ${BUILD_DEPENDS} # USES=compiler:c11 is necessary because base GCC fails: # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow': # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm' # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints USES= cmake:outsource compiler:c11 iconv perl5 pkgconfig pyqt:4 python:2.7 shebangfix SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ -DENABLE_GR_CTRLPORT="YES" \ -DLOCALBASE:STRING="${LOCALBASE}" \ -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace MAJOR_SUB_VER= ${PORTVERSION} DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION} USE_GNOME= pygtk2 USE_PYQT= core gui opengl USE_WX= 3.0+ USE_QT4= corelib gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run USE_LDCONFIG= yes PLIST_SUB+= MAJOR_VERSION="3" PLIST_SUB+= MAJOR_SUB_VER="${MAJOR_SUB_VER}" LIBSTRIP_FILES= analog atsc audio blocks channels digital dtv fcd fec fft\ filter noaa pager pmt qtgui runtime trellis video-sdl\ vocoder wavelet wxgui OPTIONS_DEFINE= UHD TESTING DOXYGEN # Unfortunately building docs on i386 fails ##OPTIONS_EXCLUDE_${i386}= DOXYGEN # Yay. building docs is broken on 10 and HEAD too so turn them all off OPTIONS_EXCLUDE= DOXYGEN OPTIONS_DEFAULT= UHD OPTIONS_SUB= yes UHD_DESC= Include UHD support from Ettus TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ sphinx-apidoc:textproc/py-sphinx \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf DOXYGEN_CMAKE_ON= -DENABLE_DOXYGEN:STRING="ON" \ -DENABLE_DOCS:STRING="ON" \ -DENABLE_BAD_BOOST="ON" DOXYGEN_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ -DENABLE_DOCS:STRING="OFF" \ -DENABLE_BAD_BOOST="ON" HAVE_PORTDOCS= YES UHD_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" UHD_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" TESTING_CMAKE_ON= -DENABLE_TESTING:STRING="ON" TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF" TESTING_BUILD_DEPENDS= cppunit-config:devel/cppunit .include .if ${PORT_OPTIONS:MUHD} LIBSTRIP_FILES+= uhd LIB_DEPENDS+= libuhd.so:comms/uhd .endif PATCH_FILES= docs/doxygen/Doxyfile.in \ gr-fec/lib/CMakeLists.txt post-patch: @${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ ${XARGS} ${REINPLACE_CMD} -e \ "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g" .for p in ${PATCH_FILES} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/${p} .endfor post-install: .for a in ${LIBSTRIP_FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER} .endfor .include Index: head/editors/calligra/Makefile =================================================================== --- head/editors/calligra/Makefile (revision 439927) +++ head/editors/calligra/Makefile (revision 439928) @@ -1,98 +1,98 @@ # $FreeBSD$ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= editors kde MASTER_SITES= KDE/${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE graphic art and office suite LIB_DEPENDS= libpng.so:graphics/png \ libIlmImf.so:graphics/OpenEXR \ libboost_thread.so:devel/boost-libs \ libqca.so:devel/qca \ libexiv2.so:graphics/exiv2 \ liblcms2.so:graphics/lcms2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwpd-0.10.so:textproc/libwpd010 \ libwpg-0.3.so:graphics/libwpg03 \ libpoppler-qt4.so:graphics/poppler-qt4 \ libopenjpeg.so:graphics/openjpeg15 \ libfftw3.so:math/fftw3 \ libtiff.so:graphics/tiff \ libgsl.so:math/gsl \ libwps-0.3.so:textproc/libwps03 \ libvisio-0.1.so:textproc/libvisio01 \ libOpenColorIO.so:graphics/opencolorio \ libodfgen-0.1.so:textproc/libodfgen01 \ libetonyek-0.1.so:graphics/libetonyek01 \ librevenge-0.0.so:textproc/librevenge BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \ pstoedit:graphics/pstoedit RUN_DEPENDS= pstoedit:graphics/pstoedit USE_GL= glew USE_GNOME= glib20 libxml2 libxslt USE_KDE= kactivities kdelibs libkdcraw \ okular pimlibs attica automoc4 soprano USE_QT4= corelib dbus designer_build gui opengl phonon \ qtestlib_build script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build USES= cmake:outsource cpe compiler:c++11-lang iconv:translit jpeg \ kde:4 perl5 pkgconfig shared-mime-info sqlite tar:xz CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \ -DPRODUCTSET:STRING="DESKTOP" USE_LDCONFIG= yes PLIST_SUB+= SHLIB_VER=14.0.0 \ SHLIB_SHVER=14 OPTIONS_DEFINE= GMIC MARBLE MYSQL PGSQL SYBASE OPTIONS_DEFAULT=MARBLE MYSQL PGSQL OPTIONS_SUB= yes # GMIC does not mix well with clang as compiler. It needs >20GB of memory to be # built, which is not sensible on most systems # See bug report: https://llvm.org/bugs/show_bug.cgi?id=22199 GMIC_DESC= Build the G'Mic plugin (needs lots and lots of RAM) GMIC_CMAKE_ON= -DWITH_GMIC:BOOL=ON GMIC_CMAKE_OFF= -DWITH_GMIC:BOOL=OFF MARBLE_DESC= World globe widget support via Marble MARBLE_USE= KDE=marble MARBLE_CMAKE_OFF=-DWITH_Marble:BOOL=FALSE MYSQL_DESC= MySQL database support in Kexi MYSQL_USE= MYSQL=yes MYSQL_CMAKE_OFF=-DWITH_MySQL:BOOL=FALSE PGSQL_DESC= PostgreSQL database support in Kexi PGSQL_LIB_DEPENDS=libpqxx-3.1.so:databases/postgresql-libpqxx3 PGSQL_USES= pgsql PGSQL_CMAKE_OFF=-DWITH_PostgreSQL:BOOL=FALSE SYBASE_DESC= Sybase database support in Kexi SYBASE_LIB_DEPENDS=libsybdb.so:databases/freetds SYBASE_CMAKE_OFF=-DWITH_FreeTDS:BOOL=FALSE post-patch: # They require memalign() to build; as they're not installed, they're just a # waste of CPU cycles. @${REINPLACE_CMD} -e '/add_subdirectory.*benchmarks/ d' \ ${PATCH_WRKSRC}/krita/CMakeLists.txt # Prevent updating MIME during build/install. @${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ ${PATCH_WRKSRC}/filters/libmsooxml/CMakeLists.txt \ ${PATCH_WRKSRC}/filters/plan/mpxj/import/CMakeLists.txt \ ${PATCH_WRKSRC}/filters/stage/keynote/import/CMakeLists.txt \ ${PATCH_WRKSRC}/filters/words/wiki/CMakeLists.txt \ ${PATCH_WRKSRC}/krita/data/CMakeLists.txt \ ${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \ ${PATCH_WRKSRC}/krita/plugins/formats/ora/CMakeLists.txt \ ${PATCH_WRKSRC}/plugins/vectorshape/CMakeLists.txt .include Index: head/graphics/amide/Makefile =================================================================== --- head/graphics/amide/Makefile (revision 439927) +++ head/graphics/amide/Makefile (revision 439928) @@ -1,59 +1,59 @@ # $FreeBSD$ PORTNAME= amide PORTVERSION= 1.0.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= madpilot@FreeBSD.org COMMENT= Medical Imaging Data Examiner LICENSE= GPLv2 BUILD_DEPENDS= gm4:devel/m4 GNU_CONFIGURE= yes USE_CSTD= gnu89 MAKE_JOBS_UNSAFE= yes USES= gettext gmake pkgconfig tar:tgz USE_GNOME= gtk20 intltool libgnomecanvas libgnomeui libxml2 gnomedocutils INSTALLS_OMF= yes OPTIONS_DEFINE= CODEC DCMTK GSL NLS VOLPACK XMEDCON OPTIONS_SINGLE= CODEC OPTIONS_SINGLE_CODEC= FFMPEG FAME OPTIONS_DEFAULT= CODEC DCMTK FFMPEG GSL VOLPACK XMEDCON CODEC_DESC= Enable codec support. Choose one of FAME or FFMPEG DCMTK_DESC= Use dcmtk FAME_DESC= Use libfame FFMPEG_DESC= Use ffmpeg GSL_DESC= Use gsl VOLPACK_DESC= Use volpack XMEDCON_DESC= Use xmedcon OPTIONS_SUB= yes DCMTK_CONFIGURE_ON= --enable-libdcmdata DCMTK_CONFIGURE_OFF= --enable-libdcmdata=no DCMTK_LIB_DEPENDS= libdcmdata.so:devel/dcmtk FAME_CONFIGURE_ENABLE= libfame FAME_LIB_DEPENDS= libfame.so:multimedia/libfame FFMPEG_CONFIGURE_ENABLE= ffmpeg FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg GSL_CONFIGURE_ENABLE= libgsl GSL_LIB_DEPENDS= libgsl.so:math/gsl VOLPACK_CONFIGURE_ENABLE= libvolpack VOLPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/libvolpack.a:graphics/volpack XMEDCON_CONFIGURE_ENABLE= libmdc XMEDCON_LIB_DEPENDS= libmdc.so:graphics/xmedcon NLS_CONFIGURE_ENABLE= nls post-patch: @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \ ${WRKSRC}/amide_config.h.in @${REINPLACE_CMD} \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/configure .include Index: head/graphics/amide/files/patch-gsl_2x =================================================================== --- head/graphics/amide/files/patch-gsl_2x (nonexistent) +++ head/graphics/amide/files/patch-gsl_2x (revision 439928) @@ -0,0 +1,44 @@ +Obtained from: +https://sourceforge.net/p/amide/mailman/message/34638848/ + +Description: Fix compilation against GSL >= 2.0 +Author: Gert Wollny +Last-Update: Sun, 22 Nov 2015 14:21:00 +0000 +Bug-Debian: http://bugs.debian.org/805748 + +--- src/tb_profile.c 2015-11-22 14:00:16.361526795 +0100 ++++ src/tb_profile.c 2015-11-22 14:14:58.993881660 +0100 +@@ -32,6 +32,7 @@ + #include "ui_common.h" + #ifdef AMIDE_LIBGSL_SUPPORT + #include ++#include + #endif + + +@@ -605,6 +606,7 @@ + result_t * result; + gsl_multifit_fdfsolver * solver; + gsl_matrix *covar; ++ gsl_matrix *J; + gsl_multifit_function_fdf fdf; + gsl_vector * init_p; + gint iter; +@@ -668,8 +670,16 @@ + } + while ((status == GSL_CONTINUE) && (iter < 100)); + ++#if GSL_MAJOR_VERSION > 1 ++ { ++ gsl_matrix *J = gsl_matrix_alloc (result->line->len, num_p);; ++ gsl_multifit_fdfsolver_jac(solver, J); ++ gsl_multifit_covar (J, 0.0, covar); ++ gsl_matrix_free(J); ++ } ++#else + gsl_multifit_covar (solver->J, 0.0, covar); +- ++#endif + j=0; + result->s_fit = gsl_vector_get(solver->x, j++); + result->p_fit = gsl_vector_get(solver->x, j++); Property changes on: head/graphics/amide/files/patch-gsl_2x ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/enblend/Makefile =================================================================== --- head/graphics/enblend/Makefile (revision 439927) +++ head/graphics/enblend/Makefile (revision 439928) @@ -1,60 +1,60 @@ # Created by: cartola@openit.com.br # $FreeBSD$ PORTNAME= enblend PORTVERSION= 4.1.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/enblend/enblend-enfuse/enblend-enfuse-${PORTVERSION:R} DISTNAME= enblend-enfuse-${PORTVERSION} MAINTAINER= grog@FreeBSD.org COMMENT= Tool for image blending with multiresolution splines LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= help2man:misc/help2man \ OpenEXR>=1.0:graphics/OpenEXR LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libtiff.so:graphics/tiff \ libboost_filesystem.so:devel/boost-libs \ libvigraimpex.so:graphics/vigra \ libgsl.so:math/gsl RUN_DEPENDS= OpenEXR>=1.0:graphics/OpenEXR USE_AUTOTOOLS= automake:env autoconf:env USES= compiler:features gmake jpeg localbase makeinfo # We need a newer version of makeinfo for this. # Remove this line when we remove texinfo from the base system. CONFIGURE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" \ --with-boost-filesystem USE_GL= glew glut GNU_CONFIGURE= yes INFO= enfuse enblend PLIST_FILES= bin/enblend bin/enfuse man/man1/enblend.1.gz man/man1/enfuse.1.gz PORTDOCS= AUTHORS NEWS README OPTIONS_DEFINE= DOCS .include .if ${COMPILER_TYPE} == gcc # GCC 4.2 has some problems, see # http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a # Clang, on 10.0-RELEASE is fine. USE_GCC= yes .else CXXFLAGS+= -Wno-c++11-extensions .endif post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.info ${STAGEDIR}${PREFIX}/${INFO_PATH} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/graphics/inkscape/Makefile =================================================================== --- head/graphics/inkscape/Makefile (revision 439927) +++ head/graphics/inkscape/Makefile (revision 439928) @@ -1,90 +1,90 @@ # Created by: Alexander Nedotsukov # $FreeBSD$ PORTNAME= inkscape PORTVERSION= 0.92.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ \ LOCAL/kwm MAINTAINER= gnome@FreeBSD.org COMMENT= Full featured open source SVG editor LICENSE= GPLv2+ GPLv3+ LGPL21 MPL LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/GPL2.txt LICENSE_FILE_GPLv3= ${WRKSRC}/GPL3.txt LICENSE_FILE_LGPL2= ${WRKRSC}/LGPL2.txt BUILD_DEPENDS= ${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs LIB_DEPENDS= libpopt.so:devel/popt \ libgc.so:devel/boehm-gc \ libgsl.so:math/gsl \ libgtkspell.so:textproc/gtkspell \ liblcms2.so:graphics/lcms2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpotrace.so:graphics/libpotrace \ libpng.so:graphics/png \ libMagick++-6.so:graphics/ImageMagick #aspell? #RUN_DEPENDS= p5-XML-XQL>=0:textproc/p5-XML-XQL USE_GNOME= gtkmm24 libxslt USES= compiler:c++11-lib cmake cpe desktop-file-utils \ gmake iconv jpeg pathfix perl5 pkgconfig python:2 \ shebangfix tar:bzip2 USE_XORG= x11 INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO python_CMD?= ${LOCALBASE}/bin/python2 SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \ share/extensions/*.py share/extensions/genpofiles.sh \ fix-roff-punct OPTIONS_DEFINE= POPPLER VISIO CDR DBUS WPG OPTIONS_DEFAULT=POPPLER VISIO CDR WPG OPTIONS_SUB= yes CDR_DESC= Support for CorelDRAW diagrams CDR_CMAKE_BOOL= WITH_LIBCDR CDR_LIB_DEPENDS= librevenge-stream-0.0.so:textproc/librevenge \ libcdr-0.1.so:graphics/libcdr01 DBUS_CMAKE_BOOL= WITH_DBUS DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus #OPENMP_USES= compiler:openmp #OPENMP_USES_OFF= compiler:c++11-lib #OPENMP_CMAKE_BOOL= WITH_OPENMP CMAKE_ARGS+= -DWITH_OPENMP:BOOL=NO POPPLER_DESC= PDF preview rendering POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler \ libpoppler-glib.so:graphics/poppler-glib VISIO_DESC= Support for Microsoft Visio diagrams VISIO_CMAKE_BOOL= WITH_LIBVISIO VISIO_LIB_DEPENDS= librevenge-stream-0.0.so:textproc/librevenge \ libvisio-0.1.so:textproc/libvisio01 WPG_DESC= Support for WordPerfect graphics WPG_CMAKE_BOOL= WITH_LIBWPG WPG_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 # temporary until the build works for the !NLS case USES+= gettext #NLS_CMAKE_BOOL= WITH_NLS #NLS_USES= gettext post-patch: @${REINPLACE_CMD} -e 's|COMMAND python|COMMAND python2|g' \ ${WRKSRC}/share/*/CMakeLists.txt .include Index: head/graphics/luminance/Makefile =================================================================== --- head/graphics/luminance/Makefile (revision 439927) +++ head/graphics/luminance/Makefile (revision 439928) @@ -1,66 +1,66 @@ # Created by: Yinghong Liu # $FreeBSD$ PORTNAME= luminance-hdr DISTVERSION= 2.3.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} MAINTAINER= h2+fbsdports@fsfe.org COMMENT= Complete open source solution for HDR photography LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libexiv2.so:graphics/exiv2 \ libIlmImf.so:graphics/OpenEXR \ libtiff.so:graphics/tiff \ libgsl.so:math/gsl \ libraw_r.so:graphics/libraw \ libboost_system.so:devel/boost-libs USES= cmake jpeg tar:bzip2 USE_QT4= gui sql webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build imageformats_run INSTALLS_ICONS= yes CONFLICTS_INSTALL= luminance-hdr-qt5-* OPTIONS_DEFINE= DOCS post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @${REINPLACE_CMD} -e '/LICENSE/d ; \ /#info files/s,share/luminance-hdr,${DOCSDIR_REL},' \ ${WRKSRC}/CMakeLists.txt # Point to the right location for program where to look for GPL text @${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \ s,share/doc/luminance-hdr,share/licenses/${PKGNAME},' \ ${WRKSRC}/src/UI/UMessageBox.cpp # Allow builds from release distfile to display correct git hash in "About" # dialog window @${REINPLACE_CMD} -e \ 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in # Include in addition to where necessary, as this # is required for building with libc++ @${REINPLACE_CMD} -E '1s|^|#include \|;' \ ${WRKSRC}/src/TonemappingOperators/drago03/pfstmo_drago03.cpp \ ${WRKSRC}/src/TonemappingOperators/reinhard02/pfstmo_reinhard02.cpp \ ${WRKSRC}/src/TonemappingOperators/reinhard05/pfstmo_reinhard05.cpp \ ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_function.cpp \ ${WRKSRC}/src/TonemappingOperators/mantiuk08/display_size.cpp \ ${WRKSRC}/src/TonemappingOperators/mantiuk08/pfstmo_mantiuk08.cpp \ ${WRKSRC}/src/TonemappingOperators/fattal02/pfstmo_fattal02.cpp \ ${WRKSRC}/src/TonemappingOperators/durand02/pfstmo_durand02.cpp \ ${WRKSRC}/src/TonemappingOperators/pattanaik00/pfstmo_pattanaik00.cpp \ ${WRKSRC}/src/Libpfs/io/pfsreader.cpp \ ${WRKSRC}/src/Libpfs/io/rgbereader.cpp \ ${WRKSRC}/src/Libpfs/colorspace/colorspace.cpp .include Index: head/graphics/luminance-qt5/Makefile =================================================================== --- head/graphics/luminance-qt5/Makefile (revision 439927) +++ head/graphics/luminance-qt5/Makefile (revision 439928) @@ -1,57 +1,57 @@ # Created by: Yinghong Liu # $FreeBSD$ PORTNAME= luminance-hdr DISTVERSION= 2.4.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 MAINTAINER= h2+fbsdports@fsfe.org COMMENT= Complete open source solution for HDR photography LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libexiv2.so:graphics/exiv2 \ libIlmImf.so:graphics/OpenEXR \ libtiff.so:graphics/tiff \ libgsl.so:math/gsl \ libraw_r.so:graphics/libraw \ libboost_system.so:devel/boost-libs USES= cmake:outsource jpeg pkgconfig tar:bzip2 USE_QT5= concurrent declarative gui printsupport sql webkit xml \ buildtools_build linguist_build qmake_build \ imageformats_run INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE=yes CONFLICTS_INSTALL= luminance-hdr-[0-9]* OPTIONS_DEFINE= DOCS post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @${REINPLACE_CMD} -e '/LICENSE/d ; \ /#info files/s,share/luminance-hdr,${DOCSDIR_REL},' \ ${WRKSRC}/CMakeLists.txt # Point to the right location for program where to look for GPL text @${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \ s,share/doc/luminance-hdr,share/licenses/${PKGNAME},' \ ${WRKSRC}/src/UI/UMessageBox.cpp # Allow builds from release distfile to display correct git hash in "About" # dialog window @${REINPLACE_CMD} -e \ 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in pre-install: QT_BINDIR_REL=bin .include Index: head/graphics/nip2/Makefile =================================================================== --- head/graphics/nip2/Makefile (revision 439927) +++ head/graphics/nip2/Makefile (revision 439928) @@ -1,61 +1,62 @@ # Created by: Lev Serebryakov # $FreeBSD$ PORTNAME= nip2 PORTVERSION= 8.4.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ MAINTAINER= danilo@FreeBSD.org COMMENT= Graphical user interface for VIPS LICENSE= GPLv2 BUILD_DEPENDS= xdg-open:devel/xdg-utils LIB_DEPENDS= libvips.so:graphics/vips \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= xdg-open:devel/xdg-utils USES= bison desktop-file-utils dos2unix gettext gmake pkgconfig \ shared-mime-info DOS2UNIX_GLOB= *.def USE_GNOME= cairo gdkpixbuf2 gnomemimedata gtk20 libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-update-desktop LDFLAGS+= -lm SUB_FILES= run-nip2.sh OPTIONS_DEFINE= DOCS FFTW GOFFICE GRAPHVIZ GSF GSL OPTIONS_DEFAULT= FFTW GOFFICE GRAPHVIZ GSF GSL FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_WITH= fftw3 GOFFICE_DESC= Use libgoffice to show plots GOFFICE_LIB_DEPENDS= libgoffice-*.so:devel/goffice GOFFICE_CONFIGURE_WITH= libgoffice GRAPHVIZ_DESC= Use libgvc to show workspace dependency graphs GRAPHVIZ_LIB_DEPENDS= libgvc.so:graphics/graphviz GRAPHVIZ_CONFIGURE_WITH= libgvc GSF_DESC= Use libgsf to save plots to files GSF_USE= gnome=libgsf GSF_CONFIGURE_WITH= libgsf GSL_DESC= Use gsl for numeric functions GSL_LIB_DEPENDS= libgsl.so:math/gsl GSL_CONFIGURE_WITH= gsl post-install: (cd ${WRKDIR} && ${INSTALL_SCRIPT} run-nip2.sh \ ${STAGEDIR}/${PREFIX}/bin) test check: build # # Checks currently require ImageMagick's convert to be available # and aren't enabled by default. They take a long time -- tail # the log-file: # ${WRKSRC}/test/test_all.sh.log # (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) .include Index: head/graphics/pfstmo/Makefile =================================================================== --- head/graphics/pfstmo/Makefile (revision 439927) +++ head/graphics/pfstmo/Makefile (revision 439928) @@ -1,30 +1,30 @@ # Created by: Iouri V. Ivliev # $FreeBSD$ PORTNAME= pfstmo PORTVERSION= 1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION} MAINTAINER= ii@any.com.ru COMMENT= Tone mapping operators USE_GCC= any LIB_DEPENDS= libpfs-1.2.so:graphics/pfstools \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libgsl.so:math/gsl PFS_CPPFLAGS= -I${LOCALBASE}/include PFS_LDFLAGS= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV+= CPPFLAGS="${PFS_CPPFLAGS} ${DEBUG_FLAGS}" \ LDFLAGS="${PFS_LDFLAGS}" USES= gmake pkgconfig compiler:openmp .include Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile (revision 439927) +++ head/graphics/qgis/Makefile (revision 439928) @@ -1,188 +1,189 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 2_18_7 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de COMMENT= Geographical Information System (GIS) data viewer LICENSE= GPLv2 BUILD_DEPENDS= txt2tags:textproc/txt2tags LIB_DEPENDS= libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libproj.so:graphics/proj \ libqca.so:devel/qca \ libqjson.so:devel/qjson \ libqscintilla2.so:devel/qscintilla2 \ libqwt.so:x11-toolkits/qwt5 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} USES= bison cmake compiler:features cpe desktop-file-utils \ execinfo fortran gmake pyqt:4 python:2.7 sqlite USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run USE_QT4= corelib designer doc gui linguist_build moc_build \ network qmake_build rcc_build script sql sql-pgsql \ sql-sqlite3 svg testlib uic_build webkit xml USE_LDCONFIG= yes ICON_SIZES= 8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512 OPTIONS_DEFINE= PYTHON POSTGIS GRASS SERVER OPTIONS_GROUP= DEVELOPER OPTIONS_GROUP_DEVELOPER= CUSTOMWIDGETS ASTYLE TESTS DEBUG OPTIONS_DEFAULT= PYTHON POSTGIS NO_OPTIONS_SORT= yes OPTIONS_SUB= yes ASTYLE_DESC= Enable AStyle for QGis CUSTOMWIDGETS_DESC= Enable QT4/QGis Custom Widgets DEBUG_DESC= Write Debugging Output to Console SERVER_DESC= Enable QGIS server TESTS_DESC= Run the test suite after build process CMAKE_ARGS+= -DENABLE_QT5=OFF -DENABLE_PYTHON3=OFF \ -DWITH_ORACLE:BOOL=FALSE \ -DWITH_GLOBE:BOOL=FALSE .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_ARGS+= -DSUPPRESS_SIP_WARNINGS=OFF -DSUPPRESS_QT_WARNINGS=OFF CMAKE_ARGS+= -DWITH_INTERNAL_DATEUTIL=FALSE CMAKE_ARGS+= -DWITH_INTERNAL_FUTURE=FALSE CMAKE_ARGS+= -DWITH_INTERNAL_NOSE2=FALSE CMAKE_ARGS+= -DWITH_INTERNAL_PYTZ=FALSE CMAKE_ARGS+= -DWITH_INTERNAL_SIX=FALSE CMAKE_ARGS+= -DWITH_INTERNAL_YAML=FALSE .endif ASTYLE_RUN_DEPENDS= astyle:devel/astyle ASTYLE_CMAKE_ON= -DWITH_ASTYLE:BOOL=TRUE ASTYLE_CMAKE_OFF= -DWITH_ASTYLE:BOOL=FALSE CUSTOMWIDGETS_CMAKE_ON= -DWITH_CUSTOM_WIDGETS:BOOL=TRUE CUSTOMWIDGETS_CMAKE_OFF= -DWITH_CUSTOM_WIDGETS:BOOL=FALSE DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release GRASS_BUILD_DEPENDS= grass64:databases/grass GRASS_RUN_DEPENDS= grass64:databases/grass GRASS_CMAKE_ON= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.6 GRASS_FORCE_MAKE_JOBS= NO GRASS_CMAKE_OFF= -DWITH_GRASS:BOOL=FALSE POSTGIS_USES= pgsql POSTGIS_LIB_DEPENDS= liblwgeom.so:databases/postgis22 POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \ ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \ ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE TESTS_CMAKE_ON= -DENABLE_TESTS=TRUE TESTS_CMAKE_OFF= -DENABLE_TESTS=FALSE INSTALLS_ICONS= yes pre-patch: @${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "%1" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "" + tr( "${GH_TAGNAME}" ) + ""|g' \ ${WRKSRC}/src/app/qgisapp.cpp # [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23 # 'Hide shared library symbols by default on GCC and Clang', # some layer properties are not visible on FreeBSD > 9.x @${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|#SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|' \ ${WRKSRC}/CMakeLists.txt post-patch: @${REINPLACE_CMD} -e 's|/usr/bin/qgis|${LOCALBASE}/bin/qgis|g' \ ${WRKSRC}/debian/${PORTNAME}.desktop @${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' \ ${WRKSRC}/debian/${PORTNAME}.desktop @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \ ${WRKSRC}/python/ext-libs/pytz/tzfile.py \ ${WRKSRC}/scripts/generate_test_mask_image.py \ ${WRKSRC}/scripts/random_vector.py \ ${WRKSRC}/scripts/widgets_tree.py \ ${WRKSRC}/src/plugins/grass/qgis_grass_test.py \ ${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \ ${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \ ${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \ ${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \ ${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py @${REINPLACE_CMD} -e 's|markupsafe ||g' \ ${WRKSRC}/python/ext-libs/CMakeLists.txt post-install: ${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor .for SZ in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png .endfor check: (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) .include Index: head/graphics/xaos/Makefile =================================================================== --- head/graphics/xaos/Makefile (revision 439927) +++ head/graphics/xaos/Makefile (revision 439928) @@ -1,67 +1,67 @@ # Created by: Joseph Koshy # $FreeBSD$ PORTNAME= xaos PORTVERSION= 3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics math MASTER_SITES= SF/${PORTNAME}/XaoS/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Real-time fractal browser LIB_DEPENDS= libpng.so:graphics/png \ libgsl.so:math/gsl USES= gmake GNU_CONFIGURE= yes OPTIONS_DEFINE= THREADS NLS OPTIONS_MULTI= DRIVER OPTIONS_MULTI_DRIVER= AALIB GTK2 X11 DRIVER_DESC= User Interface OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_WITH= aa-driver AALIB_CONFIGURE_ON= ac_cv_aalib_ver_ok=yes GTK2_DESC= GTK+ User Interface (experimental) GTK2_USE= GNOME=gtk20 GTK2_USES= pkgconfig GTK2_CONFIGURE_WITH= gtk-driver X11_USE= XORG=x11,xext X11_CONFIGURE_WITH= x11-driver x NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls THREADS_DESC= Enable SMP support (experimental) THREADS_CONFIGURE_WITH= pthread THREADS_LIBS= -lpthread CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INFO= xaos PLIST_SUB+= XAOSDIR="share/XaoS" MAKE_JOBS_UNSAFE= yes DESKTOP_ENTRIES= "XaoS" "" "${PREFIX}/share/pixmaps/xaos.png" \ "xaos" "" false pre-configure: ${REINPLACE_CMD} -e 's,/usr\(/share/locale\),${PREFIX}\1,g' \ ${WRKSRC}/configure \ ${WRKSRC}/src/ui/ui.c ${REINPLACE_CMD} 's,malloc.h,stdlib.h,' \ ${WRKSRC}/src/ui/ui-drv/aa/ui_aa.c post-install: ${INSTALL_DATA} ${WRKSRC}/src/ui/ui-drv/qt/images/xaosbig.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/xaos.png .include Index: head/lang/algol68g/Makefile =================================================================== --- head/lang/algol68g/Makefile (revision 439927) +++ head/lang/algol68g/Makefile (revision 439928) @@ -1,39 +1,40 @@ # $FreeBSD$ PORTNAME= algol68g PORTVERSION= 2.8.4 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://jmvdveer.home.xs4all.nl/ MAINTAINER= johans@FreeBSD.org COMMENT= Algol 68 Genie compiler LICENSE= GPLv3+ LIB_DEPENDS= libgsl.so:math/gsl OPTIONS_DEFINE= PLOTUTILS PGSQL OPTIONS_DEFAULT=PLOTUTILS PGSQL PLOTUTILS_DESC= Plotting support via plotutils PLOTUTILS_LIB_DEPENDS= libplot.so:graphics/plotutils PLOTUTILS_CONFIGURE_ENABLE=plotutils PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= postgresql GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-compiler USES= readline PLIST_FILES= bin/a68g man/man1/a68g.1.gz \ include/algol68g/a68g.h include/algol68g/a68g-config.h post-patch: # Skip broken check, assume our $CC works @${REINPLACE_CMD} -Ee 's/.*(\*-freebsd)/\1/' \ -e 's|"xgcc"|"x${CC}"|; s/-ldl //' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/^install-data-am/s/install-docDATA//' \ ${WRKSRC}/Makefile.in .include Index: head/mail/bogofilter/Makefile =================================================================== --- head/mail/bogofilter/Makefile (revision 439927) +++ head/mail/bogofilter/Makefile (revision 439928) @@ -1,98 +1,98 @@ # Created by: Matthias Andree # $FreeBSD$ PORTNAME= bogofilter PORTVERSION= 1.2.4 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} MAINTAINER?= mandree@FreeBSD.org COMMENT= Fast, teachable, learning spam detector LICENSE= GPLv2 .if !defined(MASTERDIR) || ${MASTERDIR} == ${.CURDIR} # building master port USES+= bdb:5+ .endif OPTIONS_DEFINE= GSL UNICODE DOCS OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]* USES+= cpe perl5 shebangfix tar:bzip2 SHEBANG_FILES= contrib/randomtrain.sh contrib/scramble.sh \ src/tests/unsort.pl contrib/*.pl USE_PERL5= run GNU_CONFIGURE= yes CPE_VENDOR= bogofilter_project UNICODE_USES= iconv UNICODE_CONFIGURE_ENABLE= unicode GSL_LIB_DEPENDS= libgsl.so:math/gsl GSL_CONFIGURE_ARGS_OFF= --with-included-gsl PORTDOCS= * TEST_TARGET= check .include BF_LIBS?= -l${BDB_LIB_NAME} BF_CPPFLAGS?= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc .if ${PORT_OPTIONS:MUNICODE} BF_LIBS+= ${ICONV_LIB} .endif CPPFLAGS+= ${BF_CPPFLAGS} LIBS+= -L${LOCALBASE}/lib ${BF_LIBS} CONFIGURE_ENV+= PERL="${PERL}" INSTALL_TARGET= install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man post-patch: ${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \ -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \ ${WRKSRC}/src/tests/Makefile.am # XXX: disable self-tests until issue with automake-1.13 is sorted out # post-build:: # cd ${WRKSRC}/src && make check SHELL=${SH} post-install:: @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib .for i in html programmer xml @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} .endfor .for i in AUTHORS COPYING INSTALL NEWS README README.svn \ doc/README.validation TODO GETTING.STARTED \ RELEASE.NOTES doc/README.db doc/README.sqlite \ doc/integrating-with-postfix doc/integrating-with-qmail \ doc/bogofilter-tuning.HOWTO.html doc/bogofilter-SA-* \ doc/bogofilter-faq.html doc/bogofilter-faq-fr.html ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in README.randomtrain README.contrib ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i} .endfor ${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${STAGEDIR}${DOCSDIR}/AUTHORS.trio ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${STAGEDIR}${DOCSDIR}/xml ${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${STAGEDIR}${DOCSDIR}/programmer ${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${STAGEDIR}${PREFIX}/bin/ .for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \ mime.get.rfc822.pl parmtest.sh printmaildir.pl \ bogominitrain.pl \ randomtrain.sh scramble.sh spamitarium.pl stripsearch.pl trainbogo.sh ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i} .endfor .for i in dot-qmail-bogofilter-default \ mailfilter.example procmailrc.example vm-bogofilter.el ${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${STAGEDIR}${DOCSDIR}/contrib/${i} .endfor .include Index: head/math/asymptote/Makefile =================================================================== --- head/math/asymptote/Makefile (revision 439927) +++ head/math/asymptote/Makefile (revision 439928) @@ -1,90 +1,91 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= asymptote PORTVERSION= 2.37 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src MAINTAINER= nivit@FreeBSD.org COMMENT= Powerful script-based vector graphics language LICENSE= GPLv3 LGPL3 LICENSE_COMB= dual LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick \ gv:print/gv \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter ALL_TARGET= asy asy-keywords.el CONFIGURE_ARGS= --enable-gc=system CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes INSTALL_TARGET= install-asy MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} MAKE_JOBS_UNSAFE= yes ONLY_FOR_ARCHS= i386 amd64 USES= gettext-runtime ghostscript gmake ncurses perl5 python tar:tgz USE_GL= glut USE_PERL5= build USE_TEX= dvipsk formats WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} # Options DOCS_BUILD_DEPENDS= texi2dvi:print/texinfo DOCS_CONFIGURE_WITH= docdir=${DOCSDIR} FFTW_CONFIGURE_ENABLE= fftw FFTW_DESC= Use FFTW to compute the Discrete Fourier Transform FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 GSL_CONFIGURE_ENABLE= gsl GSL_DESC= Enable GNU Scientific library GSL_LIB_DEPENDS= libgsl.so:math/gsl MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo OFFSCREEN_CONFIGURE_ENABLE= offscreen OFFSCREEN_DESC= Enable offscreen rendering using OSMesa library OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE OPTIONS_DEFINE= DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE READLINE_CONFIGURE_ENABLE= readline READLINE_DESC= ${LIBEDIT_DESC} READLINE_USES= readline .include # Documentation .if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= html INSTALL_TARGET+= install-html .endif .if ${PORT_OPTIONS:MMANPAGES} INFO= asy-faq ALL_TARGET+= man INSTALL_TARGET+= install-man .endif post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure @${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \ ${WRKSRC}/settings.cc post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy .include Index: head/math/dieharder/Makefile =================================================================== --- head/math/dieharder/Makefile (revision 439927) +++ head/math/dieharder/Makefile (revision 439928) @@ -1,34 +1,34 @@ # Created by: bf # $FreeBSD$ PORTNAME= dieharder PORTVERSION= 3.31.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf MAINTAINER= ports@FreeBSD.org COMMENT= Random number generator testsuite LICENSE= GPLv2 LIB_DEPENDS= libgsl.so:math/gsl MAKE_JOBS_UNSAFE= yes USES= dos2unix libtool tar:tgz GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes .include .if ${ARCH} == "ia64" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64 or sparc64 .endif check test: build ${WRKSRC}/dieharder/dieharder -a .include Index: head/math/fflas-ffpack/Makefile =================================================================== --- head/math/fflas-ffpack/Makefile (revision 439927) +++ head/math/fflas-ffpack/Makefile (revision 439928) @@ -1,109 +1,109 @@ # Created by: b.f. # $FreeBSD$ PORTNAME= fflas-ffpack PORTVERSION= 1.4.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MASTER_SITES= http://linalg.org/ LOCAL/bf MAINTAINER= ports@FreeBSD.org COMMENT= Library for dense linear algebra over word-size finite fields LICENSE= LGPL20 LIB_DEPENDS= libgmp.so:math/gmp USES= shebangfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gmp="${LOCALBASE}" SHEBANG_FILES= fflas-ffpack-config.in OPTIONS_DEFINE= DOXYGEN OPTIMIZED_CFLAGS .include .if ${LOCALBASE} == "/usr/local" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(MAINTAINER_MODE) CONFIGURE_ARGS+= --with-givaro="${LOCALBASE}" LIB_DEPENDS+= libgivaro.so:math/givaro .else CONFIGURE_ARGS+= --with-givaro=no .endif #a C interface to BLAS is needed WITH_BLAS?= gsl .if ${WITH_BLAS} == "gotoblas" CONFIGURE_ARGS+= --with-gotoblas2="${LOCALBASE}" --with-lapack=blas LIB_DEPENDS+= libgoto2p.so:math/gotoblas USES+= fortran .elif ${WITH_BLAS} == "atlas" CONFIGURE_ARGS+= --with-cblas="${LOCALBASE}" --with-lapack=blas LIB_DEPENDS+= libcblas.so:math/atlas USES+= fortran .elif ${WITH_BLAS} == "gsl" CONFIGURE_ARGS+= --with-gsl="${LOCALBASE}" LIB_DEPENDS+= libgslcblas.so:math/gsl .else IGNORE = unknown value of WITH_BLAS: ${WITH_BLAS} .endif .if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:devel/doxygen CONFIGURE_ARGS+= --enable-doc --with-docdir="${DOCSDIR}" PLIST_SUB+= DOXYGEN="" .else PLIST_SUB+= DOXYGEN="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MANUAL_PACKAGE_BUILD= : optimizes for the build machine .else CONFIGURE_ARGS+= --disable-optimization .endif post-patch: ${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/{s/-O2 //;s/-pipe//;}' \ -e '/DEBUG_CFLAGS=.*-DNDEBUG/s/$${DEBUG_CFLAGS} //' \ -e '/^WARN_CFLAGS="-Wall"/d' \ -e '/if test "x$$WARN" = "xyes"/s/$$/ WARN_CFLAGS="-Wall" ;/' \ -e 's/\(-lgoto2\)\( -pthread\)\{0,1\}/\1p/g' -e 's/libgoto2/&p/g' \ -e '/"GOTO2")/{N; s/LAPACK_LIBS=""/LAPACK_LIBS="-lgoto2p"/; }' \ -e 's/liblapack_atlas/libalapack/g' \ -e 's/$${LAPACK_LIBS} -llapack_atlas/-lalapack -lf77blas -lcblas/g' \ ${WRKSRC}/configure #Unfortunately, we must leave stdint.h --> cstdint unresolved when not using #lang/gcc4*, or switch to TR1 headers, due to our aging base system libstdc++ ${REINPLACE_CMD} -E \ -e 's/(#include[[:blank:]]+<)(std)(arg|def|io|lib)(\.h>)/\1c\2\3>/' \ ${WRKSRC}/fflas-ffpack/field/nonzero-randiter.h \ ${WRKSRC}/fflas-ffpack/field/modular-randiter.h \ ${WRKSRC}/fflas-ffpack/utils/args-parser.h \ ${WRKSRC}/fflas-ffpack/utils/debug.h \ ${WRKSRC}/fflas-ffpack/utils/Matio.h \ ${WRKSRC}/utils/args-parser.h \ ${WRKSRC}/utils/debug.h \ ${WRKSRC}/utils/Matio.h .if ${PORT_OPTIONS:MDOXYGEN} @${REINPLACE_CMD} -e 's/sed -i/& ""/' ${WRKSRC}/doc/Makefile.in .endif .if ${PORT_OPTIONS:MDOXYGEN} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html ${TOUCH} ${STAGEDIR}${DOCSDIR}/fflas-ffpack-dev-html/.keep-me .endif .if defined(MAINTAINER_MODE) check regression-test test: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif .include Index: head/math/giacxcas/Makefile =================================================================== --- head/math/giacxcas/Makefile (revision 439927) +++ head/math/giacxcas/Makefile (revision 439928) @@ -1,117 +1,117 @@ # Created by: Frederic Han # $FreeBSD$ PORTNAME= giacxcas DISTVERSION= 1.2.2-57 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/:giac \ http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ DISTFILES= giac_${DISTVERSION}${EXTRACT_SUFX}:giac \ CoCoALib-0.9950.tgz \ fltk-giac.tar.gz DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Computer algebra system LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS= libgmp.so:math/gmp \ libpng.so:graphics/png \ libpari.so:math/pari \ libmpfr.so:math/mpfr \ libgsl.so:math/gsl RUN_DEPENDS= xdg-open:devel/xdg-utils NO_CDROM= French documentation is for non-commercial use only GNU_CONFIGURE= yes USES= blaslapack desktop-file-utils fortran gettext gmake jpeg \ libtool readline shebangfix USE_GL= gl USE_XORG= x11 xcursor xext xft xi xinerama USE_TEX= latex:build dvipsk:build USE_LDCONFIG= yes # Warning: don't remove the USE_GCC without a runtime test *after* make install USE_GCC= yes CONFIGURE_ENV= ac_cv_lib_X11_main=yes \ ac_cv_lib_cocoa_main=yes \ ac_cv_lib_fltk_gl_main=yes \ ac_cv_lib_fltk_main=yes \ ac_cv_lib_fltk_images_main=yes \ ac_cv_lib_jpeg_main=yes SHEBANG_FILES= src/pgiac INSTALL_TARGET= install-strip INSTALLS_ICONS= yes CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${COCOALIB-GIAC}/include \ -I${FLTKDEV-GIAC} \ -I${LOCALBASE}/include LDFLAGS+= -L${COCOALIB-GIAC}/lib \ -L${FLTKDEV-GIAC}/lib \ -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/giac-${DISTVERSION:C/-[0-9]*//} FLTKDEV-GIAC= ${WRKDIR}/fltk-1.3.0 COCOALIB-GIAC= ${WRKDIR}/CoCoALib-0.9950 DATADIR= ${PREFIX}/share/giac DOCSDIR= ${PREFIX}/share/doc/giac EXAMPLESDIR= ${PREFIX}/share/examples/giac INFO= giac_es giac_us OPTIONS_DEFINE= DOCS EXAMPLES #NB: built of giacxcas with USE_GCC and nlt is successfull if the ntl port is also # installed with USE_GCC CONFIGURE_ARGS+= --disable-ntl post-extract: @${FIND} ${WRKSRC}/examples/Exemples -name "._*" -delete post-patch: @${GREP} -Rl --null /bin/bash ${COCOALIB-GIAC} | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/bin/bash|/usr/bin/env bash|' @${REINPLACE_CMD} -e '/^SUBDIR/s|examples||' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' \ ${WRKSRC}/xcas.applications @${REINPLACE_CMD} -e 's|cp -f \*|$$(INSTALL_DATA) WARNINGS [a-z]*|' \ ${WRKSRC}/doc/el/*/Makefile.in @${REINPLACE_CMD} -e '/browser=/s|"mozilla"|"xdg-open"|' \ ${WRKSRC}/src/global.cc @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \ ${REINPLACE_CMD} -e 's|$$(prefix)/share/giac/doc|$$(docdir)|' @${FIND} ${COCOALIB-GIAC} -name "Makefile" | ${XARGS} \ ${REINPLACE_CMD} -e \ 's|\($$(MAKE) \)-s |\1|; s|\([[:blank:]]\)@|\1|' @${REINPLACE_CMD} -e '/.SILENT:/s|^|#|' \ ${FLTKDEV-GIAC}/makeinclude.in pre-configure: @(cd ${COCOALIB-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --with-libgmp=${LOCALBASE}/lib/libgmp.a \ --with-cxx="${CXX}") @(cd ${FLTKDEV-GIAC} && ${SETENV} ${CONFIGURE_ENV} ./configure \ --prefix=${FLTKDEV-GIAC} \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}") pre-build: @(cd ${COCOALIB-GIAC} && ${DO_MAKE_BUILD} \ CXXFLAGS_SPECIFIC="${CXXFLAGS}" library) @(cd ${FLTKDEV-GIAC}/src && ${DO_MAKE_BUILD}) post-install-DOCS-on: @${LN} -sf ../doc/giac ${STAGEDIR}${DATADIR}/doc post-install-EXAMPLES-on: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "Exemples [a-z]*" \ ${STAGEDIR}${EXAMPLESDIR}) @${LN} -sf ../examples/giac ${STAGEDIR}${DATADIR}/examples .include Index: head/math/gsl/Makefile =================================================================== --- head/math/gsl/Makefile (revision 439927) +++ head/math/gsl/Makefile (revision 439928) @@ -1,36 +1,35 @@ # Created by: Andrew L. Neporada # $FreeBSD$ PORTNAME= gsl -PORTVERSION= 1.16 -PORTREVISION= 2 +PORTVERSION= 2.3 CATEGORIES= math MASTER_SITES= GNU -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tcberner@FreeBSD.org COMMENT= The GNU Scientific Library - mathematical libs LICENSE= GPLv3 USES= libtool makeinfo pathfix USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= MAKEINFO='makeinfo --no-split' INSTALL_TARGET= install-strip INFO= gsl-ref post-extract: @${RM} ${WRKSRC}/doc/gsl-ref.info* #prevent regression test coredumps from causing failures on the #package-building cluster: .ifndef(MAINTAINER_MODE) CORELIMIT?= /usr/bin/limits -Sc 0 .endif check regression-test test: build @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} \ ${MAKE_ARGS} check .include Index: head/math/gsl/distinfo =================================================================== --- head/math/gsl/distinfo (revision 439927) +++ head/math/gsl/distinfo (revision 439928) @@ -1,2 +1,3 @@ -SHA256 (gsl-1.16.tar.gz) = 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 -SIZE (gsl-1.16.tar.gz) = 3534080 +TIMESTAMP = 1493276070 +SHA256 (gsl-2.3.tar.gz) = 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb +SIZE (gsl-2.3.tar.gz) = 4510731 Index: head/math/gsl/pkg-plist =================================================================== --- head/math/gsl/pkg-plist (revision 439927) +++ head/math/gsl/pkg-plist (revision 439928) @@ -1,236 +1,260 @@ bin/gsl-config bin/gsl-histogram bin/gsl-randist include/gsl/gsl_blas.h include/gsl/gsl_blas_types.h include/gsl/gsl_block.h include/gsl/gsl_block_char.h include/gsl/gsl_block_complex_double.h include/gsl/gsl_block_complex_float.h include/gsl/gsl_block_complex_long_double.h include/gsl/gsl_block_double.h include/gsl/gsl_block_float.h include/gsl/gsl_block_int.h include/gsl/gsl_block_long.h include/gsl/gsl_block_long_double.h include/gsl/gsl_block_short.h include/gsl/gsl_block_uchar.h include/gsl/gsl_block_uint.h include/gsl/gsl_block_ulong.h include/gsl/gsl_block_ushort.h include/gsl/gsl_bspline.h include/gsl/gsl_cblas.h include/gsl/gsl_cdf.h include/gsl/gsl_chebyshev.h include/gsl/gsl_check_range.h include/gsl/gsl_combination.h include/gsl/gsl_complex.h include/gsl/gsl_complex_math.h include/gsl/gsl_const.h include/gsl/gsl_const_cgs.h include/gsl/gsl_const_cgsm.h include/gsl/gsl_const_mks.h include/gsl/gsl_const_mksa.h include/gsl/gsl_const_num.h include/gsl/gsl_deriv.h include/gsl/gsl_dft_complex.h include/gsl/gsl_dft_complex_float.h include/gsl/gsl_dht.h include/gsl/gsl_diff.h include/gsl/gsl_eigen.h include/gsl/gsl_errno.h include/gsl/gsl_fft.h include/gsl/gsl_fft_complex.h include/gsl/gsl_fft_complex_float.h include/gsl/gsl_fft_halfcomplex.h include/gsl/gsl_fft_halfcomplex_float.h include/gsl/gsl_fft_real.h include/gsl/gsl_fft_real_float.h include/gsl/gsl_fit.h include/gsl/gsl_heapsort.h include/gsl/gsl_histogram.h include/gsl/gsl_histogram2d.h include/gsl/gsl_ieee_utils.h include/gsl/gsl_inline.h include/gsl/gsl_integration.h include/gsl/gsl_interp.h +include/gsl/gsl_interp2d.h include/gsl/gsl_linalg.h include/gsl/gsl_machine.h include/gsl/gsl_math.h include/gsl/gsl_matrix.h include/gsl/gsl_matrix_char.h include/gsl/gsl_matrix_complex_double.h include/gsl/gsl_matrix_complex_float.h include/gsl/gsl_matrix_complex_long_double.h include/gsl/gsl_matrix_double.h include/gsl/gsl_matrix_float.h include/gsl/gsl_matrix_int.h include/gsl/gsl_matrix_long.h include/gsl/gsl_matrix_long_double.h include/gsl/gsl_matrix_short.h include/gsl/gsl_matrix_uchar.h include/gsl/gsl_matrix_uint.h include/gsl/gsl_matrix_ulong.h include/gsl/gsl_matrix_ushort.h include/gsl/gsl_message.h include/gsl/gsl_min.h include/gsl/gsl_minmax.h include/gsl/gsl_mode.h include/gsl/gsl_monte.h include/gsl/gsl_monte_miser.h include/gsl/gsl_monte_plain.h include/gsl/gsl_monte_vegas.h include/gsl/gsl_multifit.h include/gsl/gsl_multifit_nlin.h +include/gsl/gsl_multifit_nlinear.h +include/gsl/gsl_multilarge.h +include/gsl/gsl_multilarge_nlinear.h include/gsl/gsl_multimin.h include/gsl/gsl_multiroots.h include/gsl/gsl_multiset.h include/gsl/gsl_nan.h include/gsl/gsl_ntuple.h include/gsl/gsl_odeiv.h include/gsl/gsl_odeiv2.h include/gsl/gsl_permutation.h include/gsl/gsl_permute.h include/gsl/gsl_permute_char.h include/gsl/gsl_permute_complex_double.h include/gsl/gsl_permute_complex_float.h include/gsl/gsl_permute_complex_long_double.h include/gsl/gsl_permute_double.h include/gsl/gsl_permute_float.h include/gsl/gsl_permute_int.h include/gsl/gsl_permute_long.h include/gsl/gsl_permute_long_double.h +include/gsl/gsl_permute_matrix.h +include/gsl/gsl_permute_matrix_char.h +include/gsl/gsl_permute_matrix_complex_double.h +include/gsl/gsl_permute_matrix_complex_float.h +include/gsl/gsl_permute_matrix_complex_long_double.h +include/gsl/gsl_permute_matrix_double.h +include/gsl/gsl_permute_matrix_float.h +include/gsl/gsl_permute_matrix_int.h +include/gsl/gsl_permute_matrix_long.h +include/gsl/gsl_permute_matrix_long_double.h +include/gsl/gsl_permute_matrix_short.h +include/gsl/gsl_permute_matrix_uchar.h +include/gsl/gsl_permute_matrix_uint.h +include/gsl/gsl_permute_matrix_ulong.h +include/gsl/gsl_permute_matrix_ushort.h include/gsl/gsl_permute_short.h include/gsl/gsl_permute_uchar.h include/gsl/gsl_permute_uint.h include/gsl/gsl_permute_ulong.h include/gsl/gsl_permute_ushort.h include/gsl/gsl_permute_vector.h include/gsl/gsl_permute_vector_char.h include/gsl/gsl_permute_vector_complex_double.h include/gsl/gsl_permute_vector_complex_float.h include/gsl/gsl_permute_vector_complex_long_double.h include/gsl/gsl_permute_vector_double.h include/gsl/gsl_permute_vector_float.h include/gsl/gsl_permute_vector_int.h include/gsl/gsl_permute_vector_long.h include/gsl/gsl_permute_vector_long_double.h include/gsl/gsl_permute_vector_short.h include/gsl/gsl_permute_vector_uchar.h include/gsl/gsl_permute_vector_uint.h include/gsl/gsl_permute_vector_ulong.h include/gsl/gsl_permute_vector_ushort.h include/gsl/gsl_poly.h include/gsl/gsl_pow_int.h include/gsl/gsl_precision.h include/gsl/gsl_qrng.h include/gsl/gsl_randist.h include/gsl/gsl_rng.h include/gsl/gsl_roots.h +include/gsl/gsl_rstat.h include/gsl/gsl_sf.h include/gsl/gsl_sf_airy.h include/gsl/gsl_sf_bessel.h include/gsl/gsl_sf_clausen.h include/gsl/gsl_sf_coulomb.h include/gsl/gsl_sf_coupling.h include/gsl/gsl_sf_dawson.h include/gsl/gsl_sf_debye.h include/gsl/gsl_sf_dilog.h include/gsl/gsl_sf_elementary.h include/gsl/gsl_sf_ellint.h include/gsl/gsl_sf_elljac.h include/gsl/gsl_sf_erf.h include/gsl/gsl_sf_exp.h include/gsl/gsl_sf_expint.h include/gsl/gsl_sf_fermi_dirac.h include/gsl/gsl_sf_gamma.h include/gsl/gsl_sf_gegenbauer.h include/gsl/gsl_sf_hyperg.h include/gsl/gsl_sf_laguerre.h include/gsl/gsl_sf_lambert.h include/gsl/gsl_sf_legendre.h include/gsl/gsl_sf_log.h include/gsl/gsl_sf_mathieu.h include/gsl/gsl_sf_pow_int.h include/gsl/gsl_sf_psi.h include/gsl/gsl_sf_result.h include/gsl/gsl_sf_synchrotron.h include/gsl/gsl_sf_transport.h include/gsl/gsl_sf_trig.h include/gsl/gsl_sf_zeta.h include/gsl/gsl_siman.h include/gsl/gsl_sort.h include/gsl/gsl_sort_char.h include/gsl/gsl_sort_double.h include/gsl/gsl_sort_float.h include/gsl/gsl_sort_int.h include/gsl/gsl_sort_long.h include/gsl/gsl_sort_long_double.h include/gsl/gsl_sort_short.h include/gsl/gsl_sort_uchar.h include/gsl/gsl_sort_uint.h include/gsl/gsl_sort_ulong.h include/gsl/gsl_sort_ushort.h include/gsl/gsl_sort_vector.h include/gsl/gsl_sort_vector_char.h include/gsl/gsl_sort_vector_double.h include/gsl/gsl_sort_vector_float.h include/gsl/gsl_sort_vector_int.h include/gsl/gsl_sort_vector_long.h include/gsl/gsl_sort_vector_long_double.h include/gsl/gsl_sort_vector_short.h include/gsl/gsl_sort_vector_uchar.h include/gsl/gsl_sort_vector_uint.h include/gsl/gsl_sort_vector_ulong.h include/gsl/gsl_sort_vector_ushort.h +include/gsl/gsl_spblas.h include/gsl/gsl_specfunc.h +include/gsl/gsl_splinalg.h include/gsl/gsl_spline.h +include/gsl/gsl_spline2d.h +include/gsl/gsl_spmatrix.h include/gsl/gsl_statistics.h include/gsl/gsl_statistics_char.h include/gsl/gsl_statistics_double.h include/gsl/gsl_statistics_float.h include/gsl/gsl_statistics_int.h include/gsl/gsl_statistics_long.h include/gsl/gsl_statistics_long_double.h include/gsl/gsl_statistics_short.h include/gsl/gsl_statistics_uchar.h include/gsl/gsl_statistics_uint.h include/gsl/gsl_statistics_ulong.h include/gsl/gsl_statistics_ushort.h include/gsl/gsl_sum.h include/gsl/gsl_sys.h include/gsl/gsl_test.h include/gsl/gsl_types.h include/gsl/gsl_vector.h include/gsl/gsl_vector_char.h include/gsl/gsl_vector_complex.h include/gsl/gsl_vector_complex_double.h include/gsl/gsl_vector_complex_float.h include/gsl/gsl_vector_complex_long_double.h include/gsl/gsl_vector_double.h include/gsl/gsl_vector_float.h include/gsl/gsl_vector_int.h include/gsl/gsl_vector_long.h include/gsl/gsl_vector_long_double.h include/gsl/gsl_vector_short.h include/gsl/gsl_vector_uchar.h include/gsl/gsl_vector_uint.h include/gsl/gsl_vector_ulong.h include/gsl/gsl_vector_ushort.h include/gsl/gsl_version.h include/gsl/gsl_wavelet.h include/gsl/gsl_wavelet2d.h lib/libgsl.a lib/libgsl.so -lib/libgsl.so.0 -lib/libgsl.so.0.17.0 +lib/libgsl.so.19 +lib/libgsl.so.19.3.0 lib/libgslcblas.a lib/libgslcblas.so lib/libgslcblas.so.0 lib/libgslcblas.so.0.0.0 libdata/pkgconfig/gsl.pc -share/aclocal/gsl.m4 man/man1/gsl-config.1.gz man/man1/gsl-histogram.1.gz man/man1/gsl-randist.1.gz man/man3/gsl.3.gz +share/aclocal/gsl.m4 Index: head/math/labplot/Makefile =================================================================== --- head/math/labplot/Makefile (revision 439927) +++ head/math/labplot/Makefile (revision 439928) @@ -1,44 +1,45 @@ # Created by: Kay Lehmann # $FreeBSD$ PORTNAME= labplot PORTVERSION= 2.4.0 +PORTREVISION= 1 DISTVERSIONSUFFIX=-kf5 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Data plotting and function analysis tool for KDE LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgsl.so:math/gsl OPTIONS_DEFINE= FITS FFTW3 HDF5 NETCDF OPTIONS_DEFAULT= ${OPTIONS_DEFINE} FITS_DESC= Flexible Image Transport System Data Format (FITS) Library FITS_CMAKE_BOOL= ENABLE_FITS FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio FFTW3_DESC= Build with FFTW support FFTW3_CMAKE_BOOL= ENABLE_FFTW FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 HDF5_DESC= Build with HDF5 support HDF5_CMAKE_BOOL= ENABLE_HDF5 HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 NETCDF_DESC= Build with NetCDF support NETCDF_CMAKE_BOOL= ENABLE_NETCDF NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf USES= cmake:outsource desktop-file-utils kde:5 shared-mime-info tar:xz USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash ecm guiaddons i18n iconthemes itemviews \ jobwidgets kdelibs4support kio newstuff notifications parts \ service solid sonnet textwidgets unitconversion widgetsaddons \ windowsystem xmlgui USE_QT5= core dbus gui network printsupport svg widgets xml \ buildtools_build qmake_build DATADIR= ${PREFIX}/share/labplot2 .include Index: head/math/ocamlgsl/Makefile =================================================================== --- head/math/ocamlgsl/Makefile (revision 439927) +++ head/math/ocamlgsl/Makefile (revision 439928) @@ -1,43 +1,44 @@ # Created by: Klaus T. Aehlig # $FreeBSD$ PORTNAME= ocaml-gsl DISTVERSIONPREFIX=v DISTVERSION= 1.19.1 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= michipili@gmail.com COMMENT= Interface to GSL for the Objective Caml language LICENSE= GPLv3 LIB_DEPENDS= libgsl.so:math/gsl BUILD_DEPENDS= gawk:lang/gawk \ ${OCAMLC_DEPEND} RUN_DEPENDS= ocamlfind:devel/ocaml-findlib USE_GITHUB= yes GH_ACCOUNT= mmottl GH_PROJECT= gsl-ocaml USES= gmake USE_OCAML= YES USE_OCAML_FINDLIB= YES USE_OCAML_CAMLP4= YES USE_OCAML_LDCONFIG= YES OCAML_PKGDIRS= gsl HAS_CONFIGURE= YES MAKE_JOBS_UNSAFE= yes NOT_FOR_ARCHS= armv6 NOT_FOR_ARCHS_REASON= architectures with double-word alignment for doubles are not supported DOCSDIR= ${LOCALBASE}/share/doc OPTIONS_DEFINE= DOCS post-configure: @${ECHO_CMD} 'stagedir="${STAGEDIR}"' >> ${WRKSRC}/setup.data @${ECHO_CMD} 'docdir="$$datarootdir/doc/ocaml/$$pkg_name"' >> ${WRKSRC}/setup.data .include Index: head/math/octave-forge-gsl/Makefile =================================================================== --- head/math/octave-forge-gsl/Makefile (revision 439927) +++ head/math/octave-forge-gsl/Makefile (revision 439928) @@ -1,31 +1,31 @@ # Created by: Stephen Montgomery-Smith # $FreeBSD$ PORTNAME= octave-forge-gsl PORTVERSION= 2.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv2 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING LIB_DEPENDS= libgsl.so:math/gsl # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${DISTNAME} WRKSRC= ${WRKDIR}/${OCTSRC}/src GNU_CONFIGURE= yes .include "${.CURDIR}/../../Mk/bsd.octave.mk" post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include Index: head/math/orpie/Makefile =================================================================== --- head/math/orpie/Makefile (revision 439927) +++ head/math/orpie/Makefile (revision 439928) @@ -1,33 +1,33 @@ # Created by: Dylan Simon # $FreeBSD$ PORTNAME= orpie PORTVERSION= 1.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= math MASTER_SITES= http://pessimization.com/software/orpie/ MAINTAINER= ports@FreeBSD.org COMMENT= Fullscreen RPN calculator for the console LICENSE= GPLv2 LIB_DEPENDS= libgsl.so:math/gsl USES= gmake ncurses USE_OCAML= yes USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes NOT_FOR_ARCHS= armv6 NOT_FOR_ARCHS_REASON= architectures with double-word alignment for doubles are not supported PLIST_FILES= bin/orpie bin/orpie-curses-keys etc/orpierc \ man/man1/orpie.1.gz man/man1/orpie-curses-keys.1.gz \ man/man5/orpierc.5.gz post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include Index: head/math/orpie/files/patch-gsl_mlgsl__sf.c =================================================================== --- head/math/orpie/files/patch-gsl_mlgsl__sf.c (nonexistent) +++ head/math/orpie/files/patch-gsl_mlgsl__sf.c (revision 439928) @@ -0,0 +1,36 @@ +Obtained from: +https://sources.debian.net/src/orpie/1.5.2-1/debian/patches/gsl-fix/ + +Description: fix some incompatibilities with libgsl 2.1 +Author: Uwe Steinmann +Forwarded: not-needed + +--- gsl/mlgsl_sf.c.orig 2014-04-12 01:43:31 UTC ++++ gsl/mlgsl_sf.c +@@ -258,7 +258,8 @@ SF2(ellint_Dcomp, Double_val, GSL_MODE_v + SF3(ellint_F, Double_val, Double_val, GSL_MODE_val) + SF3(ellint_E, Double_val, Double_val, GSL_MODE_val) + SF4(ellint_P, Double_val, Double_val, Double_val, GSL_MODE_val) +-SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val) ++//SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val) ++SF3(ellint_D, Double_val, Double_val, GSL_MODE_val) + SF3(ellint_RC, Double_val, Double_val, GSL_MODE_val) + SF4(ellint_RD, Double_val, Double_val, Double_val, GSL_MODE_val) + SF4(ellint_RF, Double_val, Double_val, Double_val, GSL_MODE_val) +@@ -452,6 +453,7 @@ SF1(legendre_Q1, Double_val) + SF2(legendre_Ql, Int_val, Double_val) + + /* Associated Legendre Polynomials and Spherical Harmonics */ ++/* + SF3(legendre_Plm, Int_val, Int_val, Double_val) + CAMLprim value + ml_gsl_sf_legendre_Plm_array(value lmax, value m, value x, value result_array) +@@ -487,7 +489,7 @@ ml_gsl_sf_legendre_array_size(value lmax + ret = Val_int(gsl_ret); + CAMLreturn(ret); + } +- ++*/ + /* LOGARITHM and related functions */ + SF1(log, Double_val) + SF1(log_abs, Double_val) Property changes on: head/math/orpie/files/patch-gsl_mlgsl__sf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/p5-Math-GSL/Makefile =================================================================== --- head/math/p5-Math-GSL/Makefile (revision 439927) +++ head/math/p5-Math-GSL/Makefile (revision 439928) @@ -1,32 +1,32 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= Math-GSL PORTVERSION= 0.39 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= sunpoet@FreeBSD.org COMMENT= Perl interface to GNU Scientific Library LICENSE= ART10 GPLv1 LICENSE_COMB= dual BUILD_DEPENDS= p5-PkgConfig>=0.07720:devel/p5-PkgConfig LIB_DEPENDS= libgsl.so:math/gsl TEST_DEPENDS= p5-Test-Class>=0.12:devel/p5-Test-Class \ p5-Test-Exception>=0.21:devel/p5-Test-Exception \ p5-Test-Most>=0.31:devel/p5-Test-Most \ p5-Test-Taint>=1.06:devel/p5-Test-Taint USE_PERL5= modbuild USES= perl5 BROKEN_sparc64= does not compile on sparc64 post-install: ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/GSL/ -name "*.so" | ${XARGS} ${STRIP_CMD} .include Index: head/math/p5-Math-GSL/pkg-plist =================================================================== --- head/math/p5-Math-GSL/pkg-plist (revision 439927) +++ head/math/p5-Math-GSL/pkg-plist (revision 439928) @@ -1,157 +1,159 @@ %%SITE_ARCH%%/Math/GSL.pm %%SITE_ARCH%%/Math/GSL/BLAS.pm %%SITE_ARCH%%/Math/GSL/BSpline.pm %%SITE_ARCH%%/Math/GSL/CBLAS.pm %%SITE_ARCH%%/Math/GSL/CDF.pm %%SITE_ARCH%%/Math/GSL/Chebyshev.pm %%SITE_ARCH%%/Math/GSL/Combination.pm %%SITE_ARCH%%/Math/GSL/Complex.pm %%SITE_ARCH%%/Math/GSL/Const.pm %%SITE_ARCH%%/Math/GSL/DHT.pm %%SITE_ARCH%%/Math/GSL/Deriv.pm %%SITE_ARCH%%/Math/GSL/Diff.pm %%SITE_ARCH%%/Math/GSL/Eigen.pm %%SITE_ARCH%%/Math/GSL/Errno.pm %%SITE_ARCH%%/Math/GSL/FFT.pm %%SITE_ARCH%%/Math/GSL/Fit.pm %%SITE_ARCH%%/Math/GSL/Heapsort.pm %%SITE_ARCH%%/Math/GSL/Histogram.pm %%SITE_ARCH%%/Math/GSL/Histogram2D.pm %%SITE_ARCH%%/Math/GSL/IEEEUtils.pm %%SITE_ARCH%%/Math/GSL/Integration.pm %%SITE_ARCH%%/Math/GSL/Interp.pm %%SITE_ARCH%%/Math/GSL/Linalg.pm %%SITE_ARCH%%/Math/GSL/Machine.pm %%SITE_ARCH%%/Math/GSL/Matrix.pm %%SITE_ARCH%%/Math/GSL/MatrixComplex.pm %%SITE_ARCH%%/Math/GSL/Min.pm %%SITE_ARCH%%/Math/GSL/Monte.pm %%SITE_ARCH%%/Math/GSL/Multifit.pm %%SITE_ARCH%%/Math/GSL/Multilarge.pm %%SITE_ARCH%%/Math/GSL/Multimin.pm %%SITE_ARCH%%/Math/GSL/Multiroots.pm %%SITE_ARCH%%/Math/GSL/NTuple.pm %%SITE_ARCH%%/Math/GSL/ODEIV.pm %%SITE_ARCH%%/Math/GSL/Permutation.pm %%SITE_ARCH%%/Math/GSL/Poly.pm %%SITE_ARCH%%/Math/GSL/PowInt.pm %%SITE_ARCH%%/Math/GSL/QRNG.pm %%SITE_ARCH%%/Math/GSL/RNG.pm %%SITE_ARCH%%/Math/GSL/Randist.pm %%SITE_ARCH%%/Math/GSL/Roots.pm %%SITE_ARCH%%/Math/GSL/SF.pm %%SITE_ARCH%%/Math/GSL/Siman.pm %%SITE_ARCH%%/Math/GSL/Sort.pm %%SITE_ARCH%%/Math/GSL/Spline.pm %%SITE_ARCH%%/Math/GSL/Statistics.pm %%SITE_ARCH%%/Math/GSL/Sum.pm %%SITE_ARCH%%/Math/GSL/Sys.pm %%SITE_ARCH%%/Math/GSL/Test.pm %%SITE_ARCH%%/Math/GSL/Vector.pm %%SITE_ARCH%%/Math/GSL/VectorComplex.pm %%SITE_ARCH%%/Math/GSL/Version.pm %%SITE_ARCH%%/Math/GSL/Wavelet.pm %%SITE_ARCH%%/Math/GSL/Wavelet2D.pm %%SITE_ARCH%%/auto/Math/GSL/BLAS/BLAS.so %%SITE_ARCH%%/auto/Math/GSL/BSpline/BSpline.so %%SITE_ARCH%%/auto/Math/GSL/CBLAS/CBLAS.so %%SITE_ARCH%%/auto/Math/GSL/CDF/CDF.so %%SITE_ARCH%%/auto/Math/GSL/Chebyshev/Chebyshev.so %%SITE_ARCH%%/auto/Math/GSL/Combination/Combination.so %%SITE_ARCH%%/auto/Math/GSL/Complex/Complex.so %%SITE_ARCH%%/auto/Math/GSL/Const/Const.so %%SITE_ARCH%%/auto/Math/GSL/DHT/DHT.so %%SITE_ARCH%%/auto/Math/GSL/Deriv/Deriv.so %%SITE_ARCH%%/auto/Math/GSL/Diff/Diff.so %%SITE_ARCH%%/auto/Math/GSL/Eigen/Eigen.so %%SITE_ARCH%%/auto/Math/GSL/Errno/Errno.so %%SITE_ARCH%%/auto/Math/GSL/FFT/FFT.so %%SITE_ARCH%%/auto/Math/GSL/Fit/Fit.so %%SITE_ARCH%%/auto/Math/GSL/Heapsort/Heapsort.so %%SITE_ARCH%%/auto/Math/GSL/Histogram/Histogram.so %%SITE_ARCH%%/auto/Math/GSL/Histogram2D/Histogram2D.so %%SITE_ARCH%%/auto/Math/GSL/IEEEUtils/IEEEUtils.so %%SITE_ARCH%%/auto/Math/GSL/Integration/Integration.so %%SITE_ARCH%%/auto/Math/GSL/Interp/Interp.so %%SITE_ARCH%%/auto/Math/GSL/Linalg/Linalg.so %%SITE_ARCH%%/auto/Math/GSL/Machine/Machine.so %%SITE_ARCH%%/auto/Math/GSL/Matrix/Matrix.so %%SITE_ARCH%%/auto/Math/GSL/MatrixComplex/MatrixComplex.so %%SITE_ARCH%%/auto/Math/GSL/Min/Min.so %%SITE_ARCH%%/auto/Math/GSL/Monte/Monte.so +%%SITE_ARCH%%/auto/Math/GSL/Multifit/Multifit.so +%%SITE_ARCH%%/auto/Math/GSL/Multilarge/Multilarge.so %%SITE_ARCH%%/auto/Math/GSL/Multimin/Multimin.so %%SITE_ARCH%%/auto/Math/GSL/Multiroots/Multiroots.so %%SITE_ARCH%%/auto/Math/GSL/NTuple/NTuple.so %%SITE_ARCH%%/auto/Math/GSL/ODEIV/ODEIV.so %%SITE_ARCH%%/auto/Math/GSL/Permutation/Permutation.so %%SITE_ARCH%%/auto/Math/GSL/Poly/Poly.so %%SITE_ARCH%%/auto/Math/GSL/PowInt/PowInt.so %%SITE_ARCH%%/auto/Math/GSL/QRNG/QRNG.so %%SITE_ARCH%%/auto/Math/GSL/RNG/RNG.so %%SITE_ARCH%%/auto/Math/GSL/Randist/Randist.so %%SITE_ARCH%%/auto/Math/GSL/Roots/Roots.so %%SITE_ARCH%%/auto/Math/GSL/SF/SF.so %%SITE_ARCH%%/auto/Math/GSL/Siman/Siman.so %%SITE_ARCH%%/auto/Math/GSL/Sort/Sort.so %%SITE_ARCH%%/auto/Math/GSL/Spline/Spline.so %%SITE_ARCH%%/auto/Math/GSL/Statistics/Statistics.so %%SITE_ARCH%%/auto/Math/GSL/Sum/Sum.so %%SITE_ARCH%%/auto/Math/GSL/Sys/Sys.so %%SITE_ARCH%%/auto/Math/GSL/Vector/Vector.so %%SITE_ARCH%%/auto/Math/GSL/VectorComplex/VectorComplex.so %%SITE_ARCH%%/auto/Math/GSL/Version/Version.so %%SITE_ARCH%%/auto/Math/GSL/Wavelet/Wavelet.so %%SITE_ARCH%%/auto/Math/GSL/Wavelet2D/Wavelet2D.so %%PERL5_MAN3%%/Math::GSL.3.gz %%PERL5_MAN3%%/Math::GSL::BLAS.3.gz %%PERL5_MAN3%%/Math::GSL::BSpline.3.gz %%PERL5_MAN3%%/Math::GSL::CBLAS.3.gz %%PERL5_MAN3%%/Math::GSL::CDF.3.gz %%PERL5_MAN3%%/Math::GSL::Chebyshev.3.gz %%PERL5_MAN3%%/Math::GSL::Combination.3.gz %%PERL5_MAN3%%/Math::GSL::Complex.3.gz %%PERL5_MAN3%%/Math::GSL::Const.3.gz %%PERL5_MAN3%%/Math::GSL::DHT.3.gz %%PERL5_MAN3%%/Math::GSL::Deriv.3.gz %%PERL5_MAN3%%/Math::GSL::Diff.3.gz %%PERL5_MAN3%%/Math::GSL::Eigen.3.gz %%PERL5_MAN3%%/Math::GSL::Errno.3.gz %%PERL5_MAN3%%/Math::GSL::FFT.3.gz %%PERL5_MAN3%%/Math::GSL::Fit.3.gz %%PERL5_MAN3%%/Math::GSL::Heapsort.3.gz %%PERL5_MAN3%%/Math::GSL::Histogram.3.gz %%PERL5_MAN3%%/Math::GSL::Histogram2D.3.gz %%PERL5_MAN3%%/Math::GSL::IEEEUtils.3.gz %%PERL5_MAN3%%/Math::GSL::Integration.3.gz %%PERL5_MAN3%%/Math::GSL::Interp.3.gz %%PERL5_MAN3%%/Math::GSL::Linalg.3.gz %%PERL5_MAN3%%/Math::GSL::Machine.3.gz %%PERL5_MAN3%%/Math::GSL::Matrix.3.gz %%PERL5_MAN3%%/Math::GSL::MatrixComplex.3.gz %%PERL5_MAN3%%/Math::GSL::Min.3.gz %%PERL5_MAN3%%/Math::GSL::Monte.3.gz %%PERL5_MAN3%%/Math::GSL::Multifit.3.gz %%PERL5_MAN3%%/Math::GSL::Multilarge.3.gz %%PERL5_MAN3%%/Math::GSL::Multimin.3.gz %%PERL5_MAN3%%/Math::GSL::Multiroots.3.gz %%PERL5_MAN3%%/Math::GSL::NTuple.3.gz %%PERL5_MAN3%%/Math::GSL::ODEIV.3.gz %%PERL5_MAN3%%/Math::GSL::Permutation.3.gz %%PERL5_MAN3%%/Math::GSL::Poly.3.gz %%PERL5_MAN3%%/Math::GSL::PowInt.3.gz %%PERL5_MAN3%%/Math::GSL::QRNG.3.gz %%PERL5_MAN3%%/Math::GSL::RNG.3.gz %%PERL5_MAN3%%/Math::GSL::Randist.3.gz %%PERL5_MAN3%%/Math::GSL::Roots.3.gz %%PERL5_MAN3%%/Math::GSL::SF.3.gz %%PERL5_MAN3%%/Math::GSL::Siman.3.gz %%PERL5_MAN3%%/Math::GSL::Sort.3.gz %%PERL5_MAN3%%/Math::GSL::Spline.3.gz %%PERL5_MAN3%%/Math::GSL::Statistics.3.gz %%PERL5_MAN3%%/Math::GSL::Sum.3.gz %%PERL5_MAN3%%/Math::GSL::Sys.3.gz %%PERL5_MAN3%%/Math::GSL::Test.3.gz %%PERL5_MAN3%%/Math::GSL::Vector.3.gz %%PERL5_MAN3%%/Math::GSL::VectorComplex.3.gz %%PERL5_MAN3%%/Math::GSL::Wavelet.3.gz %%PERL5_MAN3%%/Math::GSL::Wavelet2D.3.gz Index: head/math/pspp/Makefile =================================================================== --- head/math/pspp/Makefile (revision 439927) +++ head/math/pspp/Makefile (revision 439928) @@ -1,70 +1,71 @@ # Created by: Andrew L. Neporada # $FreeBSD$ PORTNAME= pspp PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU MAINTAINER= cpm@FreeBSD.org COMMENT= Program for statistical analysis of sampled data LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= texinfo>0:print/texinfo LIB_DEPENDS= libgslcblas.so:math/gsl USES= charsetfix gmake iconv localbase libtool perl5 pkgconfig readline USE_GNOME= libxml2 USE_PERL5= build GNU_CONFIGURE= yes MAKE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" \ XMLLINT="${LOCALBASE}/bin/xmllint" INSTALL_TARGET= install-strip USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" PORTDOCS= AUTHORS ChangeLog NEWS ONEWS README THANKS TODO PORTEXAMPLES= * INFO= pspp pspp-dev OPTIONS_DEFINE= DOCS EXAMPLES GUI NLS PGSQL OPTIONS_SUB= yes GUI_LIB_DEPENDS= libgladeui-2.so:devel/glade GUI_RUN_DEPENDS= yelp:x11/yelp GUI_USES= desktop-file-utils GUI_USE= gnome=gtk30,gtksourceview3 GUI_VARS= INSTALLS_ICONS=yes GUI_CONFIGURE_WITH= cairo gui gui-tools GUI_INSTALL_TARGET= install-icons install-ext-icons NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_MAKE_ARGS_OFF= POFILES="" PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= libpq post-patch: @${REINPLACE_CMD} -e \ 's|: $$(INSTALL_DATA_HOOKS)|:|' ${WRKSRC}/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/pspp-mode.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp post-install-GUI-on: ${RM} -r ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/mimetypes post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) post-install-EXAMPLES-on: (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \ "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/math/py-gsl/Makefile =================================================================== --- head/math/py-gsl/Makefile (revision 439927) +++ head/math/py-gsl/Makefile (revision 439928) @@ -1,31 +1,30 @@ # Created by: Hye-Shik Chang # $FreeBSD$ PORTNAME= gsl -PORTVERSION= 2.1.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= math python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pygsl-${PORTVERSION} DIST_SUBDIR= python MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to GNU Scientific Library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libgsl.so:math/gsl USES= python USE_PYTHON= autoplist distutils post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pygsl/*.so \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pygsl/statistics/*.so \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pygsl/testing/*.so .include Index: head/math/py-gsl/distinfo =================================================================== --- head/math/py-gsl/distinfo (revision 439927) +++ head/math/py-gsl/distinfo (revision 439928) @@ -1,2 +1,3 @@ -SHA256 (python/pygsl-2.1.1.tar.gz) = 3d17e6deb5433b331a567a45ff467f41e9059def76e6ef0f21d8e891498f946a -SIZE (python/pygsl-2.1.1.tar.gz) = 727636 +TIMESTAMP = 1493448013 +SHA256 (python/pygsl-2.2.0.tar.gz) = 200e7986c368cb815685e502993e5211702219e1a0bb79030d671c35df25a59e +SIZE (python/pygsl-2.2.0.tar.gz) = 983467 Index: head/math/qtiplot/Makefile =================================================================== --- head/math/qtiplot/Makefile (revision 439927) +++ head/math/qtiplot/Makefile (revision 439928) @@ -1,93 +1,93 @@ # Created by: Jie Gao # $FreeBSD$ PORTNAME= qtiplot DISTVERSION= 0.9.8.9 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math science MASTER_SITES= BERLIOS http://soft.proindependent.com/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Data analysis and scientific plotting LIB_DEPENDS= libgsl.so:math/gsl \ libmuparser.so:math/muparser \ libpng.so:graphics/png # use bundled modified libraries # qwt.5:x11-toolkits/qwt5 \ # qwtplot3d-qt4:math/qwtplot3d-qt4 USES= dos2unix gmake qmake tar:bzip2 USE_QT4= gui opengl svg qt3support network assistantclient \ moc_build rcc_build USE_GL= glu QMAKE_ARGS+= LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD} DOS2UNIX_GLOB= *.pro DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \ "${PREFIX}/share/pixmaps/qtiplot.png" \ "qtiplot" "" true OPTIONS_DEFINE= DOCS PYTHON NLS DEBUG OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes DOCS_DESC= Install the QtiPlot Handbook DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc DOCS_USE= QT4=assistant-adp_run PYTHON_DESC= Python scripting support PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS} PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} NLS_USE= QT4=linguisttools_build post-extract: ${CP} ${FILESDIR}/build.conf ${WRKSRC} post-patch: ${REINPLACE_CMD} -e \ 's|/usr/local/qtiplot/fitPlugins|${DATADIR}/fitPlugins|' \ ${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp ${REINPLACE_CMD} -e \ 's|target.path=.*|target.path=${DATADIR}/fitPlugins|g' \ ${WRKSRC}/fitPlugins/*/*.pro ${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \ ${WRKSRC}/${PORTNAME}/qtiplot.pro post-patch-PYTHON-on: ${REINPLACE_CMD} -e \ '/^sys.path.append/s|"\."|"${DATADIR}"|' \ ${WRKSRC}/${PORTNAME}/qtiplotrc.py post-patch-PYTHON-off: ${REINPLACE_CMD} -e \ "s/SCRIPTING_LANGS.*Python//" \ ${WRKSRC}/build.conf post-patch-DEBUG-on: ${REINPLACE_CMD} -e \ "/^CONFIG.*release/s|release|debug|" \ ${WRKSRC}/build.conf post-patch-NLS-off: ${REINPLACE_CMD} -e \ "/INSTALLS.*translations/d" \ ${WRKSRC}/${PORTNAME}/qtiplot.pro pre-configure-NLS-on: cd ${WRKSRC}/qtiplot && ${LRELEASE} -compress qtiplot.pro post-install: ${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtiplot.png post-install-PYTHON-on: .for s in qtiplotrc.py qtiUtil.py cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')" ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${STAGEDIR}${DATADIR}/${s}c .endfor .include Index: head/math/qtiplot/files/patch-archgit_c5e8e49 =================================================================== --- head/math/qtiplot/files/patch-archgit_c5e8e49 (nonexistent) +++ head/math/qtiplot/files/patch-archgit_c5e8e49 (revision 439928) @@ -0,0 +1,37 @@ +Obtained from: +https://git.archlinux.org/svntogit/packages.git/tree/trunk/qtiplot-gsl2.patch?h=packages/qtiplot + +Description: adoptation to gsl2. +Author: Damir Islamov +Last-Update: 2015-12-04 + +--- qtiplot/src/analysis/Fit.cpp ++++ qtiplot/src/analysis/Fit.cpp +@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl + break; + } + } +- ++ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p); + if (status){ +- gsl_multifit_covar (s->J, 0.0, covar); ++ gsl_multifit_fdfsolver_jac(s, J); ++ gsl_multifit_covar (J, 0.0, covar); + iterations = 0; ++ gsl_matrix_free (J); + return s; + } + +@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl + + status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance); + } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations); +- +- gsl_multifit_covar (s->J, 0.0, covar); +- ++ gsl_multifit_fdfsolver_jac(s, J); ++ gsl_multifit_covar (J, 0.0, covar); ++ gsl_matrix_free (J); + iterations = iter; + return s; + } Property changes on: head/math/qtiplot/files/patch-archgit_c5e8e49 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/rubygem-rb-gsl/Makefile =================================================================== --- head/math/rubygem-rb-gsl/Makefile (revision 439927) +++ head/math/rubygem-rb-gsl/Makefile (revision 439928) @@ -1,20 +1,21 @@ # Created by: Shin-ya MURAKAMI # $FreeBSD$ -PORTNAME= rb-gsl -PORTVERSION= 1.16.0.4 +PORTNAME= gsl +PORTVERSION= 2.1.0.2 CATEGORIES= math rubygems MASTER_SITES= RG +PKGNAMEPREFIX= rubygem-rb- MAINTAINER= murashin@gfd-dennou.org COMMENT= Ruby extension library for GSL (GNU Scientific Library) LICENSE= GPLv2 LIB_DEPENDS= libgsl.so:math/gsl RUN_DEPENDS= rubygem-narray>=0.5.9:math/rubygem-narray USE_RUBY= yes USES= gem .include Index: head/math/rubygem-rb-gsl/distinfo =================================================================== --- head/math/rubygem-rb-gsl/distinfo (revision 439927) +++ head/math/rubygem-rb-gsl/distinfo (revision 439928) @@ -1,2 +1,3 @@ -SHA256 (rubygem/rb-gsl-1.16.0.4.gem) = bc6573cc36410d2ec88672d4b12e2c908684796b276a8743c19345bbb44bef94 -SIZE (rubygem/rb-gsl-1.16.0.4.gem) = 588288 +TIMESTAMP = 1493451497 +SHA256 (rubygem/gsl-2.1.0.2.gem) = bb748021a950ae51a7f0eeadffbcd9b039734fcbb99a04a313ca48c4e60dd9ba +SIZE (rubygem/gsl-2.1.0.2.gem) = 735232 Index: head/science/afni/Makefile =================================================================== --- head/science/afni/Makefile (revision 439927) +++ head/science/afni/Makefile (revision 439928) @@ -1,161 +1,161 @@ # Created by: Jason W. Bacon # $FreeBSD$ ############################################################################ # http://www.neuro.mcw.edu/Ports has the latest source distribution from # which this port is built. It will be updated as time permits. # # afni.nimh.nih.gov is the ultimate source for AFNI, and will always # contain the latest source release. If this port is not up to date, # you can download the latest sources and build manually. PORTNAME= afni PORTVERSION= 2015.11.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science biology graphics MASTER_SITES= http://www.acadix.biz/Ports/distfiles/ MAINTAINER= bacon4000@gmail.com COMMENT= Advanced Functional Neuro Imaging LICENSE= GPLv2 BUILD_DEPENDS= gm4:devel/m4 \ R:math/R LIB_DEPENDS= libexpat.so:textproc/expat2 \ libf2c.so:lang/f2c \ libgsl.so:math/gsl \ libnetcdff.so:science/netcdf-fortran \ libxml2.so:textproc/libxml2 \ libXm.so:x11-toolkits/open-motif RUN_DEPENDS= endian:sysutils/endian \ mpeg_encode:multimedia/mpeg_encode \ ppmtogif:graphics/netpbm \ qhull:math/qhull5 \ R:math/R CONFLICTS= im-[0-9]* \ nifticlib-[0-9]* \ open-usp-tukubai-[0-9]* USES= gettext gmake iconv jpeg:run motif perl5 python shebangfix tar:xz SHEBANG_FILES= suma_change_spec \ 3dPAR2AFNI.pl \ python_scripts/afni_restproc.py \ python_scripts/lib_fat_Rfactor.py \ pkundu/meica.libs/siemens_me2nii.py USE_GNOME= glib20 .include BROKEN_sparc64= Does not compile: "undefined reference to '_mcount'" USE_GL= gl glu glw USE_XORG= x11 xext xi xmu xp xt MAKE_ENV= CC="${CC}" R_SHARE_DIR=${LOCALBASE}/lib/R/share MAKE_JOBS_UNSAFE=yes ALL_TARGET= vastness suma ########################################################################### # Install parameters SUB_FILES= pkg-message afni.cshrc afni.profile INSTALL_WRKSRC= ${WRKSRC}/BSD PRESTAGE= ${WRKSRC}/prestage X11R6_FILES= coxplot/Makefile \ coxplot/Makefile.f2c \ 3DEdge/src/Makefile \ SUMA/SUMA_Makefile \ edt_blur.c \ suma_datasets.c \ SUMA/SUMA_Load_Surface_Object.c \ SUMA/SUMA_MiscFunc.c \ SUMA/SUMA_ParseCommands.c \ SUMA/GLUT/libglut/glut_event.c \ SUMA/SUMA_Surface_IO.c post-extract: .for f in ${X11R6_FILES} @${REINPLACE_CMD} \ -e 's|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} \ -E 's|AFNI_[0-9_]+|${PORTVERSION}|g' ${WRKSRC}/AFNI_label.h @${REINPLACE_CMD} \ -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/afni.1 @${CP} ${FILESDIR}/Makefile ${WRKSRC} @${RM} ${WRKSRC}/3DEdge/src/Makefile.orig # shebangfix misses /bin/python on 10.1 post-patch: ${REINPLACE_CMD} -e "s|-lglib|-lglib-2.0|g" \ ${WRKSRC}/SUMA/SUMA_Makefile ${REINPLACE_CMD} -e "s|/bin/python|${PYTHON_CMD}|g" \ ${WRKSRC}/python_scripts/lib_fat_Rfactor.py ${REINPLACE_CMD} \ -e 's|os\.path\.dirname(sys\.argv\[0\])|"${PREFIX}/libexec"|g' \ ${WRKSRC}/pkundu/meica.py ${REINPLACE_CMD} \ -e 's|g_info|afni_g_info|g' \ ${WRKSRC}/rickr/Dimon.c \ ${WRKSRC}/rickr/Dimon1.c \ ${WRKSRC}/afni_history_rickr.c \ ${WRKSRC}/mri_dicom_stuff.c \ ${WRKSRC}/mri_process_siemens.c \ ${WRKSRC}/mri_read_dicom.c \ ${WRKSRC}/to3d.c \ ${WRKSRC}/mri_dicom_stuff.h post-build: ${MKDIR} ${PRESTAGE}/bin \ ${PRESTAGE}/scripts \ ${PRESTAGE}/lib \ ${PRESTAGE}/include \ ${PRESTAGE}/trash \ ${PRESTAGE}/doc \ ${PRESTAGE}/share ${MV} ${INSTALL_WRKSRC}/libf2c.a \ ${PRESTAGE}/trash ${MV} ${INSTALL_WRKSRC}/*.a \ ${INSTALL_WRKSRC}/*.so \ ${PRESTAGE}/lib ${MV} ${INSTALL_WRKSRC}/funstuff \ ${INSTALL_WRKSRC}/AFNI.*rc \ ${INSTALL_WRKSRC}/afnigui* \ ${PRESTAGE}/share ${MV} ${INSTALL_WRKSRC}/*.h \ ${PRESTAGE}/include ${MV} ${INSTALL_WRKSRC}/README* \ ${PRESTAGE}/doc for binary in `${FILE} ${INSTALL_WRKSRC}/* | fgrep 'ELF' | ${AWK} -F ':' ' { print $$1 }'` ; do \ ${MV} $${binary} ${PRESTAGE}/bin ; \ done ${MV} ${INSTALL_WRKSRC}/* \ ${PRESTAGE}/scripts ${MV} ${PRESTAGE}/scripts/meica.libs ${PRESTAGE} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/lib/afni \ ${STAGEDIR}${PREFIX}/include/afni for f in ${PRESTAGE}/lib/*; do \ ${STRIP_CMD} $${f}; \ done ${INSTALL_DATA} ${PRESTAGE}/lib/* ${STAGEDIR}${PREFIX}/lib/afni ${INSTALL_DATA} ${PRESTAGE}/include/* ${STAGEDIR}${PREFIX}/include/afni cd ${PRESTAGE}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${PRESTAGE}/bin/* ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${PRESTAGE}/scripts/* ${STAGEDIR}${PREFIX}/bin cd ${PRESTAGE} && ${COPYTREE_BIN} meica.libs \ ${STAGEDIR}${PREFIX}/libexec ${INSTALL_DATA} ${WRKSRC}/Atlases/* ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/afni.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/etc/mri ${INSTALL_DATA} ${PRESTAGE}/doc/* ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKDIR}/afni.cshrc ${WRKDIR}/afni.profile \ ${STAGEDIR}${PREFIX}/etc/mri .include Index: head/science/fisicalab/Makefile =================================================================== --- head/science/fisicalab/Makefile (revision 439927) +++ head/science/fisicalab/Makefile (revision 439928) @@ -1,20 +1,20 @@ # $FreeBSD$ PORTNAME= fisicalab PORTVERSION= 0.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science gnustep MASTER_SITES= SAVANNAH MAINTAINER= theraven@FreeBSD.org COMMENT= Physics simulation program for educational use LICENSE= GPLv3 LIB_DEPENDS+= libgsl.so:math/gsl USES= gnustep GNU_CONFIGURE= yes USE_GNUSTEP= build gui .include Index: head/science/getdp/Makefile =================================================================== --- head/science/getdp/Makefile (revision 439927) +++ head/science/getdp/Makefile (revision 439928) @@ -1,32 +1,32 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= getdp PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= http://www.geuz.org/getdp/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= stephen@FreeBSD.org COMMENT= Rather general finite element solver using mixed finite elements LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/README.txt LIB_DEPENDS= libgsl.so:math/gsl \ liblapack.so:math/lapack USES= fortran tar:tgz cmake WANT_PERL= yes OPTIONS_DEFINE= DOCS EXAMPLES .include .if defined(MAINTAINER_MODE) regression-test: install cd ${WRKSRC}/demos && yes "" | ${PORTNAME} magnet.pro -solve MagSta_phi .endif .include Index: head/science/gnudatalanguage/Makefile =================================================================== --- head/science/gnudatalanguage/Makefile (revision 439927) +++ head/science/gnudatalanguage/Makefile (revision 439928) @@ -1,136 +1,136 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= gnudatalanguage DISTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${PORTVERSION} .if defined(BUILD_PYTHON_MODULE) PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} .endif DISTNAME= gdl-${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT?= GDL, a free IDL compatible incremental compiler LICENSE= GPLv2 LIB_DEPENDS+= libplplot.so:math/plplot \ libpng.so:graphics/png \ libsz.so:science/szip \ libps.so:print/pslib \ libgsl.so:math/gsl USE_WX= 2.8 USE_XORG= x11 sm ice xext USES= cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz # Disable ncurses and readline from ports # Disable ImageMagick (does'nt work with plplot because dynamic drivers # are enabled by default) # TODO: add a slave port for mpich # TODO: create a port for Cmsvlib http://cow.physics.wisc.edu/~craigm/idl/down/cmsvlib.tar.gz # TODO: create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz # TODO: create a port for TexToIdl http://physics.mnstate.edu/mcraig/textoidl/textoidl-2-1-2.tar CMAKE_ARGS= -DREADLINEDIR:STRING="/usr" \ -DNCURSESDIR:STRING="/usr" \ -DMPICH:BOOL=NO \ -DMAGICK:BOOL=NO CPPFLAGS+= ${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION LDFLAGS+= -lpthread -L${LOCALBASE}/lib SLAVEDIRS= science/py-gnudatalanguage OPTIONS_DEFINE= EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON QHULL UDUNITS OPTIONS_DEFAULT=EIGEN FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS EIGEN_DESC= Eigen3 support (boost performance) EIGEN_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 EIGEN_CMAKE_ON= -DEIGEN3:BOOL=YES EIGEN_CMAKE_OFF= -DEIGEN3:BOOL=NO FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float FFTW_CMAKE_ON= -DFFTW:BOOL=YES FFTW_CMAKE_OFF= -DFFTW:BOOL=NO GRAPHICSMAGICK_DESC= Support GraphicsMagick GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick GRAPHICSMAGICK_CMAKE_ON= -DGRAPHICSMAGICK:BOOL=YES GRAPHICSMAGICK_CMAKE_OFF= -DGRAPHICSMAGICK:BOOL=NO GRIB_DESC= Support GRIB messages GRIB_LIB_DEPENDS= libgrib_api.so:science/grib_api GRIB_CMAKE_ON= -DGRIB:BOOL=YES GRIB_CMAKE_OFF= -DGRIB:BOOL=NO HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 HDF5_CMAKE_ON= -DHDF5:BOOL=YES HDF5_CMAKE_OFF= -DHDF5:BOOL=NO -DHDF:BOOL=NO LIBPROJ4_DESC= Support cartographic processes LIBPROJ4_LIB_DEPENDS= libproj.so:graphics/proj LIBPROJ4_CMAKE_ON= -DLIBPROJ4:BOOL=YES LIBPROJ4_CMAKE_OFF= -DLIBPROJ4:BOOL=NO MPICH2_LIB_DEPENDS= libmpich.so.8:net/mpich2 MPICH2_CMAKE_ON= -DMPICH:BOOL=YES MPICH2_CMAKE_OFF= -DMPICH:BOOL=NO NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib PYTHON_CMAKE_ON= -DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}" PYTHON_CMAKE_OFF= -DPYTHON:BOOL=NO QHULL_DESC= Enable Qhull support QHULL_LIB_DEPENDS= libqhull.so:math/qhull QHULL_CMAKE_ON= -DQHULL:BOOL=YES QHULL_CMAKE_OFF= -DQHULL:BOOL=NO UDUNITS_LIB_DEPENDS= libudunits2.so:science/udunits UDUNITS_CMAKE_ON= -DUDUNITS:BOOL=YES UDUNITS_CMAKE_OFF= -DUDUNITS:BOOL=NO .if defined(BUILD_PYTHON_MODULE) CATEGORIES+= python CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO PLIST= pkg-plist.pymod .else CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=NO .endif .if defined(BUILD_PYTHON_MODULE) do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so .endif .if !defined(BUILD_PYTHON_MODULE) post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite (cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/) .endif .if defined(MAINTAINER_MODE) regression-test: install . if defined(BUILD_PYTHON_MODULE) @${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py @${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py ${PYTHON_CMD} ${WRKDIR}/testgdl.py . else @${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro" \ > ${WRKDIR}/testgdl @${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl ${PREFIX}/bin/gdl < ${WRKDIR}/testgdl . endif .endif .include Index: head/science/kst2/Makefile =================================================================== --- head/science/kst2/Makefile (revision 439927) +++ head/science/kst2/Makefile (revision 439928) @@ -1,64 +1,65 @@ # Created by: Markus Brueffer # $FreeBSD$ PORTNAME= kst DISTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= science kde MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/ DISTNAME= Kst-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Data viewing and plotting tool LIB_DEPENDS= libgsl.so:math/gsl USES= cmake:outsource pkgconfig _USE_QT4= gui xml designer svg linguisttools_build \ qmake_build moc_build rcc_build uic_build _USE_QT5= concurrent network printsupport widgets xml \ buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes CMAKE_ARGS+= -Dkst_install_prefix=${PREFIX} \ -Dkst_pch=off PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= FITS MATLAB NETCDF OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= QT4 QT5 OPTIONS_DEFAULT= QT4 OPTIONS_SUB= yes FITS_DESC= Support for data in FITS format FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio MATLAB_DESC= Support for data in MATLAB format MATLAB_LIB_DEPENDS= libmatio.so:math/matio NETCDF_DESC= Support for data in NetCDF format (broken) NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_IGNORE= does not support NetCDF 4 TOOLKIT_DESC= Qt toolkit QT4_USE= ${_USE_QT4:S/^/QT4=/} QT5_USE= ${_USE_QT5:S/^/QT5=/} QT5_CMAKE_ON= -Dkst_qt5=on post-patch: ${REINPLACE_CMD} -e '/^Exec=kst2/s,\(kst2\).*,\1 %f,' \ ${WRKSRC}/src/kst/kst2.desktop post-patch-FITS-off: ${REINPLACE_CMD} -e '/find_package(CFITSIO)/d' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt post-patch-MATLAB-off: ${REINPLACE_CMD} -e '/find_package(Matio)/d' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt post-patch-NETCDF-off: ${REINPLACE_CMD} -e '/find_package(Netcdf)/d' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt .include Index: head/science/kst2/files/patch-git_a9d24f9 =================================================================== --- head/science/kst2/files/patch-git_a9d24f9 (nonexistent) +++ head/science/kst2/files/patch-git_a9d24f9 (revision 439928) @@ -0,0 +1,106 @@ +Backport of: +https://github.com/Kst-plot/kst/commit/a9d24f91057441bbd2e3ed9e7536b071121526cb + +From a9d24f91057441bbd2e3ed9e7536b071121526cb Mon Sep 17 00:00:00 2001 +From: "D. V. Wiebe" +Date: Thu, 10 Mar 2016 14:09:26 -0800 +Subject: [PATCH] GSL-2.x support. + + +--- src/plugins/fits/non_linear.h.orig 2014-02-13 09:41:44 UTC ++++ src/plugins/fits/non_linear.h +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include "common.h" + + struct data { +@@ -100,6 +101,7 @@ bool kstfit_nonlinear( + gsl_multifit_function_fdf function; + gsl_vector_view vectorViewInitial; + gsl_matrix* pMatrixCovariance; ++ gsl_matrix* pMatrixJacobian; + struct data d; + double dXInitial[NUM_PARAMS]; + double* pInputX; +@@ -177,7 +179,16 @@ bool kstfit_nonlinear( + } + iIterations++; + } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++#if GSL_MAJOR_VERSION >= 2 ++ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS ); ++#else ++ pMatrixJacobian = pSolver->J; ++#endif ++ if ( pMatrixJacobian != NULL ) { ++#if GSL_MAJOR_VERSION >= 2 ++ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian ); ++#endif ++ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance ); + + // + // determine the fitted values... +@@ -207,7 +218,10 @@ bool kstfit_nonlinear( + scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); + + bReturn = true; +- ++#if GSL_MAJOR_VERSION >= 2 ++ gsl_matrix_free( pMatrixJacobian ); ++#endif ++ } + gsl_matrix_free( pMatrixCovariance ); + } + gsl_multifit_fdfsolver_free( pSolver ); +--- src/plugins/fits/non_linear_weighted.h.orig 2014-02-13 09:41:44 UTC ++++ src/plugins/fits/non_linear_weighted.h +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include "common.h" + + struct data { +@@ -101,6 +102,7 @@ bool kstfit_nonlinear_weighted( + gsl_multifit_function_fdf function; + gsl_vector_view vectorViewInitial; + gsl_matrix* pMatrixCovariance; ++ gsl_matrix* pMatrixJacobian; + struct data d; + double dXInitial[NUM_PARAMS]; + double* pInputs[3]; +@@ -193,7 +195,17 @@ bool kstfit_nonlinear_weighted( + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++#if GSL_MAJOR_VERSION >= 2 ++ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS ); ++#else ++ pMatrixJacobian = pSolver->J; ++#endif ++ ++ if ( pMatrixJacobian != NULL ) { ++#if GSL_MAJOR_VERSION >= 2 ++ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian ); ++#endif ++ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance ); + + // + // determine the fitted values... +@@ -223,7 +235,10 @@ bool kstfit_nonlinear_weighted( + scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); + + bReturn = true; +- ++#if GSL_VERSION_MAJOR >= 2 ++ gsl_matrix_free( pMatrixJacobian ); ++#endif ++ } + gsl_matrix_free( pMatrixCovariance ); + } + gsl_multifit_fdfsolver_free( pSolver ); Property changes on: head/science/kst2/files/patch-git_a9d24f9 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/py-mlpy/Makefile =================================================================== --- head/science/py-mlpy/Makefile (revision 439927) +++ head/science/py-mlpy/Makefile (revision 439928) @@ -1,27 +1,27 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= mlpy PORTVERSION= 3.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= High performance Python package for predictive modeling LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ cython>0:lang/cython RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libgsl.so:math/gsl USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core LDFLAGS+= -L${LOCALBASE}/lib USES= python USE_PYTHON= distutils autoplist .include Index: head/science/step/Makefile =================================================================== --- head/science/step/Makefile (revision 439927) +++ head/science/step/Makefile (revision 439928) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= step PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= KDE 4 interactive physics simulator BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 LIB_DEPENDS= libqalculate.so:math/libqalculate \ libgsl.so:math/gsl USES= cmake:outsource kde:4 pkgconfig tar:xz USE_KDE= kdelibs automoc4 USE_QT4= opengl moc_build qmake_build rcc_build uic_build pre-configure: # Avoid building translations, should the user pass # CURRENT_LANG to CMake. ${REINPLACE_CMD} -e '/set(STEP_BUILD_TRANSLATIONS 1)/ d' \ ${WRKSRC}/${PORTNAME}/data/CMakeLists.txt .include