- Interim fix of wspr to fix build

- add staging whilst here

2 files changed, 58 insertions, 15 deletions

diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 21556971bdab..3319a9fefe62 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
@@ -25,37 +25,30 @@ USES=		fortran gmake
 USE_BZIP2=	yes
 ALL_TARGET=	build
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
+CONFIGURE_ARGS=	--enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
 		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
+MAKE_ENV+=	PYTHONUSERBASE=${STAGEDIR}${PYTHONBASE}
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		VERSION=${VERSION}
 VERSION=	3.00
 
-NO_STAGE=	yes
-
 .include <bsd.port.pre.mk>
 post-configure:
-	cp ${FILESDIR}/wspr ${WRKSRC}
+	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|' ${WRKSRC}/Makefile
+	@cp ${FILESDIR}/wspr ${WRKSRC}
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+post-build:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${WRKSRC}/LICENSE.TXT ${WRKSRC}/WSPR_Announcement.TXT \
 	${WRKSRC}/WSPR0_Instructions.TXT ${WRKSRC}/WSPR_Quick_Start.TXT \
 	${WRKSRC}/supported_rigs.txt
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${ECHO}
-	@${ECHO} "docs installed in ${DOCSDIR}"
-	@${ECHO}
-.endif
-	@${CAT} ${PKGMESSAGE}
-
 .if defined(BOOTSTRAP)
 SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/code/branches/wspr | ${GREP} Revision | cut -d' ' -f2
 .else
diff --git a/comms/wspr/files/patch-Makefile.in b/comms/wspr/files/patch-Makefile.in
new file mode 100644
index 000000000000..29f59f10d0c3
--- /dev/null
+++ b/comms/wspr/files/patch-Makefile.in
@@ -0,0 +1,50 @@
+--- Makefile.in.orig	2012-01-25 09:30:23.000000000 -0500
++++ Makefile.in	2014-06-08 10:41:32.558914398 -0400
+@@ -8,6 +8,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS	= @CFLAGS@
+ PREFIX	= @PREFIX@
++DESTDIR	= %%DESTDIR%%
+ # ${CFLAGS}# WSPR specific C flags
+ CFLAGS	+= -DBIGSYM=1 -fPIC
+ DEFS = @DEFS@
+@@ -90,11 +91,16 @@
+ 
+ OBJS2F77 = ${SRCS2F77:.f=.o} deep65.o
+ 
+-SRCS2C = padevsub.c start_threads.c sound.c gmtime2.c ptt_unix.c \
++SRCS2C = start_threads.c sound.c gmtime2.c ptt_unix.c \
+ 	nhash.c fthread.c
+ OBJS2C  = ${SRCS2C:.c=.o}
+ 
++padevsub.o:	padevsub.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c padevsub.c
++
+ WsprMod/w.so:	${OBJS2C} $(SRCS2C) $(SRCS2F90) $(SRCS2F77) acom1.f90
++	echo DESTDIR = ${DESTDIR}
++	echo PREFIX = ${PREFIX}
+ 	${F2PY} -c --quiet --noopt --debug -m w \
+ 	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
+ 	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
+@@ -102,8 +108,8 @@
+ 	${CPPFLAGS} ${LDFLAGS} ${LIBS} \
+ 	only: $(F2PYONLY) : \
+ 	$(SRCS2F90) $(SRCS2F77) $(SRCS2C)
+-	${MKDIR} -p build/lib/WsprMod
+ 	${MV} w.so WsprMod/w.so
++#	${PYTHON} setup.py build_py  
+ 
+ fmt: fmt.f90 fil1.f90 four2a.f peakup.f db.f sound.o 
+ 	$(FC) -o fmt fmt.f90 fil1.f90 four2a.f peakup.f db.f \
+@@ -140,9 +146,8 @@
+ 	$(FC) -o wwv $(FFLAGS) $(LDFLAGS) $(OBJS6) -lportaudio -lsamplerate -lfftw3f
+ 
+ install: WsprMod/w.so
+-	${RM} -rf build/
+-	${PYTHON} setup.py install
+-	${INSTALL} wspr ${PREFIX}/bin
++	${PYTHON} setup.py install --prefix=${DESTDIR}${PREFIX}
++	${INSTALL} wspr ${DESTDIR}${PREFIX}/bin
+ 
+ deb: wspr.py WsprMod/w.so WsprMod/g.py WsprMod/__init__.py \
+ 	WsprMod/advanced.py \