Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Dec 2006 10:56:23 -0700
From:      Diane Bruce <db@db.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/107357: [MAINTAINER] comms/wsjt: [SUMMARIZE CHANGES]
Message-ID:  <E1H0iRT-0006kp-KO@diana.db.net>
Resent-Message-ID: <200612301800.kBUI0Tgi001672@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         107357
>Category:       ports
>Synopsis:       [MAINTAINER] comms/wsjt: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 30 18:00:29 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Diane Bruce
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
none
>Environment:
System: FreeBSD diana.db.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Sat Oct 14 14:44:56 MDT 2006
>Description:
[DESCRIBE CHANGES]

- fixes upstream bug in get_fname.F90
- changes to fix PIC code in portaudio Makefile,
  should work on amd64 (untested)
- converted to newer py-numpy and no longer use DEPRECATED py-scipy03

Added file(s):
- files/patch-cutil.c
- files/patch-get_fname.F90
- files/patch-portaudio-v19_Makefile.in

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- wsjt-5.9.6_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/comms/wsjt/Makefile /usr/home/db/ports/wsjt/Makefile
--- /usr/ports/comms/wsjt/Makefile	Fri Nov 17 21:52:07 2006
+++ /usr/home/db/ports/wsjt/Makefile	Fri Dec 15 02:46:42 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	wsjt
 PORTVERSION=	5.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	wsjt
@@ -18,20 +18,16 @@
 COMMENT=	Weak signal ham radio communication pakage
 
 BUILD_DEPENDS=	gfortran41:${PORTSDIR}/lang/gfortran \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy03 \
-		${PYTHON_SITELIBDIR}/f2py2e:${PORTSDIR}/lang/f2py
-#		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSIDR}/x11-toolkits/py-tkinter
+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
+		${PYNUMPY}
 LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate
+#		${LINUXBASE}/libg2c:${PORTSDIR}/lang/linux-libg2c
 
-ONLY_FOR_ARCHS=	i386
-ONLY_FOR_ARCHS_REASON=	WIP for amd64 and perhaps others
-
+USE_LINUX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	2.4+
-PYNUMERIC=	yes
 USE_AUTOTOOLS=	libtool:15
-
 #
 # This until Joe renames the tarball properly --db
 #
@@ -54,6 +50,7 @@
 	${WRKSRC}/options.py ${WRKSRC}/smeter.py ${WRKSRC}/g.py
 	@${INSTALL_DATA} ${WRKSRC}/${d} ${PYTHON_SITELIBDIR}
 .endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/KVASD ${PREFIX}/bin
 .if	!defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for d in ${WRKSRC}/Announce.txt ${WRKSRC}/UpdateHistory.txt\
diff -ruN --exclude=CVS /usr/ports/comms/wsjt/files/patch-cutil.c /usr/home/db/ports/wsjt/files/patch-cutil.c
--- /usr/ports/comms/wsjt/files/patch-cutil.c	Wed Dec 31 17:00:00 1969
+++ /usr/home/db/ports/wsjt/files/patch-cutil.c	Mon Dec 11 08:39:13 2006
@@ -0,0 +1,15 @@
+--- cutil.c.orig	Mon Dec 11 10:38:11 2006
++++ cutil.c	Mon Dec 11 10:38:36 2006
+@@ -67,7 +67,11 @@
+   printf("\n\n");
+   exit(*n);
+ }
+-
++struct tm *
++gmtime_r_(const time_t *clock, struct tm *result)
++{
++  gmtime_r(clock, result);
++}
+ time_t time_(void)
+ {
+      return time(0);
diff -ruN --exclude=CVS /usr/ports/comms/wsjt/files/patch-get_fname.F90 /usr/home/db/ports/wsjt/files/patch-get_fname.F90
--- /usr/ports/comms/wsjt/files/patch-get_fname.F90	Wed Dec 31 17:00:00 1969
+++ /usr/home/db/ports/wsjt/files/patch-get_fname.F90	Mon Dec 11 08:39:31 2006
@@ -0,0 +1,19 @@
+--- get_fname.F90.orig	Mon Dec 11 10:38:21 2006
++++ get_fname.F90	Mon Dec 11 10:38:42 2006
+@@ -5,6 +5,7 @@
+   use dfport
+ #endif
+ 
++  external gmtime_r
+   character hiscall*12,fname*24,tag*7
+   integer ntime
+   integer trperiod
+@@ -13,7 +14,7 @@
+   n1=ntime
+   n2=(n1+2)/trperiod
+   n3=n2*trperiod
+-  call gmtime(n3,it)
++  call gmtime_r(n3,it)
+   it(5)=it(5)+1
+   it(6)=mod(it(6),100)
+   write(fname,1000) (it(j),j=6,1,-1)
diff -ruN --exclude=CVS /usr/ports/comms/wsjt/files/patch-portaudio-v19_Makefile.in /usr/home/db/ports/wsjt/files/patch-portaudio-v19_Makefile.in
--- /usr/ports/comms/wsjt/files/patch-portaudio-v19_Makefile.in	Wed Dec 31 17:00:00 1969
+++ /usr/home/db/ports/wsjt/files/patch-portaudio-v19_Makefile.in	Fri Dec 15 03:18:24 2006
@@ -0,0 +1,11 @@
+--- portaudio-v19/Makefile.in.orig	Fri Dec 15 05:16:16 2006
++++ portaudio-v19/Makefile.in	Fri Dec 15 05:17:42 2006
+@@ -16,7 +16,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ CC = @CC@
+-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @DEFS@
++CFLAGS = @CFLAGS@ -fPIC -I$(top_srcdir)/include -I$(top_srcdir)/src/common -I$(top_srcdir)/src/os/unix @DEFS@
+ LIBS = @LIBS@
+ AR = @AR@
+ RANLIB = @RANLIB@
diff -ruN --exclude=CVS /usr/ports/comms/wsjt/pkg-plist /usr/home/db/ports/wsjt/pkg-plist
--- /usr/ports/comms/wsjt/pkg-plist	Sun Nov 12 12:04:42 2006
+++ /usr/home/db/ports/wsjt/pkg-plist	Tue Dec 12 11:24:42 2006
@@ -1,3 +1,4 @@
+bin/KVASD
 bin/wsjt
 bin/wsjt.py
 %%DATADIR%%/CALL3.TXT
--- wsjt-5.9.6_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1H0iRT-0006kp-KO>