Date: Sat, 15 Mar 2014 08:01:49 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348293 - in head/sysutils/autojump: . files Message-ID: <201403150801.s2F81nWB057287@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 15 08:01:49 2014 New Revision: 348293 URL: http://svnweb.freebsd.org/changeset/ports/348293 QAT: https://qat.redports.org/buildarchive/r348293/ Log: - Sanitize and cleanup the port a bit: remove "Portname is ..." from COMMENT, drop useless EXTRACT_SUFX, define LICENSE (GPLv3), sort the knobs, etc. - Do not patch ./install.zsh file; it is nearly identical to ./install.sh except for the _f file, which can be installed separately (do so) - Stagify, use OPTIONS helpers, trim superfluous whitespace here and there Deleted: head/sysutils/autojump/files/patch-install.zsh Modified: head/sysutils/autojump/Makefile head/sysutils/autojump/files/patch-install.sh head/sysutils/autojump/pkg-deinstall head/sysutils/autojump/pkg-message Modified: head/sysutils/autojump/Makefile ============================================================================== --- head/sysutils/autojump/Makefile Sat Mar 15 07:29:50 2014 (r348292) +++ head/sysutils/autojump/Makefile Sat Mar 15 08:01:49 2014 (r348293) @@ -7,53 +7,45 @@ CATEGORIES= sysutils MASTER_SITES= http://cloud.github.com/downloads/joelthelion/autojump/ \ http://www.vermatech.com/distfiles/ DISTNAME= autojump_v${PORTVERSION} -EXTRACT_SUFX= .tar.gz MAINTAINER= neeraj.verma.ports@vermatech.com -COMMENT= Autojump is a tool that acts as a complement to cd +COMMENT= Tool that acts as a complement to cd -RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +LICENSE= GPLv3 -USE_PYTHON_RUN= YES +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -NO_BUILD= YES - -SUB_FILES+= pkg-install +NO_BUILD= yes +USE_PYTHON_RUN= yes +SUB_FILES= pkg-install PLIST_FILES= bin/autojump \ bin/jumpapplet \ + man/man1/autojump.1.gz \ share/autojump/autojump.bash \ share/autojump/autojump.zsh \ share/autojump/icon.png -MAN1= autojump.1 +PLIST_DIRS= share/autojump OPTIONS_DEFINE= ZSH OPTIONS_DEFAULT= ZSH -NO_STAGE= yes -.include <bsd.port.options.mk> +ZSH_RUN_DEPENDS= zsh:${PORTSDIR}/shells/zsh +ZSH_PLIST_FILES= share/zsh/site-functions/_j -.if ${PORT_OPTIONS:MZSH} -RUN_DEPENDS+= ${LOCALBASE}/bin/zsh:${PORTSDIR}/shells/zsh -PLIST_FILES+= share/zsh/site-functions/_j -.endif - -PLIST_DIRS= share/autojump +.include <bsd.port.options.mk> post-patch: - @${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/autojump - @${REINPLACE_CMD} -e 's|/usr$$|${PREFIX}|' -e 's|/usr/local|${PREFIX}|' -e 's|/bin/bash|${PREFIX}/bin/bash|' ${WRKSRC}/install.sh - @${REINPLACE_CMD} -e 's|/usr$$|${PREFIX}|' -e 's|/usr/local|${PREFIX}|' -e 's|/bin/zsh|${PREFIX}/bin/zsh|' ${WRKSRC}/install.zsh + @${REINPLACE_CMD} -e '/#!\/usr\/bin/s|python|env &|' \ + ${WRKSRC}/autojump do-install: + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${SH} ./install.sh \ + --prefix ${STAGEDIR}${PREFIX}) .if ${PORT_OPTIONS:MZSH} - @(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.zsh ) -.else - @(cd ${INSTALL_WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./install.sh ) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions + ${INSTALL_DATA} ${WRKSRC}/_j \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions .endif - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -post-install: - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/sysutils/autojump/files/patch-install.sh ============================================================================== --- head/sysutils/autojump/files/patch-install.sh Sat Mar 15 07:29:50 2014 (r348292) +++ head/sysutils/autojump/files/patch-install.sh Sat Mar 15 08:01:49 2014 (r348293) @@ -1,6 +1,15 @@ --- ./install.sh.orig 2010-10-01 10:49:18.000000000 -0400 +++ ./install.sh 2011-12-03 23:04:22.000000000 -0500 -@@ -41,56 +41,12 @@ +@@ -15,7 +15,7 @@ + #You should have received a copy of the GNU General Public License + #along with autojump. If not, see <http://www.gnu.org/licenses/>. + +-function show_help { ++show_help() { + echo "sudo ./install.sh [--prefix /usr/local]" + } + +@@ -41,56 +41,12 @@ done echo "Installing to ${prefix} ..." # INSTALL AUTOJUMP Modified: head/sysutils/autojump/pkg-deinstall ============================================================================== --- head/sysutils/autojump/pkg-deinstall Sat Mar 15 07:29:50 2014 (r348292) +++ head/sysutils/autojump/pkg-deinstall Sat Mar 15 08:01:49 2014 (r348293) @@ -5,11 +5,11 @@ POST-DEINSTALL) rm -f /etc/profile.autojump rm -f /etc/zshrc.autojump # delete the source (.) line from the /etc/profile and /etc/zshrc - if [ -f /etc/profile ] ; then - sed -i '' -e '/profile.autojump/d' /etc/profile - fi - if [ -f /etc/zshrc ] ; then - sed -i '' -e '/zshrc.autojump/d' /etc/zshrc - fi + if [ -f /etc/profile ] ; then + sed -i '' -e '/profile.autojump/d' /etc/profile + fi + if [ -f /etc/zshrc ] ; then + sed -i '' -e '/zshrc.autojump/d' /etc/zshrc + fi ;; esac Modified: head/sysutils/autojump/pkg-message ============================================================================== --- head/sysutils/autojump/pkg-message Sat Mar 15 07:29:50 2014 (r348292) +++ head/sysutils/autojump/pkg-message Sat Mar 15 08:01:49 2014 (r348293) @@ -2,5 +2,5 @@ * AutoJump installed ************************************************************** * Note: Your /etc/profile was changed for this installation. -* changes will be reverted when you un-install the package. +* changes will be reverted when you un-install the package. **************************************************************
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403150801.s2F81nWB057287>