From owner-svn-ports-all@FreeBSD.ORG Thu Jun 12 08:49:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C88B6DB6; Thu, 12 Jun 2014 08:49:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A950D208E; Thu, 12 Jun 2014 08:49:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5C8ndCD017269; Thu, 12 Jun 2014 08:49:39 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5C8ndnU017267; Thu, 12 Jun 2014 08:49:39 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201406120849.s5C8ndnU017267@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 12 Jun 2014 08:49:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357571 - head/graphics/freeimage X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jun 2014 08:49:40 -0000 Author: danfe Date: Thu Jun 12 08:49:38 2014 New Revision: 357571 URL: http://svnweb.freebsd.org/changeset/ports/357571 QAT: https://qat.redports.org/buildarchive/r357571/ Log: - Update to version 3.16.0 - Make use of CFLAGS_amd64 and thus simplify the Makefile - Do not hardcode ${GMAKE}, correctly call it via ${MAKE_CMD} - Sort USES values, sanitize port-build/install commands Approved by: gahr (maintainer) Modified: head/graphics/freeimage/Makefile head/graphics/freeimage/distinfo Modified: head/graphics/freeimage/Makefile ============================================================================== --- head/graphics/freeimage/Makefile Thu Jun 12 08:19:10 2014 (r357570) +++ head/graphics/freeimage/Makefile Thu Jun 12 08:49:38 2014 (r357571) @@ -2,8 +2,7 @@ # $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} @@ -11,13 +10,14 @@ 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 \ @@ -30,22 +30,20 @@ PLIST_FILES= include/FreeImage.h \ lib/libfreeimageplus.so.3 \ lib/libfreeimageplus.so -.include - -.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 +.include Modified: head/graphics/freeimage/distinfo ============================================================================== --- head/graphics/freeimage/distinfo Thu Jun 12 08:19:10 2014 (r357570) +++ head/graphics/freeimage/distinfo Thu Jun 12 08:49:38 2014 (r357571) @@ -1,2 +1,2 @@ -SHA256 (FreeImage3154.zip) = eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 -SIZE (FreeImage3154.zip) = 5513923 +SHA256 (FreeImage3160.zip) = 03af32dd60140d07515ddfe7b4f467baa3b888a72ea78828811aded7adb42f60 +SIZE (FreeImage3160.zip) = 5669228