Date: Mon, 27 Jan 2014 00:04:49 GMT From: Olivier Cochard-Labbé <olivier@cochard.me> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/186148: www/shellinabox : staging and cleanup patch Message-ID: <201401270004.s0R04nK6037579@oldred.freebsd.org> Resent-Message-ID: <201401270010.s0R0A0OM044198@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186148
>Category: ports
>Synopsis: www/shellinabox : staging and cleanup patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 27 00:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401270004.s0R04nK6037579>