Date: Mon, 13 Feb 2006 03:00:27 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/93241: Update port: math/fityk to 0.7.0 Message-ID: <20060213030027.483d5c36.tkato432@yahoo.com> Resent-Message-ID: <200602121810.k1CIA4Fg096261@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93241
>Category: ports
>Synopsis: Update port: math/fityk to 0.7.0
>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 Feb 12 18:10:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p14 i386
>Organization:
>Environment:
>Description:
- Update to version 0.7.0
Remove file:
files/patch-src-numfuncs.cpp
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/fityk/Makefile math/fityk/Makefile
--- /usr/ports/math/fityk/Makefile Thu Nov 10 16:31:11 2005
+++ math/fityk/Makefile Fri Feb 10 23:59:02 2006
@@ -7,8 +7,7 @@
#
PORTNAME= fityk
-PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,41 +16,30 @@
COMMENT= Free peak fitting software
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
-LIB_DEPENDS= boost_thread.3:${PORTSDIR}/devel/boost
+LIB_DEPENDS= boost_thread.3:${PORTSDIR}/devel/boost \
+ wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
USE_GNOME= gnometarget gtk20
-USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config
MAN1= fityk.1
+PLIST_FILES= bin/cfityk \
+ bin/fityk \
+ %%DATADIR%%/fityk_tips.txt \
+ %%DATADIR%%/fitykhelp.htb
+PLIST_DIRS= %%DATADIR%%
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
+.if ${OSVERSION} < 500000
+BROKEN= "does not compile on 4.x"
.endif
post-patch:
diff -urN /usr/ports/math/fityk/distinfo math/fityk/distinfo
--- /usr/ports/math/fityk/distinfo Sat Nov 26 19:27:38 2005
+++ math/fityk/distinfo Fri Feb 10 23:59:02 2006
@@ -1,3 +1,3 @@
-MD5 (fityk-0.5.1.tar.gz) = 0cc9c0c21fd4edfed723cfe69bb2d43a
-SHA256 (fityk-0.5.1.tar.gz) = b694cf689d1dd22c173fabb1fb43f25c6747234e171551e5eb23089fd7308e44
-SIZE (fityk-0.5.1.tar.gz) = 1372051
+MD5 (fityk-0.7.0.tar.gz) = 8914b5b3144a068dcbbda2d246b7747a
+SHA256 (fityk-0.7.0.tar.gz) = 67d7812ea8cf105a66467ecd9c76c109668b106116fd2009c3ea201921a46e92
+SIZE (fityk-0.7.0.tar.gz) = 1283021
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 Jul 7 00:24:22 2005
+++ math/fityk/files/patch-src-numfuncs.cpp Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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
diff -urN /usr/ports/math/fityk/pkg-plist math/fityk/pkg-plist
--- /usr/ports/math/fityk/pkg-plist Tue Mar 8 11:08:05 2005
+++ math/fityk/pkg-plist Thu Jan 1 09:00:00 1970
@@ -1,5 +0,0 @@
-bin/cfityk
-bin/fityk
-%%DATADIR%%/fityk_tips.txt
-%%DATADIR%%/fitykhelp.htb
-@dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060213030027.483d5c36.tkato432>