Date: Fri, 27 Jun 2014 01:07:04 +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: r359428 - in head/comms/wspr: . files Message-ID: <201406270107.s5R174ZI027759@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Fri Jun 27 01:07:04 2014 New Revision: 359428 URL: http://svnweb.freebsd.org/changeset/ports/359428 QAT: https://qat.redports.org/buildarchive/r359428/ Log: - Fix build - Stagify - change MAINTAINER to team hamradio@ Modified: head/comms/wspr/Makefile head/comms/wspr/files/patch-Makefile.in Modified: head/comms/wspr/Makefile ============================================================================== --- head/comms/wspr/Makefile Fri Jun 27 00:51:13 2014 (r359427) +++ head/comms/wspr/Makefile Fri Jun 27 01:07:04 2014 (r359428) @@ -3,13 +3,13 @@ PORTNAME= wspr DISTVERSION= ${VERSION}.r${SVN_REV} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= db DISTNAME= wspr-r${SVN_REV} -MAINTAINER= db@FreeBSD.org +MAINTAINER= hamradio@FreeBSD.org COMMENT= Weak signal for HF ham radio communication package RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \ @@ -21,8 +21,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/scip ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \ ${PYNUMPY} -USES= fortran gmake -USE_BZIP2= yes +USES= fortran gmake libtool tar:bzip2 ALL_TARGET= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \ @@ -31,7 +30,6 @@ CONFIGURE_ARGS= --enable-gfortran --pref 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} @@ -43,6 +41,9 @@ post-configure: @cp ${FILESDIR}/wspr ${WRKSRC} post-build: + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) ${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in ${WRKSRC}/LICENSE.TXT ${WRKSRC}/WSPR_Announcement.TXT \ ${WRKSRC}/WSPR0_Instructions.TXT ${WRKSRC}/WSPR_Quick_Start.TXT \ Modified: head/comms/wspr/files/patch-Makefile.in ============================================================================== --- head/comms/wspr/files/patch-Makefile.in Fri Jun 27 00:51:13 2014 (r359427) +++ head/comms/wspr/files/patch-Makefile.in Fri Jun 27 01:07:04 2014 (r359428) @@ -1,5 +1,5 @@ --- Makefile.in.orig 2012-01-25 09:30:23.000000000 -0500 -+++ Makefile.in 2014-06-08 10:41:32.558914398 -0400 ++++ Makefile.in 2014-06-26 20:50:27.000000000 -0400 @@ -8,6 +8,7 @@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ @@ -26,24 +26,24 @@ ${F2PY} -c --quiet --noopt --debug -m w \ --f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \ --fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \ -@@ -102,8 +108,8 @@ +@@ -102,8 +108,9 @@ ${CPPFLAGS} ${LDFLAGS} ${LIBS} \ only: $(F2PYONLY) : \ $(SRCS2F90) $(SRCS2F77) $(SRCS2C) - ${MKDIR} -p build/lib/WsprMod ${MV} w.so WsprMod/w.so ++ ${PYTHON} setup.py install --prefix=${DESTDIR}${PREFIX} +# ${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 @@ +@@ -140,9 +147,7 @@ $(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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406270107.s5R174ZI027759>