4 files changed, 54 insertions, 31 deletions

diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 7f2189d2c3c4..b63a304310a8 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	fldigi
-PORTVERSION=	1.342
+PORTVERSION=	2.03
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.w1hkj.com/fldigi.1.34.distro/ \
+MASTER_SITES=	http://www.w1hkj.com/fldigi-2.0.distro/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	db
 
@@ -16,21 +16,24 @@ MAINTAINER=	db@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
 LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk-threads \
-		hamlib:${PORTSDIR}/comms/hamlib
+		hamlib:${PORTSDIR}/comms/hamlib \
+		sndfile:${PORTSDIR}/audio/libsndfile \
+		boost_wave:${PORTSDIR}/devel/boost
 
 USE_GMAKE=	yes
-ALL_TARGET=	fldigi
-MAKEFILE=	makefile
 
 MAKE_ENV+=	CXX="${CXX}"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile
+
 do-install:
 	${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} 
+.for f in ${WRKSRC}/icons/fldigi-psk.png \
+	${WRKSRC}/icons/fldigi-rtty.png \
+	${WRKSRC}/icons/fldigi.xpm
+	${INSTALL_DATA} ${WRKSRC}$f ${DATADIR}
 .endfor
 	@${ECHO} ""
 .if	!defined(NOPORTDOCS)
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 4a1028a375c2..afd3a41537f8 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (fldigi-1.342.tar.gz) = 8b5a40cd8aba29c6180597ecdf9f87f7
-SHA256 (fldigi-1.342.tar.gz) = c0a11cc4da6ace12d3f060ecaa53dcf2f2ec68964eee0258c302271242fe6521
-SIZE (fldigi-1.342.tar.gz) = 414980
+MD5 (fldigi-2.03.tar.gz) = 5518c16b1671119c381fb68ccdf6fba7
+SHA256 (fldigi-2.03.tar.gz) = 9615735fc305e7d6c06908206674cfe4f6b0fb3c5debac010febf5a62c34de7f
+SIZE (fldigi-2.03.tar.gz) = 449658
diff --git a/comms/fldigi/files/patch-Makefile b/comms/fldigi/files/patch-Makefile
new file mode 100644
index 000000000000..ea63bbf1ffc8
--- /dev/null
+++ b/comms/fldigi/files/patch-Makefile
@@ -0,0 +1,39 @@
+--- Makefile.orig	2007-10-20 19:22:39.000000000 -0400
++++ Makefile	2007-10-29 13:17:56.000000000 -0400
+@@ -46,10 +46,10 @@
+ 
+ 
+ # compiler and preprocessor options
+-CXX = g++
++CXX ?= g++
+ 
+-INCLUDE_DIRS = src src/include src/irrxml
+-CPPFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) -DNDEBUG -DUSE_TLS=$(USE_TLS)
++INCLUDE_DIRS = src src/include src/irrxml 
++CPPFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) -I%%LOCALBASE%%/include -DNDEBUG -DUSE_TLS=$(USE_TLS)
+ 
+ #CXXFLAGS = -pipe $(shell fltk-config --cxxflags) -Wall -Wno-deprecated -O2 -ffast-math -fno-rtti -fexceptions
+ CXXFLAGS = -pipe $(shell fltk-config --cxxflags) -Wno-uninitialized -Wno-deprecated \
+@@ -63,8 +63,8 @@
+ IMGLIBS = -lfltk_jpeg -lfltk_png -lfltk_z
+ #LIB_DIRS = -L/usr/local/lib
+ 
+-DYN_LDFLAGS = $(shell fltk-config --ldflags --use-images)
+-STATIC_LDFLAGS = $(shell fltk-config --ldstaticflags --use-images)
++DYN_LDFLAGS = $(shell fltk-config --ldflags --use-images) -L%%LOCALBASE%%/lib
++STATIC_LDFLAGS = $(shell fltk-config --ldstaticflags --use-images) -L%%LOCALBASE%%/lib
+ 
+ # our source files
+ SRC_DIR = src
+@@ -159,8 +159,9 @@
+ 
+ #################### begin cfg
+ ifeq ($(CTARG),hamlib)
+-    CPPFLAGS += -DPORTAUDIO
+-    LDFLAGS = $(DYN_LDFLAGS) -lportaudiocpp -lportaudio -lsndfile $(HAMLIBS)
++#    CPPFLAGS += -DPORTAUDIO
++#    LDFLAGS = $(DYN_LDFLAGS) -lportaudiocpp -lportaudio -lsndfile $(HAMLIBS)
++    LDFLAGS = $(DYN_LDFLAGS) -lsndfile $(HAMLIBS)
+     SRC += $(HAMLIB_SRC)
+ endif
+ 
diff --git a/comms/fldigi/files/patch-makefile b/comms/fldigi/files/patch-makefile
deleted file mode 100644
index 9456e5ddb245..000000000000
--- a/comms/fldigi/files/patch-makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- makefile.orig	Thu Apr 26 05:32:12 2007
-+++ makefile	Sun Sep 23 19:02:27 2007
-@@ -23,14 +23,14 @@
- endif
- 
- #PROJECT = fldigi
--CC = "/usr/bin/g++"
-+CC = ${CXX}
- 
- OBJ_DIR = ./Objects
- OUTPUT_DIR = ./Install
- TARGET = fldigi
- 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`  
- 
- HAMLIBS = -lhamlib
- IMGLIBS = -lfltk_jpeg -lfltk_png -lfltk_z