Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Jul 2017 20:32:06 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r446696 - head/graphics/gimp-refocus-plugin
Message-ID:  <201707262032.v6QKW6Eg075413@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Wed Jul 26 20:32:05 2017
New Revision: 446696
URL: https://svnweb.freebsd.org/changeset/ports/446696

Log:
  - Add LICENSE_FILE
  - Convert to options helpers
  - Add missing dependencies found by stage-qa
  - Remove USE_GCC it's only needed for ATLAS option and is
    handled by USES=fortran now
  - Fix build with ATLAS=on by providing correct lapack libs
  - Remove obvious comments

Modified:
  head/graphics/gimp-refocus-plugin/Makefile

Modified: head/graphics/gimp-refocus-plugin/Makefile
==============================================================================
--- head/graphics/gimp-refocus-plugin/Makefile	Wed Jul 26 20:18:20 2017	(r446695)
+++ head/graphics/gimp-refocus-plugin/Makefile	Wed Jul 26 20:32:05 2017	(r446696)
@@ -3,7 +3,7 @@
 
 PORTNAME=	refocus
 PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	gimp-
@@ -13,66 +13,47 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP plugin to "refocus" images through FIR Wiener filtering
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app
+LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
-OPTIONS_DEFINE=	ATLAS DOCS OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
-
-ATLAS_DESC=	Build with optimized math/atlas instead of builtin
-
 USES=		autoreconf gettext gmake pathfix pkgconfig
-
-# GCC required due to fortran dependency, e.g., math/atlas
-USE_GCC=	yes
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GIMPTOOL=${LOCALBASE}/bin/gimptool-2.0
+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 
 GIMP_PLUGIN_DIR=	libexec/gimp/2.2/plug-ins
 
-# installed files
 PLIST_FILES=	${GIMP_PLUGIN_DIR}/${PORTNAME}
+PORTDOCS=	*
 
+OPTIONS_DEFINE=	ATLAS DOCS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
+
+ATLAS_DESC=	Build with optimized math/atlas instead of builtin
+ATLAS_USES=		blaslapack:atlas fortran
+ATLAS_BUILD_DEPENDS=	f2c>0:lang/f2c
+ATLAS_CONFIGURE_ON=	--with-lapack-libs="${LAPACKLIB} ${BLASLIB}" \
+			--with-lapack-includes="-I${LOCALBASE}/include"
+
+OPTIMIZED_CFLAGS_CFLAGS=	-O3
+
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.am \
 		-exec ${REINPLACE_CMD} -e "s|; make|; ${MAKE_CMD}|" {} \;
 	@${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|" \
 		${WRKSRC}/configure.in
 
-.include <bsd.port.options.mk>
-
-# math/atlas library
-.if ${PORT_OPTIONS:MATLAS}
-BUILD_DEPENDS+=	\
-		${LOCALBASE}/include/f2c.h:lang/f2c \
-		${LOCALBASE}/include/clapack.h:math/atlas
-RUN_DEPENDS+=	\
-		${LOCALBASE}/include/clapack.h:math/atlas
-
-CONFIGURE_ARGS+=	--with-lapack-libs="-L${LOCALBASE}/lib -latlas -lblas -lcblas -llapack" \
-			--with-lapack-includes="-I${LOCALBASE}/include"
-.endif
-
-# optimized CFLAGS
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-O3
-.endif
-
-# documentation
-PORTDOCS=	*
-
 do-install:
-# plugin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_PLUGIN_DIR}/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${GIMP_PLUGIN_DIR}/
-# docs
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*pdf ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707262032.v6QKW6Eg075413>