- update to 2.08

This commit is contained in:
Diane Bruce 2008-01-31 17:35:39 +00:00
parent 86a019e6d2
commit 45c354e681
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=206519
5 changed files with 43 additions and 62 deletions

View file

@ -6,7 +6,7 @@
#
PORTNAME= fldigi
PORTVERSION= 2.03
PORTVERSION= 2.08
CATEGORIES= comms hamradio
MASTER_SITES= http://www.w1hkj.com/fldigi-2.0.distro/ \
${MASTER_SITE_LOCAL}
@ -15,33 +15,33 @@ MASTER_SITE_SUBDIR= db
MAINTAINER= db@FreeBSD.org
COMMENT= Digital decoder for psk, cw, psk31, olivia
BUILD_DEPENDS= ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \
hamlib:${PORTSDIR}/comms/hamlib \
sndfile:${PORTSDIR}/audio/libsndfile \
boost_wave:${PORTSDIR}/devel/boost
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ENV+= CXX="${CXX}"
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" && ${OSVERSION} < 700000
USE_GCC= 4.1
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/Install/fldigi ${PREFIX}/bin/fldigi
${MKDIR} ${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} ""
post-configure:
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
${WRKSRC}/src/Makefile
post-install:
.if !defined(NOPORTDOCS)
@${ECHO} ""
${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@${ECHO} "fldigi docs installed in ${DOCSDIR}"
.endif
@${ECHO} "fldigi icons installed in ${DATADIR}"
@${ECHO} ""
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
MD5 (fldigi-2.03.tar.gz) = 5518c16b1671119c381fb68ccdf6fba7
SHA256 (fldigi-2.03.tar.gz) = 9615735fc305e7d6c06908206674cfe4f6b0fb3c5debac010febf5a62c34de7f
SIZE (fldigi-2.03.tar.gz) = 449658
MD5 (fldigi-2.08.tar.gz) = c4de82f422a5b3e3b29e168ac2f850b2
SHA256 (fldigi-2.08.tar.gz) = 024c2c090ca42bfea603c31198cb15e6be84cea1b298d73c26e991d0dcd470a8
SIZE (fldigi-2.08.tar.gz) = 540064

View file

@ -1,39 +0,0 @@
--- 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

View file

@ -0,0 +1,21 @@
--- src/Makefile.in.orig 2008-01-26 07:59:17.000000000 -0500
+++ src/Makefile.in 2008-01-31 11:42:23.000000000 -0500
@@ -280,15 +280,15 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/irrxml \
+AM_CPPFLAGS = @PORTAUDIO_CFLAGS@ -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/irrxml \
@BOOST_CPPFLAGS@ $(am__append_1) $(am__append_3) \
$(am__append_4)
-AM_CXXFLAGS = @FLTK_CFLAGS@ @PORTAUDIO_CFLAGS@ @SNDFILE_CFLAGS@ \
+AM_CXXFLAGS = @PORTAUDIO_CFLAGS@ @FLTK_CFLAGS@ @SNDFILE_CFLAGS@ \
@SAMPLERATE_CFLAGS@ @HAMLIB_CFLAGS@ \
-pipe -Wall -O2 -ffast-math -fexceptions -finline-functions
AM_CFLAGS = $(AM_CXXFLAGS)
-LDADD = @BOOST_LDFLAGS@ @FLTK_LIBS@ @PORTAUDIO_LIBS@ @SNDFILE_LIBS@ \
+LDADD = @PORTAUDIO_LIBS@ @BOOST_LDFLAGS@ @FLTK_LIBS@ @SNDFILE_LIBS@ \
@SAMPLERATE_LIBS@ @HAMLIB_LIBS@ @RTLIB@ $(am__append_2)
SAMPLERATE_SRC = samplerate/common.h samplerate/fastest_coeffs.h \
samplerate/float_cast.h samplerate/samplerate.c samplerate/samplerate.h \

View file

@ -1,7 +1,6 @@
bin/fldigi
%%DATADIR%%/fldigi.xpm
%%DATADIR%%/fldigi-psk.png
%%DATADIR%%/fldigi-rtty.png
share/applications/fldigi.desktop
share/pixmaps/fldigi.xpm
%%PORTDOCS%%%%DOCSDIR%%/README
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications