svn commit: r341337 - head/www/shellinabox
Alex Kozlov
ak at FreeBSD.org
Mon Jan 27 08:22:56 UTC 2014
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é <olivier at cochard.me> (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 <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNOLOGIN}
-CONFIGURE_ARGS+=--disable-login
-.endif
+NOLOGIN_CONFIGURE_ON= --disable-login
-.include <bsd.port.pre.mk>
+BROKEN_powerpc= Does not load on powerpc
-.if ${ARCH} == "powerpc"
-BROKEN= Does not load on powerpc
-.endif
+.include <bsd.port.options.mk>
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 <bsd.port.post.mk>
+.include <bsd.port.mk>
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
+ at mode 700
+ at owner shellinabox
+ at group shellinabox
@exec mkdir -p %D/etc/shellinabox
- at exec chmod 777 %D/etc/shellinabox
- at exec chown nobody %D/etc/shellinabox
@dirrmtry etc/shellinabox
+ at mode
More information about the svn-ports-all
mailing list