Date: Sun, 8 Jun 2014 14:48:56 +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: r357037 - in head/comms/wspr: . files Message-ID: <201406081448.s58Emu8A010443@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sun Jun 8 14:48:55 2014 New Revision: 357037 URL: http://svnweb.freebsd.org/changeset/ports/357037 QAT: https://qat.redports.org/buildarchive/r357037/ Log: - Interim fix of wspr to fix build - add staging whilst here Added: head/comms/wspr/files/patch-Makefile.in (contents, props changed) Modified: head/comms/wspr/Makefile Modified: head/comms/wspr/Makefile ============================================================================== --- head/comms/wspr/Makefile Sun Jun 8 14:16:57 2014 (r357036) +++ head/comms/wspr/Makefile Sun Jun 8 14:48:55 2014 (r357037) @@ -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 Added: head/comms/wspr/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/wspr/files/patch-Makefile.in Sun Jun 8 14:48:55 2014 (r357037) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406081448.s58Emu8A010443>