From owner-svn-ports-head@freebsd.org Mon Apr 4 04:19:15 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC8C8B01DB2; Mon, 4 Apr 2016 04:19:15 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BE481F73; Mon, 4 Apr 2016 04:19:15 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u344JElM005948; Mon, 4 Apr 2016 04:19:14 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u344JEtY005945; Mon, 4 Apr 2016 04:19:14 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604040419.u344JEtY005945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 4 Apr 2016 04:19:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412497 - head/math/saga X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2016 04:19:15 -0000 Author: riggs Date: Mon Apr 4 04:19:14 2016 New Revision: 412497 URL: https://svnweb.freebsd.org/changeset/ports/412497 Log: Update to upstream version 2.2.6 PR: 208481 Submitted by: rhurlin@gwdg.de (maintainer) Modified: head/math/saga/Makefile head/math/saga/distinfo head/math/saga/pkg-plist Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Mon Apr 4 02:25:56 2016 (r412496) +++ head/math/saga/Makefile Mon Apr 4 04:19:14 2016 (r412497) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 2.2.4 -PORTREVISION= 1 +PORTVERSION= 2.2.6 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} +DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses @@ -35,8 +35,6 @@ USES= autoreconf libtool localbase comp iconv:wchar_t dos2unix python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ - "saga_gui" "Science;Geoscience;Math;" true INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -80,7 +78,7 @@ post-extract: ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am post-patch: - @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2832)" + "\\n"|' \ + @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2877)" + "\\n"|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ @@ -90,22 +88,17 @@ post-patch: post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile - @${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv ${STAGEDIR}${DATADIR}/saga_srs.txt ${STAGEDIR}${DATADIR}/saga_prj.srs|g' \ - ${WRKSRC}/src/saga_core/saga_gui/Makefile - @${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_prj.dic|g' \ - ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_contrib|' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.lng.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.ger.txt ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} + ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt +# toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) ${MKDIR} ${STAGEDIR}${DATADIR}/scripting (cd ${WRKSRC}/src/scripting && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scripting) -# toolchains only needed in one place @${RM} -R ${STAGEDIR}${DATADIR}/scripting/toolchains ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ Modified: head/math/saga/distinfo ============================================================================== --- head/math/saga/distinfo Mon Apr 4 02:25:56 2016 (r412496) +++ head/math/saga/distinfo Mon Apr 4 04:19:14 2016 (r412497) @@ -1,2 +1,2 @@ -SHA256 (saga-2.2.4.tar.gz) = efdcb86ce3dcde1b21da2b2d4863b32196bd423588c76d4d5ec301cc93b34582 -SIZE (saga-2.2.4.tar.gz) = 4266724 +SHA256 (saga_2.2.6.tar.gz) = 159fc611b06d13fa446868fa0bf6e8e9c42a83d947428ba2616ff9e4462b4399 +SIZE (saga_2.2.6.tar.gz) = 4238581 Modified: head/math/saga/pkg-plist ============================================================================== --- head/math/saga/pkg-plist Mon Apr 4 02:25:56 2016 (r412496) +++ head/math/saga/pkg-plist Mon Apr 4 04:19:14 2016 (r412497) @@ -68,7 +68,6 @@ lib/saga/libio_esri_e00.so lib/saga/libio_gdal.so lib/saga/libio_gps.so lib/saga/libio_grid.so -lib/saga/libio_grid_grib2.so lib/saga/libio_grid_image.so lib/saga/libio_shapes.so lib/saga/libio_shapes_dxf.so @@ -113,10 +112,23 @@ man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz share/appdata/saga.appdata.xml share/applications/saga.desktop +share/icons/hicolor/128x128/apps/saga.png +share/icons/hicolor/16x16/apps/saga.png +share/icons/hicolor/192x192/apps/saga.png +share/icons/hicolor/24x24/apps/saga.png +share/icons/hicolor/256x256/apps/saga.png +share/icons/hicolor/32x32/apps/saga.png +share/icons/hicolor/48x48/apps/saga.png +share/icons/hicolor/64x64/apps/saga.png +share/icons/hicolor/72x72/apps/saga.png +share/icons/hicolor/80x80/apps/saga.png +share/icons/hicolor/8x8/apps/saga.png +share/icons/hicolor/96x96/apps/saga.png share/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @mode 0666 +%%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @mode