Index: Makefile =================================================================== --- Makefile (revision 351133) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fl_moxgen -PORTVERSION= 0.05 -PORTREVISION= 1 +PORTVERSION= 1.00 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= flmoxgen Index: distinfo =================================================================== --- distinfo (revision 351133) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (Fl_MoxGen-0.05.tar.gz) = 19271c51438d6762c58b498fcd8b9293295b1f7497f3c52d3635a8710818ba20 -SIZE (Fl_MoxGen-0.05.tar.gz) = 37489 +SHA256 (Fl_MoxGen-1.00.tar.gz) = 547b5ba7e9fa96dc8d88e62eef73eb4673de7c0e41a7485a3ff18887e355ffd2 +SIZE (Fl_MoxGen-1.00.tar.gz) = 37746 Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 351133) +++ files/patch-Makefile (working copy) @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-12-21 18:58:35.000000000 -0800 -+++ Makefile 2012-05-16 00:49:03.000000000 -0700 +--- Makefile.orig 2013-07-20 02:05:36.000000000 -0700 ++++ Makefile 2014-04-12 15:28:52.000000000 -0700 @@ -32,10 +32,10 @@ # BINDIR directory. Files needed at run time will # be installed in the SHAREDIR directory. @@ -13,33 +13,34 @@ #SHAREDIR=/usr/share/fl_moxgen # If libHaru is installed, be sure that LIBHARU_INC -@@ -44,30 +44,24 @@ +@@ -44,14 +44,8 @@ # accordingly. If libHaru is not installed, # comment out both lines. --LIBHARU_INC = /usr/local/include -+LIBHARU_INC = %%LOCALBASE%%/include - #LIBHARU_INC = /usr/include - +-#LIBHARU_INC = /usr/local/include +-LIBHARU_INC = /usr/include +- -# Set the FLTK_INC variable to be the location of the -# include files for FLTK. - -FLTK_INC = /usr/include -#FLTK_INC = /usr/local/include -- ++LIBHARU_INC = %%PREFIX%%/include ++#LIBHARU_INC = /usr/include + all: - @if [ -f $(LIBHARU_INC)/hpdf.h ]; \ - then $(MAKE) fl_moxgen; \ + @rm -f fl_moxgen_defines.h +@@ -60,21 +54,19 @@ else $(MAKE) fl_moxgen_no_pdf; fi write_pdf.o: write_pdf.c - @$(CC) -c -o write_pdf.o write_pdf.c -+ @$(CC) -c -o write_pdf.o write_pdf.c -I$(LIBHARU_INC) ++ @$(CC) -c -o write_pdf.o write_pdf.c -I%%PREFIX%%/include fl_moxgen: fl_moxgen.cxx fl_moxgen_defines.h write_pdf.o @echo "Building Fl_MoxGen with PDF support" - $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -I$(FLTK_INC) -I. -lfltk -lfltk_images -lhpdf -+ $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -I. `fltk-config --use-images --cxxflags --ldflags` -lhpdf ++ $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -DUSING_LIB_HARU `fltk-config --use-images --cxxflags --ldflags` -I. -lhpdf fl_moxgen_no_pdf: fl_moxgen.cxx fl_moxgen_defines.h @echo "Building Fl_MoxGen without PDF support" @@ -48,3 +49,9 @@ fl_moxgen_defines.h: @rm -f fl_moxgen_defines.h + @echo "#define SHAREDIR \"$(SHAREDIR)\"" > fl_moxgen_defines.h +- @if [ -f $(LIBHARU_INC)/hpdf.h ]; \ +- then echo "#define USING_LIB_HARU" >> fl_moxgen_defines.h; fi + install: + mkdir -p $(SHAREDIR) + cp fl_moxgen $(BINDIR) Index: files/patch-write_pdf.c =================================================================== --- files/patch-write_pdf.c (revision 0) +++ files/patch-write_pdf.c (working copy) @@ -0,0 +1,10 @@ +--- write_pdf.c.orig 2014-04-12 15:29:28.000000000 -0700 ++++ write_pdf.c 2014-04-12 15:29:54.000000000 -0700 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include // for getcwd() + #include // for stat() + + #include "fl_moxgen_defines.h" Property changes on: files/patch-write_pdf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property