diff options
| author | db <db@FreeBSD.org> | 2007-10-30 01:27:41 +0800 |
|---|---|---|
| committer | db <db@FreeBSD.org> | 2007-10-30 01:27:41 +0800 |
| commit | 07626bdbbd25b2fb3f5a9181c2bf54236687bb43 (patch) | |
| tree | 465ff48ef4fcd49a4d5117fc85260765752f0f62 /comms/fldigi/files | |
| parent | 81e9a0c9a20ca69a1796f71e6f8f84ca0e8b02f8 (diff) | |
| download | freebsd-ports-gnome-07626bdbbd25b2fb3f5a9181c2bf54236687bb43.tar.gz freebsd-ports-gnome-07626bdbbd25b2fb3f5a9181c2bf54236687bb43.tar.zst freebsd-ports-gnome-07626bdbbd25b2fb3f5a9181c2bf54236687bb43.zip | |
- Update to 2.03 version of fldigi
- Vendor has made many bug fixes and improvements too many to list here,
see http://www.w1hkj.com/Fldigi.html or ChangeLog in distribution.
Diffstat (limited to 'comms/fldigi/files')
| -rw-r--r-- | comms/fldigi/files/patch-Makefile | 39 | ||||
| -rw-r--r-- | comms/fldigi/files/patch-makefile | 19 |
2 files changed, 39 insertions, 19 deletions
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 |