Date: Mon, 4 Jul 2005 03:00:20 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82942: Update port: math/fityk to 0.5.0.1 Message-ID: <20050704030020.7b3d728e.tkato432@yahoo.com> Resent-Message-ID: <200507031810.j63IAKlj084488@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82942
>Category: ports
>Synopsis: Update port: math/fityk to 0.5.0.1
>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: Sun Jul 03 18:10:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 0.5.0.1
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/fityk/Makefile math/fityk/Makefile
--- /usr/ports/math/fityk/Makefile Sat May 28 12:35:06 2005
+++ math/fityk/Makefile Mon Jul 4 02:11:56 2005
@@ -7,27 +7,58 @@
#
PORTNAME= fityk
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.5.0.1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Free peak fitting software
-BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
- readline.5:${PORTSDIR}/devel/readline
+BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost \
+ gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS= ${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost \
+ gnuplot:${PORTSDIR}/math/gnuplot
-USE_GNOME= gnometarget
-GNU_CONFIGURE= yes
-CPPFLAGS+= "-I${LOCALBASE}/include"
-LDFLAGS+= "-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --enable-optimization --with-wx-config=wxgtk2-2.4-config
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
+USE_GNOME= gnometarget gtk20
+USE_REINPLACE= yes
USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+MAN1= fityk.1
+
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500018
+LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline
+CONFIGURE_ARGS+= --with-readline=${LOCALBASE}
+.endif
+
+.if ${OSVERSION} < 500035
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
+CFLAGS+= -fpermissive
+CPPFLAGS+= -I${LOCALBASE}/include/stlport
+LDFLAGS+= -lstlport_gcc
+.endif
+
+.if defined(WITH_WXGTK24)
+LIB_DEPENDS+= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.4-config
+.else
+LIB_DEPENDS+= wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config
+.endif
-MAN1= fityk.1
+post-patch:
+ @${REINPLACE_CMD} -e 's|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|config 3rdparty|config|g' ${WRKSRC}/Makefile.in
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/math/fityk/distinfo math/fityk/distinfo
--- /usr/ports/math/fityk/distinfo Tue Mar 8 11:08:05 2005
+++ math/fityk/distinfo Mon Jul 4 01:51:43 2005
@@ -1,2 +1,2 @@
-MD5 (fityk-0.4.4.tar.gz) = 022e9a434b0a0267d26f25a2342258aa
-SIZE (fityk-0.4.4.tar.gz) = 551469
+MD5 (fityk-0.5.0p1.tar.gz) = 5db430dbd8cb5b8bac4d772580e44a45
+SIZE (fityk-0.5.0p1.tar.gz) = 1335150
diff -urN /usr/ports/math/fityk/files/patch-src-numfuncs.cpp math/fityk/files/patch-src-numfuncs.cpp
--- /usr/ports/math/fityk/files/patch-src-numfuncs.cpp Thu Jan 1 09:00:00 1970
+++ math/fityk/files/patch-src-numfuncs.cpp Mon Jul 4 01:27:23 2005
@@ -0,0 +1,11 @@
+--- src/numfuncs.cpp.orig Sun May 22 01:35:44 2005
++++ src/numfuncs.cpp Mon Jul 4 01:27:08 2005
+@@ -5,6 +5,8 @@
+ #include "data.h"
+ #include "numfuncs.h"
+
++#include <algorithm>
++
+ using namespace std;
+
+ vector<B_point>::iterator
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050704030020.7b3d728e.tkato432>