From owner-svn-ports-all@FreeBSD.ORG Mon Jan 27 08:22:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75025E86; Mon, 27 Jan 2014 08:22:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 608CA1DA1; Mon, 27 Jan 2014 08:22:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0R8MujV099487; Mon, 27 Jan 2014 08:22:56 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0R8MtG2099482; Mon, 27 Jan 2014 08:22:55 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201401270822.s0R8MtG2099482@svn.freebsd.org> From: Alex Kozlov Date: Mon, 27 Jan 2014 08:22:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341337 - head/www/shellinabox X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2014 08:22:56 -0000 Author: ak Date: Mon Jan 27 08:22:55 2014 New Revision: 341337 URL: http://svnweb.freebsd.org/changeset/ports/341337 QAT: https://qat.redports.org/buildarchive/r341337/ Log: - Support STAGEDIR [1] - Use options helpers - Rewrap overly long line in pkg-descr, remove gratuitous whitespaces at the end of the line PR: ports/186148 (based on) [1] Submitted by: Olivier Cochard-Labbé (maintainer) [1] Modified: head/www/shellinabox/Makefile head/www/shellinabox/pkg-descr head/www/shellinabox/pkg-plist Modified: head/www/shellinabox/Makefile ============================================================================== --- head/www/shellinabox/Makefile Mon Jan 27 08:20:05 2014 (r341336) +++ head/www/shellinabox/Makefile Mon Jan 27 08:22:55 2014 (r341337) @@ -3,7 +3,7 @@ PORTNAME= shellinabox PORTVERSION= 2.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= GOOGLE_CODE @@ -12,7 +12,7 @@ COMMENT= Publish command line shell thro LICENSE= GPLv2 -OPTIONS_DEFINE= CORES DOCS NOLOGIN +OPTIONS_DEFINE= CORES NOLOGIN CORES_DESC= Patch shellinaboxd to enable core dumps NOLOGIN_DESC= Login through ssh (not through login) @@ -26,27 +26,16 @@ USE_RC_SUBR= shellinaboxd USERS?= shellinabox GROUPS?= shellinabox -MAN1= shellinaboxd.1 - -PORTDOCS= AUTHORS ChangeLog INSTALL README COPYING GPL-2 NEWS TODO - PKGDEINSTALL= ${WRKDIR}/pkg-deinstall SUB_FILES= pkg-deinstall SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNOLOGIN} -CONFIGURE_ARGS+=--disable-login -.endif +NOLOGIN_CONFIGURE_ON= --disable-login -.include +BROKEN_powerpc= Does not load on powerpc -.if ${ARCH} == "powerpc" -BROKEN= Does not load on powerpc -.endif +.include post-patch: .if ${PORT_OPTIONS:MCORES} @@ -57,16 +46,10 @@ post-patch: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif - ${MKDIR} ${ETCDIR}/ - ${CHMOD} 700 ${ETCDIR}/ - ${CHOWN} ${USERS}:${GROUPS} ${ETCDIR}/ - ${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${MANPREFIX}/man/man1/ + @${MKDIR} ${STAGEDIR}${ETCDIR} -.include +.include Modified: head/www/shellinabox/pkg-descr ============================================================================== --- head/www/shellinabox/pkg-descr Mon Jan 27 08:20:05 2014 (r341336) +++ head/www/shellinabox/pkg-descr Mon Jan 27 08:22:55 2014 (r341337) @@ -1,4 +1,4 @@ -Shell In A Box is a web server that can export arbitary command line tools to a -web based terminal emulator +Shell In A Box is a web server that can export arbitary command line tools +to a web based terminal emulator. -WWW: http://code.google.com/p/shellinabox/ +WWW: http://code.google.com/p/shellinabox/ Modified: head/www/shellinabox/pkg-plist ============================================================================== --- head/www/shellinabox/pkg-plist Mon Jan 27 08:20:05 2014 (r341336) +++ head/www/shellinabox/pkg-plist Mon Jan 27 08:22:55 2014 (r341337) @@ -1,5 +1,9 @@ bin/shellinaboxd +etc/rc.d/shellinaboxd +man/man1/shellinaboxd.1.gz +@mode 700 +@owner shellinabox +@group shellinabox @exec mkdir -p %D/etc/shellinabox -@exec chmod 777 %D/etc/shellinabox -@exec chown nobody %D/etc/shellinabox @dirrmtry etc/shellinabox +@mode