Date: Fri, 20 Dec 2013 20:00:55 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337087 - in head/shells/bash-completion: . files Message-ID: <201312202000.rBKK0tw3017716@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Dec 20 20:00:54 2013 New Revision: 337087 URL: http://svnweb.freebsd.org/changeset/ports/337087 Log: Fix staging as non-root. Submitted by: Anton Yuzhaninov <citrin@citrin.ru> While I'm here, convert bash selection to OPTIONS. Added: head/shells/bash-completion/files/patch-Makefile.am (contents, props changed) Modified: head/shells/bash-completion/Makefile Modified: head/shells/bash-completion/Makefile ============================================================================== --- head/shells/bash-completion/Makefile Fri Dec 20 19:55:29 2013 (r337086) +++ head/shells/bash-completion/Makefile Fri Dec 20 20:00:54 2013 (r337087) @@ -10,14 +10,12 @@ MASTER_SITES= http://bash-completion.ali MAINTAINER= adamw@FreeBSD.org COMMENT= Programmable completion library for Bash -.if defined(WITH_BASH_DEVEL) -RUN_DEPENDS=bash:${PORTSDIR}/shells/bash-devel -.else -RUN_DEPENDS=bash:${PORTSDIR}/shells/bash -.endif +OPTIONS_DEFINE= BASH_DEVEL +BASH_DEVEL_DESC= Use shells/bash-devel instead of shells/bash CONFLICTS= bash-completion-classic-[0-9]* +USE_AUTOTOOLS= aclocal automake GNU_CONFIGURE= yes USE_GMAKE= yes @@ -26,7 +24,15 @@ USE_BZIP2= yes SUB_FILES= pkg-message SUB_LIST+= RUNFILE=${DATADIR}/bash_completion.sh -post-patch: +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MBASH_DEVEL} +RUN_DEPENDS=bash:${PORTSDIR}/shells/bash-devel +.else +RUN_DEPENDS=bash:${PORTSDIR}/shells/bash +.endif + +post-configure: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \ s|/etc/bash_completion|${PREFIX}&|g; \ s|/usr\(/sbin/postconf\)|${PREFIX}\1|g; \ Added: head/shells/bash-completion/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/bash-completion/files/patch-Makefile.am Fri Dec 20 20:00:54 2013 (r337087) @@ -0,0 +1,13 @@ +--- Makefile.am.orig 2013-12-20 13:44:12.000000000 -0500 ++++ Makefile.am 2013-12-20 13:44:17.000000000 -0500 +@@ -20,8 +20,10 @@ + .dir-locals.el + + install-data-hook: ++ chmod 644 $(DESTDIR)$(pkgdatadir)/bash_completion + tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ + sed -e 's|=/etc/bash_completion\.d|=$(compatdir)|' \ + $(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \ + cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \ + rm $$tmpfile ++ chmod 444 $(DESTDIR)$(pkgdatadir)/bash_completion
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312202000.rBKK0tw3017716>