diff options
| author | pav <pav@FreeBSD.org> | 2005-07-06 23:24:22 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2005-07-06 23:24:22 +0800 |
| commit | e20710529e63bab2ac5f515e2ced2073e71eb270 (patch) | |
| tree | a995ee542b9d91e9683d84f8117c4cfe1c6cbe88 | |
| parent | be0796371dd39db9a9ea30ef598b862aa1c40e62 (diff) | |
| download | freebsd-ports-gnome-e20710529e63bab2ac5f515e2ced2073e71eb270.tar.gz freebsd-ports-gnome-e20710529e63bab2ac5f515e2ced2073e71eb270.tar.zst freebsd-ports-gnome-e20710529e63bab2ac5f515e2ced2073e71eb270.zip | |
- Update to 0.5.0.1
PR: ports/82942
Submitted by: KATO Tsuguru <tkato432@yahoo.com>
| -rw-r--r-- | math/fityk/Makefile | 57 | ||||
| -rw-r--r-- | math/fityk/distinfo | 4 | ||||
| -rw-r--r-- | math/fityk/files/patch-src-numfuncs.cpp | 11 |
3 files changed, 57 insertions, 15 deletions
diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 05bdd8f2458d..72f7dee3e7a5 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -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 --git a/math/fityk/distinfo b/math/fityk/distinfo index f196c79c676d..97f12c3252bc 100644 --- a/math/fityk/distinfo +++ b/math/fityk/distinfo @@ -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 --git a/math/fityk/files/patch-src-numfuncs.cpp b/math/fityk/files/patch-src-numfuncs.cpp new file mode 100644 index 000000000000..51aba8539591 --- /dev/null +++ b/math/fityk/files/patch-src-numfuncs.cpp @@ -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 |