- update to 1.342

- 1.342 includes bug fixes for memory leaks
- vendor has improved support for FreeBSD so several patches can go.

6 files changed, 32 insertions, 72 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index b25de2f711ef..7f2189d2c3c4 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	1.24
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	.src
+PORTVERSION=	1.342
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
+MASTER_SITES=	http://www.w1hkj.com/fldigi.1.34.distro/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
 
@@ -27,15 +25,20 @@ MAKEFILE=	makefile
 MAKE_ENV+=	CXX="${CXX}"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fldigi ${PREFIX}/bin/fldigi
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/macros.mdf ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/Install/fldigi ${PREFIX}/bin/fldigi
+	${MKDIR} ${DATADIR}
+.for f in ${WRKSRC}/Install/fldigi-psk.png \
+	${WRKSRC}/Install/fldigi-rtty.png \
+	${WRKSRC}/Install/fldigi.xpm 
+	${INSTALL_DATA} ${WRKSRC}$f ${DATADIR} 
+.endfor
+	@${ECHO} ""
 .if	!defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${ECHO} ""
 	@${ECHO} "fldigi docs installed in ${DOCSDIR}"
-	@${ECHO} ""
 .endif
+	@${ECHO} "fldigi icons installed in ${DATADIR}"
+	@${ECHO} ""
 
 .include <bsd.port.mk>
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 9a0ada08b13a..4a1028a375c2 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (fldigi-1.24.src.tar.gz) = 09e14a78d95861fca1761128a4846cc5
-SHA256 (fldigi-1.24.src.tar.gz) = 81af3f59e83f1fb768dba72121a1e162b5652a82c5547f394bd0e282904ee3b5
-SIZE (fldigi-1.24.src.tar.gz) = 420668
+MD5 (fldigi-1.342.tar.gz) = 8b5a40cd8aba29c6180597ecdf9f87f7
+SHA256 (fldigi-1.342.tar.gz) = c0a11cc4da6ace12d3f060ecaa53dcf2f2ec68964eee0258c302271242fe6521
+SIZE (fldigi-1.342.tar.gz) = 414980
diff --git a/comms/fldigi/files/patch-makefile b/comms/fldigi/files/patch-makefile
index c0caa7c0032a..9456e5ddb245 100644
--- a/comms/fldigi/files/patch-makefile
+++ b/comms/fldigi/files/patch-makefile
@@ -1,24 +1,19 @@
---- makefile.orig	Sun Jan 28 15:30:30 2007
-+++ makefile	Thu Feb 22 16:20:58 2007
-@@ -3,17 +3,15 @@
- #
+--- makefile.orig	Thu Apr 26 05:32:12 2007
++++ makefile	Sun Sep 23 19:02:27 2007
+@@ -23,14 +23,14 @@
+ endif
  
- PROJECT = fldigi
+ #PROJECT = fldigi
 -CC = "/usr/bin/g++"
-+#CC = "/usr/bin/g++"
++CC = ${CXX}
  
- OBJ_DIR = Objects
- OUTPUT_DIR = ./
+ OBJ_DIR = ./Objects
+ OUTPUT_DIR = ./Install
  TARGET = fldigi
--C_INCLUDE_DIRS = -I"src" -I"src/include" 
-+C_INCLUDE_DIRS = -I"src" -I"src/include" `fltk-config --cxxflags`
- C_PREPROC = 
--CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -O2 -fno-rtti -fexceptions 
--LIB_DIRS = -L"/usr/local/lib" 
--LIBS = -lhamlib -lfltk_images -ljpeg -lpng -lz 
--LDFLAGS = -pipe -s `fltk-config --ldflags --use-images`
-+LIBS = -lhamlib -lfltk_images -ljpeg -lpng -lz
-+LDFLAGS = `fltk-config --ldflags --use-images` 
+ LIB_DIRS = -L"/usr/local/lib" 
+ C_INCLUDE_DIRS = -I"src" -I"src/include"
+-CCFLAGS = `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -O2 -fno-rtti -fexceptions 
++CCFLAGS = `fltk-config --cxxflags`  
  
- SRC_OBJS = \
-   $(OBJ_DIR)/fft.o	\
+ HAMLIBS = -lhamlib
+ IMGLIBS = -lfltk_jpeg -lfltk_png -lfltk_z
diff --git a/comms/fldigi/files/patch-src_include_rigclass.h b/comms/fldigi/files/patch-src_include_rigclass.h
deleted file mode 100644
index e68c4cae1f76..000000000000
--- a/comms/fldigi/files/patch-src_include_rigclass.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/rigclass.h.orig	Tue Dec 19 21:31:04 2006
-+++ src/include/rigclass.h	Wed Dec 20 18:38:55 2006
-@@ -15,7 +15,6 @@
- #include <list>
- 
- #include <hamlib/rig.h>
--#include <values.h>
- #include <assert.h>
- #include <errno.h>
- 
diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx
deleted file mode 100644
index 187a1483a1f5..000000000000
--- a/comms/fldigi/files/patch-src_soundcard_sound.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/soundcard/sound.cxx.orig	Fri Jan 26 10:49:19 2007
-+++ src/soundcard/sound.cxx	Mon Jan 29 21:51:41 2007
-@@ -16,7 +16,9 @@
- 	
- 	try {
- 		Open(O_RDONLY);
-+#if 0
- 		getVersion();
-+#endif
- 		getCapabilities();
- 		getFormats();
- 		Close();
-@@ -80,7 +82,7 @@
- {
- 	int sndparam;
- // Try to get ~100ms worth of samples per fragment
--	sndparam = (int)log2(sample_frequency * 0.1);
-+	sndparam = (int)log2((unsigned int)(sample_frequency * 0.1));
- // double since we are using 16 bit samples
- 	sndparam += 1;
- // Unlimited amount of buffers for RX, four for TX
-@@ -122,7 +124,7 @@
- void cSound::getVersion()
- {
- 	version = 0;
--	if (ioctl(device_fd, OSS_GETVERSION, &version) == -1) {
-+	if (ioctl(device_fd, SOUND_VERSION, &version) == -1) {
- 		version = -1;
- 		throw SndException("OSS Version");
- 	}
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index a123733d5b80..ed5aca19c8d5 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -1,5 +1,7 @@
 bin/fldigi
-%%DATADIR%%/macros.mdf
+%%DATADIR%%/fldigi.xpm
+%%DATADIR%%/fldigi-psk.png
+%%DATADIR%%/fldigi-rtty.png
 %%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%