From nobody@FreeBSD.org  Mon Jan 27 00:04:49 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D533CDE6
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jan 2014 00:04:49 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id A71661A32
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jan 2014 00:04:49 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s0R04nDS037584
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 27 Jan 2014 00:04:49 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s0R04nK6037579;
	Mon, 27 Jan 2014 00:04:49 GMT
	(envelope-from nobody)
Message-Id: <201401270004.s0R04nK6037579@oldred.freebsd.org>
Date: Mon, 27 Jan 2014 00:04:49 GMT
From: Olivier Cochard-Labb <olivier@cochard.me>
To: freebsd-gnats-submit@FreeBSD.org
Subject: www/shellinabox : staging and cleanup patch
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186148
>Category:       ports
>Synopsis:       www/shellinabox : staging and cleanup patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 27 00:10:00 UTC 2014
>Closed-Date:    Mon Jan 27 08:23:07 UTC 2014
>Last-Modified:  Mon Jan 27 08:23:07 UTC 2014
>Originator:     Olivier Cochard-Labb
>Release:        10.0
>Organization:
>Environment:
>Description:
Here is a cleanup regarding this port:
 - staging
 - remove useless DOCs
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: www/shellinabox/Makefile
===================================================================
--- www/shellinabox/Makefile	(revision 341310)
+++ www/shellinabox/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	shellinabox
 PORTVERSION=	2.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	GOOGLE_CODE
 
@@ -12,7 +12,7 @@
 
 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,16 +26,11 @@
 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 <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNOLOGIN}
@@ -57,16 +52,10 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/shellinaboxd ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/shellinaboxd.1 ${STAGEDIR}${PREFIX}/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 <bsd.port.post.mk>
Index: www/shellinabox/pkg-plist
===================================================================
--- www/shellinabox/pkg-plist	(revision 341310)
+++ www/shellinabox/pkg-plist	(working copy)
@@ -1,5 +1,8 @@
 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


>Release-Note:
>Audit-Trail:

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Olivier =?iso-8859-1?Q?Cochard-Labb=E9?= <olivier@cochard.me>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186148: www/shellinabox : staging and cleanup patch
Date: Mon, 27 Jan 2014 08:53:09 +0200

 --wRRV7LY7NUeQGEoC
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi
 
 Can you please review the attached patch?
 Thanks.
 
 
 -- 
 Alex
 
 --wRRV7LY7NUeQGEoC
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 - Support STAGEDIR
 - Use options helpers
 - Rewrap overly long line in pkg-descr, remove gratuitous whitespaces at the end of the line
 Index: www/shellinabox/Makefile
 ===================================================================
 --- www/shellinabox/Makefile	(revision 341328)
 +++ www/shellinabox/Makefile	(working copy)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	shellinabox
  PORTVERSION=	2.14
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	www
  MASTER_SITES=	GOOGLE_CODE
  
 @@ -12,7 +12,7 @@
  
  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,28 +26,17 @@
  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 <bsd.port.options.mk>
 +NOLOGIN_CONFIGURE_ON=	--disable-login
  
 -.if ${PORT_OPTIONS:MNOLOGIN}
 -CONFIGURE_ARGS+=--disable-login
 -.endif
 +BROKEN_powerpc=	Does not load on powerpc
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if ${ARCH} == "powerpc"
 -BROKEN=		Does not load on powerpc
 -.endif
 -
  post-patch:
  .if ${PORT_OPTIONS:MCORES}
  	@${REINPLACE_CMD} \
 @@ -57,16 +46,10 @@
  .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 <bsd.port.post.mk>
 +.include <bsd.port.mk>
 Index: www/shellinabox/pkg-descr
 ===================================================================
 --- www/shellinabox/pkg-descr	(revision 341328)
 +++ www/shellinabox/pkg-descr	(working copy)
 @@ -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/
 Index: www/shellinabox/pkg-plist
 ===================================================================
 --- www/shellinabox/pkg-plist	(revision 341328)
 +++ www/shellinabox/pkg-plist	(working copy)
 @@ -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
 
 --wRRV7LY7NUeQGEoC--

From: =?ISO-8859-1?Q?Olivier_Cochard=2DLabb=E9?= <olivier@cochard.me>
To: Alex Kozlov <spam@rm-rf.kiev.ua>
Cc: bug-followup@freebsd.org
Subject: Re: ports/186148: www/shellinabox : staging and cleanup patch
Date: Mon, 27 Jan 2014 08:39:41 +0100

 --047d7b66f5fbbd686804f0eed0f3
 Content-Type: text/plain; charset=ISO-8859-1
 
 On Mon, Jan 27, 2014 at 7:53 AM, Alex Kozlov <spam@rm-rf.kiev.ua> wrote:
 
 > Hi
 >
 > Can you please review the attached patch?
 > Thanks.
 >
 > Hi Alex,
 did you modify it ? (because I'm the author of this "maintainer-update" PR).
 
 Regards,
 
 Olivier
 
 --047d7b66f5fbbd686804f0eed0f3
 Content-Type: text/html; charset=ISO-8859-1
 
 <div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Jan 27, 2014 at 7:53 AM, Alex Kozlov <span dir="ltr">&lt;<a href="mailto:spam@rm-rf.kiev.ua" target="_blank">spam@rm-rf.kiev.ua</a>&gt;</span> wrote:<br>
 
 <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Hi<br>
 <br>
 Can you please review the attached patch?<br>
 Thanks.<br>
 <span class=""><font color="#888888"><br></font></span></blockquote>Hi Alex,<br>did you modify it ? (because I&#39;m the author of this &quot;maintainer-update&quot; PR).<br><br>Regards,<br><br>Olivier</div></div></div>
 
 --047d7b66f5fbbd686804f0eed0f3--

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Olivier =?iso-8859-1?Q?Cochard-Labb=E9?= <olivier@cochard.me>
Cc: bug-followup@freebsd.org
Subject: Re: ports/186148: www/shellinabox : staging and cleanup patch
Date: Mon, 27 Jan 2014 09:57:43 +0200

 On Mon, Jan 27, 2014 at 08:39:41AM +0100, Olivier Cochard-Labb wrote:
 > On Mon, Jan 27, 2014 at 7:53 AM, Alex Kozlov <spam@rm-rf.kiev.ua> wrote:
 > > Can you please review the attached patch?
 > > Thanks.
 > >
 > > Hi Alex,
 > did you modify it ? (because I'm the author of this "maintainer-update" PR).
 Yes, I've fixed mode in plist: http://redports.org/~ak0/20140127060301-21904-172399/shellinabox-2.14_3.log ,
 wrap overly long lines and removed whitespaces at eol in pkg-descr,
 used options helpers to simplify port and also make a few cosmetic changes.
 
 
 -- 
 Alex

From: =?ISO-8859-1?Q?Olivier_Cochard=2DLabb=E9?= <olivier@cochard.me>
To: Alex Kozlov <spam@rm-rf.kiev.ua>
Cc: bug-followup@freebsd.org
Subject: Re: ports/186148: www/shellinabox : staging and cleanup patch
Date: Mon, 27 Jan 2014 09:15:28 +0100

 --001a11339ae4b5368404f0ef5028
 Content-Type: text/plain; charset=ISO-8859-1
 
 On Mon, Jan 27, 2014 at 8:57 AM, Alex Kozlov <spam@rm-rf.kiev.ua> wrote:
 
 >
 > Yes, I've fixed mode in plist:
 > http://redports.org/~ak0/20140127060301-21904-172399/shellinabox-2.14_3.log,
 > wrap overly long lines and removed whitespaces at eol in pkg-descr,
 > used options helpers to simplify port and also make a few cosmetic changes.
 >
 
 great: Then it's okay.
 
 Thanks,
 
 Olivier
 
 --001a11339ae4b5368404f0ef5028
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote">On M=
 on, Jan 27, 2014 at 8:57 AM, Alex Kozlov <span dir=3D"ltr">&lt;<a href=3D"m=
 ailto:spam@rm-rf.kiev.ua" target=3D"_blank">spam@rm-rf.kiev.ua</a>&gt;</spa=
 n> wrote:<br>
 
 <blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
 x #ccc solid;padding-left:1ex"><div class=3D"im"><br></div>Yes, I&#39;ve fi=
 xed mode in plist: <a href=3D"http://redports.org/~ak0/20140127060301-21904=
 -172399/shellinabox-2.14_3.log" target=3D"_blank">http://redports.org/~ak0/=
 20140127060301-21904-172399/shellinabox-2.14_3.log</a> ,<br>
 
 
 wrap overly long lines and removed whitespaces at eol in pkg-descr,<br>
 used options helpers to simplify port and also make a few cosmetic changes.=
 <br></blockquote><div><br></div><div>great: Then it&#39;s okay.</div><div><=
 br></div><div>Thanks,</div><div><br></div><div>Olivier</div></div></div>
 
 </div>
 
 --001a11339ae4b5368404f0ef5028--
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Mon Jan 27 08:22:49 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186148 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Mon Jan 27 08:23:06 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186148 
>Unformatted:
