Date: Mon, 27 Jan 2014 07:00:01 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/186148: www/shellinabox : staging and cleanup patch Message-ID: <201401270700.s0R701j4047712@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/186148; it has been noted by GNATS.
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401270700.s0R701j4047712>