From owner-svn-ports-all@FreeBSD.ORG Wed Apr 3 14:14:43 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9C4A5135; Wed, 3 Apr 2013 14:14:43 +0000 (UTC) (envelope-from sperber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8D6302C5; Wed, 3 Apr 2013 14:14:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33EEhDc055025; Wed, 3 Apr 2013 14:14:43 GMT (envelope-from sperber@svn.freebsd.org) Received: (from sperber@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33EEhjL055019; Wed, 3 Apr 2013 14:14:43 GMT (envelope-from sperber@svn.freebsd.org) Message-Id: <201304031414.r33EEhjL055019@svn.freebsd.org> From: Armin Pirkovitsch Date: Wed, 3 Apr 2013 14:14:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315709 - head/math/fityk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 14:14:43 -0000 Author: sperber Date: Wed Apr 3 14:14:42 2013 New Revision: 315709 URL: http://svnweb.freebsd.org/changeset/ports/315709 Log: - Update fityk to 0.9.8 (to unbreak build) - Update xylib to 1.1 - Fix MASTER_SITES - Trim Makefile header - Update MAINTAINER to my FreeBSD address - Switch to OptionsNG Reported by: pointyhat Approved by: portmgr / mentor (miwi) Modified: head/math/fityk/Makefile (contents, props changed) head/math/fityk/distinfo (contents, props changed) head/math/fityk/pkg-plist (contents, props changed) Modified: head/math/fityk/Makefile ============================================================================== --- head/math/fityk/Makefile Wed Apr 3 12:39:42 2013 (r315708) +++ head/math/fityk/Makefile Wed Apr 3 14:14:42 2013 (r315709) @@ -1,30 +1,26 @@ -# ex:ts=8 -# Ports collection makefile for: fityk -# Date created: Mar 8, 2005 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= fityk -PORTVERSION= 0.9.4 -PORTREVISION= 2 +PORTVERSION= 0.9.8 CATEGORIES= math -MASTER_SITES= SF \ - SF/xylib:xylib +MASTER_SITES= SF/xylib:xylib DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \ ${XYLIB_DISTNAME}${EXTRACT_SUFX}:xylib -MAINTAINER= armin@frozen-zone.org +MAINTAINER= sperber@FreeBSD.org COMMENT= Free peak fitting software -BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/core.hpp:${PORTSDIR}/devel/boost-libs \ - gnuplot:${PORTSDIR}/math/gnuplot -RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot - LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi +BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:${PORTSDIR}/devel/boost-libs \ + gnuplot:${PORTSDIR}/math/gnuplot +RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_GITHUB= yes +GH_ACCOUNT= wojdyr USE_BZIP2= yes USE_GNOME= gtk20 USE_WX= 2.8+ @@ -33,6 +29,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --without-doc --disable-xyconvert USE_LDCONFIG= yes +USE_GCC= any MAN1= fityk.1 xyconv.1 PORTDOCS= * @@ -43,7 +40,9 @@ CPPFLAGS+= -I${WRKDIR}/${XYLIB_DISTNAME} LDFLAGS+= -L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \ -L${LOCALBASE}/lib ${PTHREAD_LIBS} -XYLIB_DISTNAME= xylib-0.6 +XYLIB_DISTNAME= xylib-1.1 + +.include post-patch: @${REINPLACE_CMD} -e '/HELP_DEF/s|pkgdatadir|docdir|g' \ @@ -68,7 +67,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/doc/fityk.1 ${MANPREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv ${PREFIX}/bin ${INSTALL_MAN} ${WRKDIR}/${XYLIB_DISTNAME}/xyconv.1 ${MANPREFIX}/man/man1 -.if !defined(NOPORTDOCS) +.if defined(PORT_OPTIONS:MDOCS) @${MKDIR} ${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}) .endif Modified: head/math/fityk/distinfo ============================================================================== --- head/math/fityk/distinfo Wed Apr 3 12:39:42 2013 (r315708) +++ head/math/fityk/distinfo Wed Apr 3 14:14:42 2013 (r315709) @@ -1,4 +1,4 @@ -SHA256 (fityk-0.9.4.tar.bz2) = 81d5858a982aba91a8efe23295b69e9eaf61f83ab969acafee2eec8f17f50a4d -SIZE (fityk-0.9.4.tar.bz2) = 1011233 -SHA256 (xylib-0.6.tar.bz2) = 86166e6df9dd6fe1c7581f9d111ca5e4d8b84656f94e25133b541054d95c834e -SIZE (xylib-0.6.tar.bz2) = 288815 +SHA256 (fityk-0.9.8.tar.bz2) = ac9c38979e06b1e848beb02c563c3307cbbd832eca951e05402f777c91bad77c +SIZE (fityk-0.9.8.tar.bz2) = 1050468 +SHA256 (xylib-1.1.tar.bz2) = eb201ec9eca9ba84547fb590839e6e9177ca252eb8edb4b10785ff506c27bddb +SIZE (xylib-1.1.tar.bz2) = 288366 Modified: head/math/fityk/pkg-plist ============================================================================== --- head/math/fityk/pkg-plist Wed Apr 3 12:39:42 2013 (r315708) +++ head/math/fityk/pkg-plist Wed Apr 3 14:14:42 2013 (r315709) @@ -5,10 +5,25 @@ include/fityk.h lib/libfityk.a lib/libfityk.la lib/libfityk.so -lib/libfityk.so.2 +lib/libfityk.so.3 share/applications/fityk.desktop share/mime/packages/fityk.xml share/pixmaps/fityk.png +share/fityk/samples/hello.lua +share/fityk/samples/SiC_Zn.dat +share/fityk/samples/hello.cc +share/fityk/samples/SiC_Zn.fit +share/fityk/samples/hello.pl +share/fityk/samples/hello.py +share/fityk/samples/enso.fit +share/fityk/samples/nacl01.dat +share/fityk/samples/enso.dat +share/fityk/samples/nacl01.fit +share/fityk/samples/README +share/fityk/samples/test_syntax.fit +share/fityk/samples/read-shockley.fit @dirrmtry share/applications +@dirrm share/fityk/samples +@dirrm share/fityk @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime