Index: head/graphics/freeimage/Makefile
===================================================================
--- head/graphics/freeimage/Makefile	(revision 357570)
+++ head/graphics/freeimage/Makefile	(revision 357571)
@@ -1,51 +1,49 @@
 # Created by: Choe, Cheng-Dae <whitekid@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	freeimage
-PORTVERSION=	3.15.4
-PORTREVISION=	3
+PORTVERSION=	3.16.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
 DISTNAME=	FreeImage${PORTVERSION:S/.//g}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Simple C/C++ bitmap graphics library
 
-USES=		gmake dos2unix zip
+USES=		dos2unix gmake zip
 DOS2UNIX_FILES=	Source/LibOpenJPEG/opj_malloc.h
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/FreeImage
 MAKE_ARGS=	CC="${CC}" CPP="${CPP}" CXX="${CXX}"
 
 CFLAGS+=	-fexceptions -fvisibility=hidden
+CFLAGS_amd64=	-fPIC
 
 PLIST_FILES=	include/FreeImage.h \
 		include/FreeImagePlus.h \
 		lib/libfreeimage.a \
 		lib/libfreeimage-${PORTVERSION}.so \
 		lib/libfreeimage.so.3 \
 		lib/libfreeimage.so \
 		lib/libfreeimageplus.a \
 		lib/libfreeimageplus-${PORTVERSION}.so \
 		lib/libfreeimageplus.so.3 \
 		lib/libfreeimageplus.so
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+=	-fPIC
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; s|-o root -g root ||' \
 		${WRKSRC}/Makefile.gnu ${WRKSRC}/Makefile.fip
 
 post-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile.fip ${_MAKE_JOBS} ${MAKE_ARGS}
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${_MAKE_JOBS} \
+		${MAKE_ARGS} -C ${BUILD_WRKSRC}
 
 post-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -f Makefile.fip ${MAKE_ARGS} ${INSTALL_TARGET}
-	${LN} -s libfreeimageplus.so.3 ${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so
-	${LN} -s libfreeimageplus-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile.fip ${MAKE_ARGS} \
+		-C ${INSTALL_WRKSRC} ${INSTALL_TARGET}
+	${LN} -sf libfreeimageplus.so.3 \
+		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so
+	${LN} -sf libfreeimageplus-${PORTVERSION}.so \
+		${STAGEDIR}${PREFIX}/lib/libfreeimageplus.so.3
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/graphics/freeimage/distinfo
===================================================================
--- head/graphics/freeimage/distinfo	(revision 357570)
+++ head/graphics/freeimage/distinfo	(revision 357571)
@@ -1,2 +1,2 @@
-SHA256 (FreeImage3154.zip) = eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829
-SIZE (FreeImage3154.zip) = 5513923
+SHA256 (FreeImage3160.zip) = 03af32dd60140d07515ddfe7b4f467baa3b888a72ea78828811aded7adb42f60
+SIZE (FreeImage3160.zip) = 5669228