Date: Wed, 14 Jul 2010 03:01:10 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/148561: Update port: math/fityk to 0.6.3 Message-ID: <20100714030110.aea32488.tkato432@yahoo.com> Resent-Message-ID: <201007131810.o6DIABiN084454@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148561
>Category: ports
>Synopsis: Update port: math/fityk to 0.6.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jul 13 18:10:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.3
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/fityk/Makefile math/fityk/Makefile
--- /usr/ports/math/fityk/Makefile 2010-03-28 17:40:51.000000000 +0900
+++ math/fityk/Makefile 2010-05-28 05:01:45.000000000 +0900
@@ -7,15 +7,18 @@
#
PORTNAME= fityk
-PORTVERSION= 0.9.0
-PORTREVISION= 2
+PORTVERSION= 0.9.2
CATEGORIES= math
-MASTER_SITES= SF
+MASTER_SITES= SF \
+ SF/xylib:xylib
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
+ ${XYLIB_DISTNAME}${EXTRACT_SUFX}:xylib
MAINTAINER= ports@FreeBSD.org
COMMENT= Free peak fitting software
-BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/core.hpp:${PORTSDIR}/devel/boost-libs \
+ gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
USE_BZIP2= yes
@@ -25,24 +28,43 @@
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-xylib --without-doc --disable-xyconvert
+CONFIGURE_ARGS= --without-doc --disable-xyconvert
USE_LDCONFIG= yes
MAN1= fityk.1 xyconv.1
PORTDOCS= *
CFLAGS+= -D_GNU_SOURCE
-CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${WRKDIR}/${XYLIB_DISTNAME} \
+ -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \
+ -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+XYLIB_DISTNAME= xylib-0.6
post-patch:
@${REINPLACE_CMD} -e '/HELP_DEF/s|pkgdatadir|docdir|g' \
${WRKSRC}/src/wxgui/Makefile.in
@${REINPLACE_CMD} -e '/XYLIB_USE_TR1_MEMORY/s| 1| 0|g' \
- ${WRKSRC}/xylib/xylib/cache.h
+ ${WRKDIR}/${XYLIB_DISTNAME}/xylib/cache.h
+
+pre-configure:
+ @cd ${WRKDIR}/${XYLIB_DISTNAME} \
+ && ${SH} ./configure --disable-shared \
+ CC="${CC}" CFLAGS="${CFLAGS}" \
+ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+pre-build:
+ @cd ${WRKDIR}/${XYLIB_DISTNAME} \
+ && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${ALL_TARGET}
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)
@${MKDIR} ${DOCSDIR}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR})
diff -urN /usr/ports/math/fityk/distinfo math/fityk/distinfo
--- /usr/ports/math/fityk/distinfo 2010-01-27 16:31:19.000000000 +0900
+++ math/fityk/distinfo 2010-06-25 21:24:01.000000000 +0900
@@ -1,3 +1,6 @@
-MD5 (fityk-0.9.0.tar.bz2) = bba2ee31335a574eab6fa9e338469e2a
-SHA256 (fityk-0.9.0.tar.bz2) = 50a2b34f1d3a2f2bdc3e41dcb0ea090210296f3dad62e5ed62c0820704f03985
-SIZE (fityk-0.9.0.tar.bz2) = 1593059
+MD5 (fityk-0.9.2.tar.bz2) = c710b3756a5db5b6341ee90ebcce12dc
+SHA256 (fityk-0.9.2.tar.bz2) = 16c9e85be2191ca3fbc527ff36cffdccf8e2f1ddeb34b2b622482488b604c857
+SIZE (fityk-0.9.2.tar.bz2) = 984246
+MD5 (xylib-0.6.tar.bz2) = 997d53ecea59c3f341250a3fc02c1b1b
+SHA256 (xylib-0.6.tar.bz2) = 86166e6df9dd6fe1c7581f9d111ca5e4d8b84656f94e25133b541054d95c834e
+SIZE (xylib-0.6.tar.bz2) = 288815
diff -urN /usr/ports/math/fityk/pkg-plist math/fityk/pkg-plist
--- /usr/ports/math/fityk/pkg-plist 2010-01-27 16:31:19.000000000 +0900
+++ math/fityk/pkg-plist 2010-05-28 04:59:00.000000000 +0900
@@ -1,36 +1,14 @@
bin/cfityk
bin/fityk
bin/xyconv
-include/fityk/brucker_raw.h
-include/fityk/cache.h
-include/fityk/canberra_mca.h
-include/fityk/cpi.h
-include/fityk/dbws.h
-include/fityk/gsas.h
-include/fityk/pdcif.h
-include/fityk/philips_raw.h
-include/fityk/philips_udf.h
-include/fityk/riet7.h
-include/fityk/rigaku_dat.h
-include/fityk/text.h
-include/fityk/uxd.h
-include/fityk/vamas.h
-include/fityk/winspec_spe.h
-include/fityk/xfit_xdd.h
-include/fityk/xylib.h
include/fityk.h
lib/libfityk.a
lib/libfityk.la
lib/libfityk.so
lib/libfityk.so.2
-lib/libxy.a
-lib/libxy.la
-lib/libxy.so
-lib/libxy.so.2
share/applications/fityk.desktop
share/mime/packages/fityk.xml
share/pixmaps/fityk.png
@dirrmtry share/applications
-@dirrm include/fityk
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100714030110.aea32488.tkato432>