aboutsummaryrefslogtreecommitdiff
path: root/comms/fldigi
diff options
context:
space:
mode:
authorDiane Bruce <db@FreeBSD.org>2007-02-01 23:14:06 +0000
committerDiane Bruce <db@FreeBSD.org>2007-02-01 23:14:06 +0000
commit46bd55f8e9c047a5fc1d6ac9be9fe321ceb7a7f7 (patch)
treea4893359c7e4612ec1a57fa29c236333b217914b /comms/fldigi
parentf681f499c26e943dc9f428b3fc1f265d260379bc (diff)
downloadports-46bd55f8e9c047a5fc1d6ac9be9fe321ceb7a7f7.tar.gz
ports-46bd55f8e9c047a5fc1d6ac9be9fe321ceb7a7f7.zip
Notes
Diffstat (limited to 'comms/fldigi')
-rw-r--r--comms/fldigi/Makefile26
-rw-r--r--comms/fldigi/distinfo6
-rw-r--r--comms/fldigi/files/fldigi18
-rw-r--r--comms/fldigi/files/patch-Makefile53
-rw-r--r--comms/fldigi/files/patch-makefile38
-rw-r--r--comms/fldigi/files/patch-src_soundcard_sound.cxx8
-rw-r--r--comms/fldigi/pkg-plist1
7 files changed, 58 insertions, 92 deletions
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index f391be46abc1..67521cdb5206 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -6,10 +6,12 @@
#
PORTNAME= fldigi
-PORTVERSION= 1.11
+PORTVERSION= 1.23
DISTVERSIONSUFFIX= .src
CATEGORIES= comms hamradio
-MASTER_SITES= http://www.w1hkj.com/LinuxApps/
+MASTER_SITES= http://www.w1hkj.com/LinuxApps/ \
+ ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= db
MAINTAINER= db@FreeBSD.org
COMMENT= Digital decoder for psk, cw, psk31, olivia
@@ -19,22 +21,20 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \
USE_GMAKE= yes
ALL_TARGET= fldigi
+MAKEFILE= makefile
MAKE_ENV+= CXX="${CXX}"
-post-extract:
- @${SED} -e 's|%%DATADIR%%|${DATADIR}|' \
- ${FILESDIR}/${PORTNAME} > ${WRKSRC}/${PORTNAME}
-
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/Release/${PORTNAME} \
- ${PREFIX}/bin/${PORTNAME}.bin
- ${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/macros.mdf ${DATADIR}
-.if(!defined(NOPORTDOCS))
+ ${INSTALL_PROGRAM} ${WRKSRC}/fldigi ${PREFIX}/bin/fldigi
+ @${MKDIR} ${DATADIR}
+ @${INSTALL_DATA} ${WRKSRC}/macros.mdf ${DATADIR}
+.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${ECHO} ""
+ @${ECHO} "fldigi docs installed in ${DOCSDIR}"
+ @${ECHO} ""
.endif
.include <bsd.port.mk>
diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo
index 5ece7612c220..f379eb0750f7 100644
--- a/comms/fldigi/distinfo
+++ b/comms/fldigi/distinfo
@@ -1,3 +1,3 @@
-MD5 (fldigi-1.11.src.tar.gz) = 32f3a4fa8f3569b8486650e60c03d538
-SHA256 (fldigi-1.11.src.tar.gz) = b49f962232729cac2ffca28461de28ad1c47aef84bfef22058b5f407ae8c74f9
-SIZE (fldigi-1.11.src.tar.gz) = 376827
+MD5 (fldigi-1.23.src.tar.gz) = ebdc127e774675f07e83259200fe2dc7
+SHA256 (fldigi-1.23.src.tar.gz) = 485b99de96b354fca3fcc849d35d0ad0638eb253b907b7e4aaccd931881a5c43
+SIZE (fldigi-1.23.src.tar.gz) = 420653
diff --git a/comms/fldigi/files/fldigi b/comms/fldigi/files/fldigi
deleted file mode 100644
index ac779ef56c7a..000000000000
--- a/comms/fldigi/files/fldigi
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# fldigi install shell script
-# loosely based on original script by Dave Freese, W1HKJ
-#
-# $FreeBSD$
-#
-
-installdir=$HOME/.fldigi
-macrofile=%%DATADIR%%/macros.mdf
-
-if [ ! -d $installdir ]; then
- mkdir $installdir
- cp $macrofile $installdir
- echo "You should edit $HOME/.flidi/macros.mdf"
-fi
-cd $installdir
-fldigi.bin
diff --git a/comms/fldigi/files/patch-Makefile b/comms/fldigi/files/patch-Makefile
deleted file mode 100644
index b73f850c71f5..000000000000
--- a/comms/fldigi/files/patch-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- Makefile.orig Wed Dec 20 03:31:04 2006
-+++ Makefile Fri Dec 22 00:56:54 2006
-@@ -3,23 +3,19 @@
- ## Copyright (c) 2005 by Parinya Thipchart
- #################################################################
-
--ifneq (,$(findstring Release, $(CFG)))
-- override CFG = Release
--else
-- override CFG = Debug
--endif
-+CFG = Release
-
- PROJECT = fldigi
--CC = "/usr/bin/g++"
-+CXX ?= c++
-+CC = ${CXX}
-
- ifeq ($(CFG),Debug)
- OBJ_DIR = Debug
- OUTPUT_DIR = Debug
- TARGET = fldigi
-- C_INCLUDE_DIRS = -I"src" -I"src/include"
- C_PREPROC =
-- CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions
-- LIB_DIRS = -L"src/lib /usr/local/lib" -L"../../../../../usr/local/lib"
-+ CFLAGS = -pipe -I"src" -I"src/include" `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions
-+ LIB_DIRS = -L"src/lib $(PREFIX)/lib" -L"$(PREFIX)/lib"
- LIBS = -lhamlib -lfltk_images -ljpeg -lpng
- LDFLAGS = -pipe `fltk-config --ldflags --use-images`
- endif
-@@ -28,10 +24,9 @@
- OBJ_DIR = Release
- OUTPUT_DIR = Release
- TARGET = fldigi
-- C_INCLUDE_DIRS = -I"src" -I"src/include"
- C_PREPROC =
-- CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -O2 -fno-rtti -fexceptions
-- LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib"
-+ CFLAGS += -I"src" -I"src/include" `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -fno-rtti -fexceptions
-+ LIB_DIRS = -L"src/lib" -L"$(PREFIX)/lib"
- LIBS = -lhamlib -lfltk_images -ljpeg -lpng -lz
- LDFLAGS = -pipe -s `fltk-config --ldflags --use-images`
- endif
-@@ -105,7 +100,7 @@
-
- define compile_source
- @echo Compiling $<
--@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
-+@$(CC) $(CFLAGS) $(C_PREPROC) -c "$<" -o "$@"
- endef
-
- .PHONY: print_header directories
diff --git a/comms/fldigi/files/patch-makefile b/comms/fldigi/files/patch-makefile
new file mode 100644
index 000000000000..83de1b1bd5fb
--- /dev/null
+++ b/comms/fldigi/files/patch-makefile
@@ -0,0 +1,38 @@
+--- makefile.orig Tue Jan 30 21:00:29 2007
++++ makefile Tue Jan 30 21:21:21 2007
+@@ -3,17 +3,16 @@
+ #
+
+ PROJECT = fldigi
+-CC = "/usr/bin/g++"
++#CC = "/usr/bin/g++"
+
+ OBJ_DIR = Objects
+ OUTPUT_DIR = ./
+ 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"
++#LIB_DIRS = -L"/usr/local/lib"
+ LIBS = -lhamlib -lfltk_images -ljpeg -lpng -lz
+-LDFLAGS = -pipe -s `fltk-config --ldflags --use-images`
++LDFLAGS = `fltk-config --ldflags --use-images`
+
+ SRC_OBJS = \
+ $(OBJ_DIR)/fft.o \
+@@ -83,8 +82,11 @@
+ $(OBJ_DIR)/newinstall.o
+
+ define build_target
+-@echo Linking...
+-@$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(HAMLIBS) $(LDFLAGS) $(LIBS)
++echo Linking...
++echo HAMLIBS $(HAMLIBS)
++echo LDFLAGS $(LDFLAGS)
++echo LIBS $(LIBS)
++$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(HAMLIBS) $(LDFLAGS) $(LIBS)
+ endef
+
+ define compile_source
diff --git a/comms/fldigi/files/patch-src_soundcard_sound.cxx b/comms/fldigi/files/patch-src_soundcard_sound.cxx
index 126aa00e60ae..187a1483a1f5 100644
--- a/comms/fldigi/files/patch-src_soundcard_sound.cxx
+++ b/comms/fldigi/files/patch-src_soundcard_sound.cxx
@@ -1,5 +1,5 @@
---- src/soundcard/sound.cxx.orig Tue Dec 19 21:31:04 2006
-+++ src/soundcard/sound.cxx Wed Dec 20 18:46:00 2006
+--- 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 {
@@ -10,7 +10,7 @@
getCapabilities();
getFormats();
Close();
-@@ -78,7 +80,7 @@
+@@ -80,7 +82,7 @@
{
int sndparam;
// Try to get ~100ms worth of samples per fragment
@@ -19,7 +19,7 @@
// double since we are using 16 bit samples
sndparam += 1;
// Unlimited amount of buffers for RX, four for TX
-@@ -120,7 +122,7 @@
+@@ -122,7 +124,7 @@
void cSound::getVersion()
{
version = 0;
diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist
index dbd56516cbe3..a123733d5b80 100644
--- a/comms/fldigi/pkg-plist
+++ b/comms/fldigi/pkg-plist
@@ -1,4 +1,3 @@
-bin/fldigi.bin
bin/fldigi
%%DATADIR%%/macros.mdf
%%PORTDOCS%%%%DOCSDIR%%/README