Attachment #65922 for bug #97584

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




#

PORTNAME=	ale
PORTVERSION=	0.8.4
PORTREVISION=	2
CATEGORIES=	graphics
MASTER_SITES=	http://auricle.dyndns.org/ALE/download/

MAINTAINER=	shaun@inerd.com
COMMENT=	Anti-Lamenessing Engine

OPTIONS=	DOUBLE "64bit Data Precision Support" off \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (ale-0.8.3.tar.gz) = 79901a14b8ee11dc66406388ff1ae2a1	1	MD5 (ale-0.8.4.tar.gz) = 9a9270a8017da2bf8e68cdaf03a5e07c
2	SHA256 (ale-0.8.3.tar.gz) = 5b334e4dc571bd2ffed915787d307998133f6956ef735bf73a1ff851b888a2f9	2	SHA256 (ale-0.8.4.tar.gz) = bfb31dfb56fb881370c171de32e2822a704fe72fdfcd114eb16c67fdbd4eb439
3	SIZE (ale-0.8.3.tar.gz) = 159359	3	SIZE (ale-0.8.4.tar.gz) = 178944




--- Makefile.orig	Fri May  5 05:25:01 2006
+++ Makefile	Mon May 22 03:19:18 2006
@@ -44,7 +44,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),)

 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)\
@@ -52,13 +52,13 @@
                   $(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
                   $(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
                   $(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)
-FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,)
+FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),$(shell pkg-config --libs fftw3),)
 OPTIMIZATION_CFLAGS:=-DOPTIMIZATIONS=$(OPTIMIZATIONS)
 STL_CFLAGS:=$(if $(subst GNU,,$(HASH_MAP)),,-DHASH_MAP_GNU)\
             $(if $(subst STD,,$(HASH_MAP)),,-DHASH_MAP_STD)
 CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) $(STL_CFLAGS)\
-         $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \
-	 $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)
+         $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \

Return to bug 97584

Lines 7-18 Link Here

(-)Makefile (-3 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= ale	9	PORTNAME= ale
10	PORTVERSION= 0.8.3	10	PORTVERSION= 0.8.4
11	PORTREVISION= 2
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
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= shaun@inerd.com
16	COMMENT= Anti-Lamenessing Engine	15	COMMENT= Anti-Lamenessing Engine
17		16
18	OPTIONS= DOUBLE "64bit Data Precision Support" off \	17	OPTIONS= DOUBLE "64bit Data Precision Support" off \

Lines 1-6 Link Here

(-)files/patch-Makefile (-6 / +7 lines)
1	--- Makefile.orig Fri May 6 00:08:11 2005	1	--- Makefile.orig Fri May 5 05:25:01 2006
2	+++ Makefile Sat May 7 15:08:56 2005	2	+++ Makefile Mon May 22 03:19:18 2006
3	@@ -43,7 +43,7 @@	3	@@ -44,7 +44,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),)
Lines 9-23 Link Here
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	IOCTL_CFLAGS:=$(if $(subst 0,,$(IOCTL)),-DUSE_IOCTL,)
11	PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\	11	PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\
12	@@ -51,12 +51,12 @@	12	@@ -52,13 +52,13 @@
13	$(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\	13	$(if $(subst HALF,,$(COLORS)),,-DALE_COLORS=HALF)\
14	$(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\	14	$(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\
15	$(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)	15	$(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE)
16	-FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,)	16	-FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,)
17	+FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),$(shell pkg-config --libs fftw3),)	17	+FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),$(shell pkg-config --libs fftw3),)
18	OPTIMIZATION_CFLAGS:=-DOPTIMIZATIONS=$(OPTIMIZATIONS)	18	OPTIMIZATION_CFLAGS:=-DOPTIMIZATIONS=$(OPTIMIZATIONS)
19		19	STL_CFLAGS:=$(if $(subst GNU,,$(HASH_MAP)),,-DHASH_MAP_GNU)\
20	CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \	20	$(if $(subst STD,,$(HASH_MAP)),,-DHASH_MAP_STD)
		21	CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) $(STL_CFLAGS)\
21	- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \	22	- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) \
22	- $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)	23	- $(OPTIMIZATION_CFLAGS) $(IOCTL_CFLAGS)
23	+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \	24	+ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) \