- unbreak build

- update to 9.1

4 files changed, 27 insertions, 30 deletions

diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 0a9cbc32d579..16576f71387a 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	wsjt
-PORTVERSION=	7.04
-PORTREVISION=	4
+VERSION=	9.1
+DISTVERSION=	${VERSION}.r${SVN_REV}
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
@@ -24,10 +24,9 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		${PYNUMPY}
 
-BROKEN=		does not build
-
 ALL_TARGET=	build
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
@@ -38,46 +37,44 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	2.5+
 USE_AUTOTOOLS=	libtool
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
-		PORTVERSION=${PORTVERSION}
+		VERSION=${VERSION}
 
 .include <bsd.port.pre.mk>
-post-configure:
-	@${REINPLACE_CMD} -e 's|-Wl.*||' ${WRKSRC}/Makefile
-
-post-install:
-.if	!defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf  ${WRKSRC}/WSJT_Source_Code.txt \
-	${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \
-	${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
-.endfor
-	@${ECHO}
-	@${ECHO} "docs installed in ${DOCSDIR}"
-	@${ECHO}
-.endif
-	@${CAT} ${PKGMESSAGE}
 
 .if defined(BOOTSTRAP)
-SVN_REV!=	svn info http://svn.berlios.de/svnroot/repos/wsjt/trunk/ | ${GREP} Revision | cut -d' ' -f2
+SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/code/trunk/ | ${GREP} Revision | cut -d' ' -f2
 .else
 .include "Makefile.svn_rev"
 .endif
 
-.if defined(BOOTSTRAP)
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
 	svn export -r ${SVN_REV} \
-	    http://svn.berlios.de/svnroot/repos/wsjt/trunk ${WRKSRC}
+		http://svn.code.sf.net/p/wsjt/code/trunk ${WRKDIR}/wsjt-r${SVN_REV}
 	cd ${WRKDIR};rm -f ${DISTNAME}/*.a ${DISTNAME}/*.lib ${DISTNAME}/*.dll;\
 		tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-	echo "SVN_REV=	${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
 .if ${USER} == db
 	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    freefall.freebsd.org:public_distfiles/
+		freefall.freebsd.org:public_distfiles/
 .endif
 .endif
 
+post-install:
+.if	!defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for d in ${WRKSRC}/WSJT_Quick_Reference.pdf  ${WRKSRC}/WSJT_Source_Code.txt \
+	${WRKSRC}/WSJT_User_600.pdf ${WRKSRC}/UpdateHistory.txt \
+	${WRKSRC}/WSJT_Source_Code.txt ${WRKSRC}/LICENSE.TXT
+	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+.endfor
+	@${ECHO}
+	@${ECHO} "docs installed in ${DOCSDIR}"
+	@${ECHO}
+.endif
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/comms/wsjt/Makefile.svn_rev b/comms/wsjt/Makefile.svn_rev
index efb8ab613d94..ca63d73fe43d 100644
--- a/comms/wsjt/Makefile.svn_rev
+++ b/comms/wsjt/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	1228
+SVN_REV=  2511
diff --git a/comms/wsjt/distinfo b/comms/wsjt/distinfo
index 5e3f3f834c69..cee9af0bed94 100644
--- a/comms/wsjt/distinfo
+++ b/comms/wsjt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wsjt-r1228.tar.bz2) = b3203679c1e3d8ff7dfa972730bbb536c1edda1d3d99b68ad6012bd341ee102d
-SIZE (wsjt-r1228.tar.bz2) = 2083342
+SHA256 (wsjt-r2511.tar.bz2) = 3724fd976c1c7449a486b821018c4014d5a6b316c657118ac30dc120706e9b9b
+SIZE (wsjt-r2511.tar.bz2) = 2208647
diff --git a/comms/wsjt/pkg-plist b/comms/wsjt/pkg-plist
index 8e02f5f052c3..778e6e03fe35 100644
--- a/comms/wsjt/pkg-plist
+++ b/comms/wsjt/pkg-plist
@@ -34,7 +34,7 @@ bin/wsjt.py
 %%PYTHON_SITELIBDIR%%/WsjtMod/smeter.pyc
 %%PYTHON_SITELIBDIR%%/WsjtMod/specjt.py
 %%PYTHON_SITELIBDIR%%/WsjtMod/specjt.pyc
-%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%PORTVERSION%%_.by.K1JT-py%%PYVER%%.egg-info
+%%PYTHON_SITELIBDIR%%/Wsjt-WSJT.Version.%%VERSION%%_.by.K1JT-py%%PYVER%%.egg-info
 @dirrm %%PYTHON_SITELIBDIR%%/WsjtMod
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%