From owner-svn-ports-head@FreeBSD.ORG Mon Jan 27 17:06:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65D1EAE8; Mon, 27 Jan 2014 17:06:30 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 37D941CFD; Mon, 27 Jan 2014 17:06:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RH6UJZ004627; Mon, 27 Jan 2014 17:06:30 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RH6UHq004626; Mon, 27 Jan 2014 17:06:30 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201401271706.s0RH6UHq004626@svn.freebsd.org> From: Thierry Thomas Date: Mon, 27 Jan 2014 17:06:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341433 - head/graphics/cimg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2014 17:06:30 -0000 Author: thierry Date: Mon Jan 27 17:06:29 2014 New Revision: 341433 URL: http://svnweb.freebsd.org/changeset/ports/341433 QAT: https://qat.redports.org/buildarchive/r341433/ Log: - Remove direct dependency to fortran, the library is automatically detected, and it fixes the linkage on FreeBSD-10; - cleaning. Modified: head/graphics/cimg/Makefile Modified: head/graphics/cimg/Makefile ============================================================================== --- head/graphics/cimg/Makefile Mon Jan 27 17:04:38 2014 (r341432) +++ head/graphics/cimg/Makefile Mon Jan 27 17:06:29 2014 (r341433) @@ -31,15 +31,13 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/} BUILD_WRKSRC= ${WRKSRC}/examples MAKE_ENV= X11PATH=${LOCALBASE} LOCALBASE=${LOCALBASE} CPPFLAGS+= ${CFLAGS} ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= ${PTHREAD_LIBS} -Wl,--verbose .if !defined(NOPORTDOCS) USES= gmake REINPLACE_ARGS= -i "" LIB_DEPENDS+= libboard.so:${PORTSDIR}/graphics/libboard -USE_FORTRAN= yes - . if !defined(WITH_DEBUG) LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ @@ -97,8 +95,7 @@ LAPACK_LIB= -L${LOCALBASE}/lib -llapack pre-configure: .if !defined(NOPORTDOCS) - ${DIRNAME} `${LOCALBASE}/bin/${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR - ${REINPLACE_CMD} -e 's|make|${GMAKE}|' ${BUILD_WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|make|${MAKE_CMD}|' ${BUILD_WRKSRC}/Makefile .else ${REINPLACE_CMD} -e 's|^OPTFLAGS|#OPTFLAGS|' ${BUILD_WRKSRC}/Makefile .endif @@ -127,10 +124,8 @@ do-install: .if !defined(NOPORTEXAMPLES) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} - @(cd ${STAGEDIR}${EXAMPLESDIR} && ${GMAKE} clean) + @(cd ${STAGEDIR}${EXAMPLESDIR} && ${MAKE_CMD} clean) @${RM} ${STAGEDIR}${EXAMPLESDIR}/*.orig - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} - ${FIND} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} -type f -exec ${CHMOD} ${SHAREMODE} {} \; .endif .include