Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2013 08:03:44 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327240 - head/www/shellinabox
Message-ID:  <201309140803.r8E83i6H056170@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Sep 14 08:03:43 2013
New Revision: 327240
URL: http://svnweb.freebsd.org/changeset/ports/327240

Log:
  - Add NOLOGIN option: login as ssh (as opposed to as login(1))
  - While I'm here:
    - Remove LICENSE_FILE for well-known licenses
    - Update OPTONS_DEFINE: add DOCS and remove no-op MANPAGES
    - Cleanup Makefile header
    - Use single space after WWW:
  
  PR:		ports/182074
  Submitted by:	Yuri Victorovich <yuri@tsoft.com>
  Approved by:	Olivier Cochard-Labbe <olivier@cochard.me> (maintainer)

Modified:
  head/www/shellinabox/Makefile   (contents, props changed)
  head/www/shellinabox/pkg-descr   (contents, props changed)

Modified: head/www/shellinabox/Makefile
==============================================================================
--- head/www/shellinabox/Makefile	Sat Sep 14 08:01:54 2013	(r327239)
+++ head/www/shellinabox/Makefile	Sat Sep 14 08:03:43 2013	(r327240)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	shellinabox
-# Date created:		25 june 2010
-# Whom:			Olivier Cochard-Labbe <olivier@cochard.me>
-#
+# Created by: Olivier Cochard-Labbe <olivier@cochard.me>
 # $FreeBSD$
-#
 
 PORTNAME=	shellinabox
 PORTVERSION=	2.14
@@ -15,9 +11,8 @@ MAINTAINER=	olivier@cochard.me
 COMMENT=	Publish command line shell through AJAX interface
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=		CORES MANPAGES
+OPTIONS_DEFINE=	CORES DOCS
 CORES_DESC=	Patch shellinaboxd to enable core dumps
 
 HAS_CONFIGURE=	yes
@@ -39,6 +34,12 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNOLOGIN}
+CONFIGURE_ARGS+=--disable-login
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
@@ -60,7 +61,6 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-
 .endif
 	${MKDIR} ${ETCDIR}/
 	${CHMOD} 700 ${ETCDIR}/

Modified: head/www/shellinabox/pkg-descr
==============================================================================
--- head/www/shellinabox/pkg-descr	Sat Sep 14 08:01:54 2013	(r327239)
+++ head/www/shellinabox/pkg-descr	Sat Sep 14 08:03:43 2013	(r327240)
@@ -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
 
-WWW:	http://code.google.com/p/shellinabox/	
+WWW: http://code.google.com/p/shellinabox/	



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309140803.r8E83i6H056170>