Attachment #141667 for bug #188538

View | Details | Raw Unified | Return to bug 188538
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fl_moxgen	4	PORTNAME= fl_moxgen
5	PORTVERSION= 0.05	5	PORTVERSION= 1.00
6	PORTREVISION= 1
7	CATEGORIES= comms hamradio	6	CATEGORIES= comms hamradio
8	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	7	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
9	MASTER_SITE_SUBDIR= flmoxgen	8	MASTER_SITE_SUBDIR= flmoxgen

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Fl_MoxGen-0.05.tar.gz) = 19271c51438d6762c58b498fcd8b9293295b1f7497f3c52d3635a8710818ba20	1	SHA256 (Fl_MoxGen-1.00.tar.gz) = 547b5ba7e9fa96dc8d88e62eef73eb4673de7c0e41a7485a3ff18887e355ffd2
2	SIZE (Fl_MoxGen-0.05.tar.gz) = 37489	2	SIZE (Fl_MoxGen-1.00.tar.gz) = 37746




--- 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.

 #SHAREDIR=/usr/share/fl_moxgen
 
 # If libHaru is installed, be sure that LIBHARU_INC
@@ -44,14 +44,8 @@
 # accordingly.  If libHaru is not installed, 
 # comment out both lines.
 
-#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:
 	@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%%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 -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"

 
 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)

Line 0 Link Here

(-)files/patch-write_pdf.c (+10 lines)
	1	--- write_pdf.c.orig 2014-04-12 15:29:28.000000000 -0700
	2	+++ write_pdf.c 2014-04-12 15:29:54.000000000 -0700
	3	@@ -6,6 +6,7 @@
	4	#include <setjmp.h>
	5	#include <stdio.h>
	6	#include <string.h>
	7	+#include <unistd.h> // for getcwd()
	8	#include <sys/stat.h> // for stat()
	9
	10	#include "fl_moxgen_defines.h"

Return to bug 188538

Lines 1-5 Link Here

(-)files/patch-Makefile (-12 / +19 lines)
1	--- Makefile.orig 2009-12-21 18:58:35.000000000 -0800	1	--- Makefile.orig 2013-07-20 02:05:36.000000000 -0700
2	+++ Makefile 2012-05-16 00:49:03.000000000 -0700	2	+++ Makefile 2014-04-12 15:28:52.000000000 -0700
3	@@ -32,10 +32,10 @@	3	@@ -32,10 +32,10 @@
4	# BINDIR directory. Files needed at run time will	4	# BINDIR directory. Files needed at run time will
5	# be installed in the SHAREDIR directory.	5	# be installed in the SHAREDIR directory.
Lines 13-45 Link Here
13	#SHAREDIR=/usr/share/fl_moxgen	13	#SHAREDIR=/usr/share/fl_moxgen
14		14
15	# If libHaru is installed, be sure that LIBHARU_INC	15	# If libHaru is installed, be sure that LIBHARU_INC
16	@@ -44,30 +44,24 @@	16	@@ -44,14 +44,8 @@
17	# accordingly. If libHaru is not installed,	17	# accordingly. If libHaru is not installed,
18	# comment out both lines.	18	# comment out both lines.
19		19
20	-LIBHARU_INC = /usr/local/include	20	-#LIBHARU_INC = /usr/local/include
21	+LIBHARU_INC = %%LOCALBASE%%/include	21	-LIBHARU_INC = /usr/include
22	#LIBHARU_INC = /usr/include	22	-
23
24	-# Set the FLTK_INC variable to be the location of the	23	-# Set the FLTK_INC variable to be the location of the
25	-# include files for FLTK.	24	-# include files for FLTK.
26	-	25	-
27	-FLTK_INC = /usr/include	26	-FLTK_INC = /usr/include
28	-#FLTK_INC = /usr/local/include	27	-#FLTK_INC = /usr/local/include
29	-	28	+LIBHARU_INC = %%PREFIX%%/include
		29	+#LIBHARU_INC = /usr/include
		30
30	all:	31	all:
31	@if [ -f $(LIBHARU_INC)/hpdf.h ]; \	32	@rm -f fl_moxgen_defines.h
32	then $(MAKE) fl_moxgen; \	33	@@ -60,21 +54,19 @@
33	else $(MAKE) fl_moxgen_no_pdf; fi	34	else $(MAKE) fl_moxgen_no_pdf; fi
34		35
35	write_pdf.o: write_pdf.c	36	write_pdf.o: write_pdf.c
36	- @$(CC) -c -o write_pdf.o write_pdf.c	37	- @$(CC) -c -o write_pdf.o write_pdf.c
37	+ @$(CC) -c -o write_pdf.o write_pdf.c -I$(LIBHARU_INC)	38	+ @$(CC) -c -o write_pdf.o write_pdf.c -I%%PREFIX%%/include
38		39
39	fl_moxgen: fl_moxgen.cxx fl_moxgen_defines.h write_pdf.o	40	fl_moxgen: fl_moxgen.cxx fl_moxgen_defines.h write_pdf.o
40	@echo "Building Fl_MoxGen with PDF support"	41	@echo "Building Fl_MoxGen with PDF support"
41	- $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -I$(FLTK_INC) -I. -lfltk -lfltk_images -lhpdf	42	- $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -I$(FLTK_INC) -I. -lfltk -lfltk_images -lhpdf
42	+ $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -I. `fltk-config --use-images --cxxflags --ldflags` -lhpdf	43	+ $(CXX) -o fl_moxgen fl_moxgen.cxx write_pdf.o -DUSING_LIB_HARU `fltk-config --use-images --cxxflags --ldflags` -I. -lhpdf
43		44
44	fl_moxgen_no_pdf: fl_moxgen.cxx fl_moxgen_defines.h	45	fl_moxgen_no_pdf: fl_moxgen.cxx fl_moxgen_defines.h
45	@echo "Building Fl_MoxGen without PDF support"	46	@echo "Building Fl_MoxGen without PDF support"
Lines 48-50 Link Here
48		49
49	fl_moxgen_defines.h:	50	fl_moxgen_defines.h:
50	@rm -f fl_moxgen_defines.h	51	@rm -f fl_moxgen_defines.h
		52	@echo "#define SHAREDIR \"$(SHAREDIR)\"" > fl_moxgen_defines.h
		53	- @if [ -f $(LIBHARU_INC)/hpdf.h ]; \
		54	- then echo "#define USING_LIB_HARU" >> fl_moxgen_defines.h; fi
		55	install:
		56	mkdir -p $(SHAREDIR)
		57	cp fl_moxgen $(BINDIR)