Date: Thu, 10 Sep 2015 13:51:23 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396569 - head/comms/wsjt Message-ID: <201509101351.t8ADpNx4013408@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Thu Sep 10 13:51:22 2015 New Revision: 396569 URL: https://svnweb.freebsd.org/changeset/ports/396569 Log: Clean up wsjt build and update to reflect latest version Upstream version is now 10 Fix dependency to reflect new naming of tkinter under python3 Fix dependency for kvasd as it is installed in LOCALBASE not LINUXBASE Modified: head/comms/wsjt/Makefile Modified: head/comms/wsjt/Makefile ============================================================================== --- head/comms/wsjt/Makefile Thu Sep 10 12:48:26 2015 (r396568) +++ head/comms/wsjt/Makefile Thu Sep 10 13:51:22 2015 (r396569) @@ -2,7 +2,6 @@ PORTNAME= wsjt DISTVERSION= ${VERSION}.r${SVN_REV} -PORTREVISION= 12 CATEGORIES= comms hamradio MASTER_SITES= LOCAL/db DISTNAME= wsjt-r${SVN_REV} @@ -16,12 +15,12 @@ LIB_DEPENDS= libfftw3.so:${PORTSDIR}/mat libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libportaudio.so:${PORTSDIR}/audio/portaudio -WSJT_DEPENDS= ${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \ +WSJT_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \ ${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \ ${PYNUMPY} BUILD_DEPENDS= ${WSJT_DEPENDS} -RUN_DEPENDS= kvasd:${PORTSDIR}/comms/kvasd \ +RUN_DEPENDS= ${LOCALBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \ ${WSJT_DEPENDS} USE_GCC= yes @@ -29,15 +28,13 @@ USES= autoreconf fortran gmake python:3 SHEBANG_FILES= ${WRKSRC}/wsjt GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${STAGEDIR}${LOCALBASE} \ - --with-python=${PYTHON_CMD} \ - --with-gfortran=${FC} \ --with-portaudio-include-dir=${LOCALBASE}/include \ --with-portaudio-lib-dir=${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib # Adding this breaks configure #LDFLAGS+= -shared -VERSION= 9.1 +VERSION= 10 PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ VERSION=${VERSION} @@ -98,8 +95,4 @@ post-configure: ${REINPLACE_CMD} -e 's|f2py|f2py-${PYTHON_VER}|' \ ${WRKSRC}/Makefile -.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509101351.t8ADpNx4013408>