diff options
| -rw-r--r-- | math/fityk/Makefile | 34 | ||||
| -rw-r--r-- | math/fityk/distinfo | 6 | ||||
| -rw-r--r-- | math/fityk/files/patch-src-numfuncs.cpp | 11 | ||||
| -rw-r--r-- | math/fityk/pkg-plist | 5 |
4 files changed, 14 insertions, 42 deletions
diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 759026f68470..e6adfea8c9aa 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -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 @@ MAINTAINER= ports@FreeBSD.org 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 --git a/math/fityk/distinfo b/math/fityk/distinfo index 9e5ea8f5dc4d..3f3f4563c33e 100644 --- a/math/fityk/distinfo +++ b/math/fityk/distinfo @@ -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 --git a/math/fityk/files/patch-src-numfuncs.cpp b/math/fityk/files/patch-src-numfuncs.cpp deleted file mode 100644 index 51aba8539591..000000000000 --- a/math/fityk/files/patch-src-numfuncs.cpp +++ /dev/null @@ -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 --git a/math/fityk/pkg-plist b/math/fityk/pkg-plist deleted file mode 100644 index 887eab416d0c..000000000000 --- a/math/fityk/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/cfityk -bin/fityk -%%DATADIR%%/fityk_tips.txt -%%DATADIR%%/fitykhelp.htb -@dirrm %%DATADIR%% |