diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile
index 9415af13f543..322e80373701 100644
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	hdr_tools
 PORTVERSION=	0.0.2010.11.23	# unspecified by the author, so use the date
-PORTREVISION=	22
+PORTREVISION=	23
 CATEGORIES=	graphics
 MASTER_SITES=	http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \
 		http://freebsd.nsu.ru/distfiles/
 DISTNAME=	hdr_src
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Command-line tools for creating and manipulating HDR images
 WWW=		https://ttic.uchicago.edu/~cotter/projects/hdr_tools/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libtiff.so:graphics/tiff \
 		libOpenEXR.so:graphics/openexr \
 
 USES=		compiler:c++11-lang gmake magick:6 pkgconfig tar:tgz
 NO_WRKSUBDIR=	yes
 
 PROGRAMS=	hdr_adjust hdr_convert hdr_create hdr_denoise hdr_fix_ca \
 		hdr_squish
 
 PLIST_FILES=	${PROGRAMS:S,^,bin/,}
 
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_CPU:Msse2}
 CXXFLAGS+=	-msse2 -mfpmath=sse
 .endif
 
 .if ${COMPILER_FEATURES:Mopenmp}
 CXXFLAGS+=	-fopenmp
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,RGBColorspace,s&,' ${WRKSRC}/image.cc
 
 do-install:
 	${INSTALL_PROGRAM} ${PROGRAMS:S,^,${WRKSRC}/,} \
 		${STAGEDIR}/${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/graphics/hdr_tools/files/patch-Makefile b/graphics/hdr_tools/files/patch-Makefile
index cefbf82256e5..c00bb47d8134 100644
--- a/graphics/hdr_tools/files/patch-Makefile
+++ b/graphics/hdr_tools/files/patch-Makefile
@@ -1,47 +1,47 @@
 --- Makefile.orig	2010-11-23 21:27:55 UTC
 +++ Makefile
-@@ -31,8 +31,12 @@ DEPENDENCY_HEADERS = \
+@@ -31,8 +31,12 @@ ifeq (${PLATFORM},linux)
  
  
  ifeq (${PLATFORM},linux)
 -CFLAGS = -pthread -fopenmp -Wall -msse2 -mfpmath=sse -I/usr/include/ImageMagick -I/usr/include/OpenEXR
 -LDFLAGS = -lIlmImf -lMagick++ -ltiff -lpopt -lstdc++ -lm
 +CXX?=		c++
 +CXXFLAGS+=	-Wall
 +CPPFLAGS+=	`pkg-config --cflags popt` `pkg-config --cflags OpenEXR` \
-+		`Magick++-config --cppflags`
++		`pkg-config --cflags Magick++`
 +LDFLAGS+=	`pkg-config --libs popt` `pkg-config --libs libtiff-4` \
-+		`pkg-config --libs OpenEXR` `Magick++-config --libs`
++		`pkg-config --libs OpenEXR` `pkg-config --libs Magick++`
  EXECUTABLES = ${TARGET_SOURCES:%.cc=%}
  endif
  
-@@ -64,14 +68,24 @@ CFLAGS := -O3 -funroll-loops -fomit-fram
+@@ -64,14 +68,24 @@ endif
  endif
  
  
 +TARGET_OBJS = $(TARGET_SOURCES:%.cc=%.o)
 +DEPENDENCY_OBJS = $(DEPENDENCY_SOURCES:%.cc=%.o)
 +
  .PHONY : all
 -all : ${TARGET_SOURCES:%.cc=%}
 +all : $(EXECUTABLES)
  
 -% : %.cc $(DEPENDENCY_HEADERS) $(DEPENDENCY_SOURCES) Makefile
 -	@echo "----  building \"$@\" from \"$<\" ($(PLATFORM)/$(BUILD))  ----"
 -	g++ $(CFLAGS) $< $(DEPENDENCY_SOURCES) -o $@ $(LDFLAGS)
 -	@echo
 +$(TARGET_OBJS) $(DEPENDENCY_OBJS) : $(DEPENDENCY_HEADERS)
 +$(EXECUTABLES) : $(DEPENDENCY_OBJS)
 +$(foreach prog,$(EXECUTABLES),$(eval $$prog : $$prog.o))
-+
+ 
 +%.o : %.cc
 +# Clang cannot compile image.cc and squish_luminance.cc with -O2 and above
 +	$(CXX) $(if $(and $(shell $(CXX) -v 2>&1 | grep clang),$(filter \
 +		image.cc squish_luminance.cc,$<)),$(CXXFLAGS:-O%=-O1), \
 +		$(CXXFLAGS)) $(CPPFLAGS) -o $@ -c $<
- 
++
 +% : %.o
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@
  
  .PHONY : strip
  strip : all