From owner-svn-ports-head@freebsd.org Tue Mar 22 20:26:28 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5A31AD8BD7; Tue, 22 Mar 2016 20:26:28 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 5DEA2CA2; Tue, 22 Mar 2016 20:26:28 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2MKQRj7050861; Tue, 22 Mar 2016 20:26:27 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2MKQRDc050860; Tue, 22 Mar 2016 20:26:27 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201603222026.u2MKQRDc050860@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Tue, 22 Mar 2016 20:26:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411675 - head/graphics/gimp-gmic-plugin 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.21 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: Tue, 22 Mar 2016 20:26:28 -0000 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 - 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