Date: Tue, 22 Mar 2016 20:26:27 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411675 - head/graphics/gimp-gmic-plugin Message-ID: <201603222026.u2MKQRDc050860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Mar 22 20:26:27 2016 New Revision: 411675 URL: https://svnweb.freebsd.org/changeset/ports/411675 Log: graphics/gimp-gmic-plugin: simplify port a bit - utilize USES=localbase - simplify BASH options dependency - further convert to options helpers and drop including of bsd.port.options.mk Modified: head/graphics/gimp-gmic-plugin/Makefile Modified: head/graphics/gimp-gmic-plugin/Makefile ============================================================================== --- head/graphics/gimp-gmic-plugin/Makefile Tue Mar 22 20:20:38 2016 (r411674) +++ head/graphics/gimp-gmic-plugin/Makefile Tue Mar 22 20:26:27 2016 (r411675) @@ -21,11 +21,11 @@ LIB_DEPENDS= libGraphicsMagick++.so:${PO OPTIONS_DEFINE= BASH OPTIONS_SUB= yes -BASH_RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +BASH_RUN_DEPENDS= bash:${PORTSDIR}/shells/bash WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= gmake pkgconfig +USES= gmake localbase pkgconfig USE_GCC= yes USE_GNOME= gtk20 USE_XORG= x11 xext xrandr @@ -33,8 +33,6 @@ USE_XORG= x11 xext xrandr PLUGIN_DIR?= libexec/gimp/2.2/plug-ins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CFLAGS:= ${CFLAGS:N-O*:N-pipe} CXXFLAGS:= ${CXXFLAGS:N-O*:N-pipe} @@ -46,8 +44,6 @@ PLIST_FILES= bin/gmic \ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PORTEXAMPLES= gmic_in_script.scm gmic_use_lib.cpp -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's#/usr/X11R6#${PREFIX}#g' \ ${WRKSRC}/Makefile @@ -59,10 +55,9 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/../man/gmic.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR} -.if ${PORT_OPTIONS:MBASH} +do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/../resources/gmic_bashcompletion.sh \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603222026.u2MKQRDc050860>