Attachment #53409 for bug #80768

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

Lines 7-14 Link Here

(-)graphics/ale/Makefile (-3 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= ale	9	PORTNAME= ale
10	PORTVERSION= 0.7.3	10	PORTVERSION= 0.8.1
11	PORTREVISION= 1
12	CATEGORIES= graphics	11	CATEGORIES= graphics
13	MASTER_SITES= http://auricle.dyndns.org/ALE/download/	12	MASTER_SITES= http://auricle.dyndns.org/ALE/download/
14		13
Lines 18-24 Link Here
18	USE_GCC= 3.4	17	USE_GCC= 3.4
19	USE_REINPLACE= yes	18	USE_REINPLACE= yes
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"	20	MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" IOCTL=1
22		21
23	PLIST_FILES= bin/ale	22	PLIST_FILES= bin/ale
24		23

Lines 1-2 Link Here

(-)graphics/ale/distinfo (-2 / +2 lines)
1	MD5 (ale-0.7.3.tar.gz) = d1dc3a83ec2beec1c129f3a059819f58	1	MD5 (ale-0.8.1.tar.gz) = 40383c17071744140ec46346676a989d
2	SIZE (ale-0.7.3.tar.gz) = 129098	2	SIZE (ale-0.8.1.tar.gz) = 149619




--- Makefile.orig	Fri May  6 00:08:11 2005
+++ Makefile	Sat May  7 15:08:56 2005
@@ -43,7 +43,7 @@
 DEBUG_CFLAGS:=$(if $(subst 0,,$(DEBUG)),-DDEBUG,-DNDEBUG)
 IMAGEMAGICK_CFLAGS:=$(if $(use_imagemagick),-DUSE_MAGICK $(shell Magick-config --cflags --cppflags),)
 IMAGEMAGICK_LDFLAGS:=$(if $(use_imagemagick),$(shell Magick-config --ldflags --libs),)
-FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW,)
+FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW $(shell pkg-config --cflags fftw3),)
 POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,)
 IOCTL_CFLAGS:=$(if $(subst 0,,$(IOCTL)),-DUSE_IOCTL,)
 PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\
@@ -51,12 +51,12 @@
                   $(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
                   $(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
                   $(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)

 
 CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \
-         $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \
-	 $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)
+         $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \
+	 $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS) $(CXXFLAGS)
 
 LDFLAGS:=$(if $(use_imagemagick),$(IMAGEMAGICK_LDFLAGS)) $(FFTW_LDFLAGS) -lm
 
@@ -79,7 +79,7 @@
 	find testsuite -name "*.output.*" | xargs rm -rf
 
 ale-phony: ale.cc d2.cc *.h d2/*.h d2/render/*.h d2/render/psf/*.h d3.cc d3/*.h
-	g++ -o ale $(CFLAGS) ale.cc d3.cc d2.cc $(LDFLAGS)
+	$(CXX) -o ale $(CFLAGS) ale.cc d3.cc d2.cc $(LDFLAGS)
 
 # The following approach to building a Windows binary is probably very
 # dependent on the host platform configuration.  The above target may be a

Return to bug 80768

Lines 1-14 Link Here

(-)graphics/ale/files/patch-Makefile (-15 / +7 lines)
1	--- Makefile.orig Thu Dec 2 04:55:06 2004	1	--- Makefile.orig Fri May 6 00:08:11 2005
2	+++ Makefile Fri Dec 3 12:30:37 2004	2	+++ Makefile Sat May 7 15:08:56 2005
3	@@ -42,19 +42,19 @@	3	@@ -43,7 +43,7 @@
4	DEBUG_CFLAGS:=$(if $(subst 0,,$(DEBUG)),-DDEBUG,-DNDEBUG)	4	DEBUG_CFLAGS:=$(if $(subst 0,,$(DEBUG)),-DDEBUG,-DNDEBUG)
5	IMAGEMAGICK_CFLAGS:=$(if $(use_imagemagick),-DUSE_MAGICK $(shell Magick-config --cflags --cppflags),)	5	IMAGEMAGICK_CFLAGS:=$(if $(use_imagemagick),-DUSE_MAGICK $(shell Magick-config --cflags --cppflags),)
6	IMAGEMAGICK_LDFLAGS:=$(if $(use_imagemagick),$(shell Magick-config --ldflags --libs),)	6	IMAGEMAGICK_LDFLAGS:=$(if $(use_imagemagick),$(shell Magick-config --ldflags --libs),)
7	-FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW,)	7	-FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW,)
8	+FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW $(shell pkg-config --cflags fftw3),)	8	+FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW $(shell pkg-config --cflags fftw3),)
9	POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,)	9	POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,)
		10	IOCTL_CFLAGS:=$(if $(subst 0,,$(IOCTL)),-DUSE_IOCTL,)
10	PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\	11	PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\
11	$(if $(subst DOUBLE,,$(COLORS)),,-DALE_COLORS=DOUBLE)\	12	@@ -51,12 +51,12 @@
12	$(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\	13	$(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
13	$(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\	14	$(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
14	$(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)	15	$(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)
Lines 18-35 Link Here
18		19
19	CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \	20	CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \
20	- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \	21	- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \
21	- $(OPTIMIZATION_CFLAGS)	22	- $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)
22	+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \	23	+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \
23	+ $(OPTIMIZATION_CFLAGS) $(CXXFLAGS)	24	+ $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS) $(CXXFLAGS)
24		25
25	LDFLAGS:=$(if $(use_imagemagick),$(IMAGEMAGICK_LDFLAGS)) $(FFTW_LDFLAGS) -lm	26	LDFLAGS:=$(if $(use_imagemagick),$(IMAGEMAGICK_LDFLAGS)) $(FFTW_LDFLAGS) -lm
26		27
27	@@ -79,7 +79,7 @@
28	find testsuite -name ".output." \| xargs rm -rf
29
30	ale-phony: ale.cc d2.cc .h d2/.h d2/render/.h d2/render/psf/.h d3.cc d3/*.h
31	- g++ -o ale $(CFLAGS) ale.cc d3.cc d2.cc $(LDFLAGS)
32	+ $(CXX) -o ale $(CFLAGS) ale.cc d3.cc d2.cc $(LDFLAGS)
33
34	# The following approach to building a Windows binary is probably very
35	# dependent on the host platform configuration. The above target may be a