diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile index 6370a2116904..c923e9c30841 100644 --- a/graphics/ale/Makefile +++ b/graphics/ale/Makefile @@ -7,29 +7,28 @@ # PORTNAME= ale -PORTVERSION= 0.7.0 +PORTVERSION= 0.7.1 CATEGORIES= graphics MASTER_SITES= http://auricle.dyndns.org/ALE/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Anti-Lamenessing Engine -PLIST_FILES= bin/ale -USE_GMAKE= yes +USE_GCC= 3.3 USE_REINPLACE= yes +USE_GMAKE= yes +MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" -OPTIONS= IMAGEMAGICK "ImageMagick Support" on \ - FFTW3 "FFTW3 Support" on +PLIST_FILES= bin/ale + +OPTIONS= DOUBLE "64bit Data Precision Support" off \ + FFTW3 "FFTW3 Support" on \ + IMAGEMAGICK "ImageMagick Support" on .include -.if ${OSVERSION} < 500000 -USE_GCC= 3.3 -.endif - -.if !defined(WITHOUT_IMAGEMAGICK) -LIB_DEPENDS+= Magick.6:${PORTSDIR}/graphics/ImageMagick -MAKE_ARGS+= IMAGEMAGICK=1 +.if defined(WITH_DOUBLE) +MAKE_ARGS+= COLORS=DOUBLE COORDINATES=DOUBLE .endif .if !defined(WITHOUT_FFTW3) @@ -37,15 +36,17 @@ LIB_DEPENDS+= fftw3.3:${PORTSDIR}/math/fftw3 MAKE_ARGS+= FFTW=1 .endif +.if !defined(WITHOUT_IMAGEMAGICK) +LIB_DEPENDS+= Magick.6:${PORTSDIR}/graphics/ImageMagick +MAKE_ARGS+= IMAGEMAGICK=1 +.endif + post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|; \ - s|g++|${CXX}|' ${WRKSRC}/${MAKEFILE} - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \ - ${WRKSRC}/*.h ${WRKSRC}/*/*.h + @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/d2.h .if ${OSVERSION} < 502114 - @${REINPLACE_CMD} -e 's|round|rint|' \ - ${WRKSRC}/d2/image_rw.h \ - ${WRKSRC}/d2/ppm.h +.for file in d2/image_rw.h d2/ppm.h + @${REINPLACE_CMD} -e 's|round|rint|g' ${WRKSRC}/${file} +.endfor .endif do-install: diff --git a/graphics/ale/distinfo b/graphics/ale/distinfo index b380034a94b4..2b939119df22 100644 --- a/graphics/ale/distinfo +++ b/graphics/ale/distinfo @@ -1,2 +1,2 @@ -MD5 (ale-0.7.0.tar.gz) = 0e812b29d10c2cc6a48baf5326e597bd -SIZE (ale-0.7.0.tar.gz) = 96247 +MD5 (ale-0.7.1.tar.gz) = 90b39eed7e03afbee8ff071762bca78b +SIZE (ale-0.7.1.tar.gz) = 99981 diff --git a/graphics/ale/files/patch-Makefile b/graphics/ale/files/patch-Makefile index 4a2254a9c939..862e03128295 100644 --- a/graphics/ale/files/patch-Makefile +++ b/graphics/ale/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig Wed Aug 4 16:46:34 2004 -+++ Makefile Sat Aug 7 13:11:43 2004 -@@ -41,14 +41,14 @@ +--- Makefile.orig Mon Aug 23 15:08:16 2004 ++++ Makefile Sat Aug 28 07:38:03 2004 +@@ -41,17 +41,17 @@ 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:=-I%%LOCALBASE%%/include -DUSE_FFTW ++FFTW_CFLAGS:=$(if $(subst 0,,$(FFTW)),-DUSE_FFTW $(shell pkg-config --cflags fftw3),) POSIX_CFLAGS:=$(if $(subst 0,,$(POSIX)),-DUSE_UNIX,) PRECISION_CFLAGS:=$(if $(subst SINGLE,,$(COLORS)),,-DALE_COLORS=SINGLE)\ $(if $(subst DOUBLE,,$(COLORS)),,-DALE_COLORS=DOUBLE)\ @@ -13,7 +13,20 @@ $(if $(subst SINGLE,,$(COORDINATES)),,-DALE_COORDINATES=SINGLE)\ $(if $(subst DOUBLE,,$(COORDINATES)),,-DALE_COORDINATES=DOUBLE) -FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),-lfftw3,) -+FFTW_LDFLAGS:=-L%%LOCALBASE%%/lib -lfftw3 ++FFTW_LDFLAGS:=$(if $(subst 0,,$(FFTW)),$(shell pkg-config --libs fftw3),) CFLAGS:= $(POSIX_CFLAGS) $(DEBUG_CFLAGS) $(FFTW_CFLAGS) $(PRECISION_CFLAGS) \ - $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) +- $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS),-Wall -O2) ++ $(if $(use_imagemagick),$(IMAGEMAGICK_CFLAGS)) $(CXXFLAGS) + LDFLAGS:=$(if $(use_imagemagick),$(IMAGEMAGICK_LDFLAGS)) $(FFTW_LDFLAGS) -lm + + # +@@ -68,7 +68,7 @@ + rm -f ale + + ale-phony: ale.cc d2.cc *.h d2/*.h d2/render/*.h d2/render/psf/*.h +- g++ -o ale $(CFLAGS) ale.cc d2.cc $(LDFLAGS) ++ $(CXX) -o ale $(CFLAGS) ale.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