svn commit: r337674 - in branches/2014Q1/shells/rssh: . files
Baptiste Daroussin
bapt at FreeBSD.org
Fri Dec 27 09:57:19 UTC 2013
Author: bapt
Date: Fri Dec 27 09:57:18 2013
New Revision: 337674
URL: http://svnweb.freebsd.org/changeset/ports/337674
Log:
MFH: r337656
Support stage
Fix build with clang on head (symbol collision)
Added:
branches/2014Q1/shells/rssh/files/
- copied from r337656, head/shells/rssh/files/
Modified:
branches/2014Q1/shells/rssh/Makefile
branches/2014Q1/shells/rssh/pkg-plist (contents, props changed)
Directory Properties:
branches/2014Q1/ (props changed)
Modified: branches/2014Q1/shells/rssh/Makefile
==============================================================================
--- branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:54:22 2013 (r337673)
+++ branches/2014Q1/shells/rssh/Makefile Fri Dec 27 09:57:18 2013 (r337674)
@@ -11,29 +11,15 @@ COMMENT= Restricted Secure SHell only fo
GNU_CONFIGURE= yes
-MAN1= rssh.1
-MAN5= rssh.conf.5
-
+USE_CSTD= gnu89
OPTIONS_DEFINE= RDIST
RDIST_DESC= rdist support
-
-NO_STAGE= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRDIST}
-RUN_DEPENDS+= ${LOCALBASE}/bin/rdist6:${PORTSDIR}/net/rdist6
-CONFIGURE_ARGS+=--with-rdist=${LOCALBASE}/bin/rdist6
-.endif
+RDIST_RUN_DEPENDS= rdist6:${PORTSDIR}/net/rdist6
+RDIST_CONFIGURE_ON= --with-rdist=${LOCALBASE}/bin/rdist6
post-patch:
@${REINPLACE_CMD} -E -e 's,(\$$\(DESTDIR\)\$$\(sysconfdir\)/\$$\$$f),\1.dist,g' \
+ -e 's,u\+s ,u+s $$\(DESTDIR\),g' \
${WRKSRC}/Makefile.in
-post-install:
- @${ECHO_MSG} "updating /etc/shells"
- @${CP} /etc/shells /etc/shells.bak
- @(${GREP} -v ${PREFIX}/bin/${PORTNAME} /etc/shells.bak; \
- ${ECHO_CMD} ${PREFIX}/bin/${PORTNAME}) > /etc/shells
- @${RM} /etc/shells.bak
-
.include <bsd.port.mk>
Modified: branches/2014Q1/shells/rssh/pkg-plist
==============================================================================
--- branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:54:22 2013 (r337673)
+++ branches/2014Q1/shells/rssh/pkg-plist Fri Dec 27 09:57:18 2013 (r337674)
@@ -1,5 +1,6 @@
- at comment $FreeBSD$
bin/rssh
+man/man1/rssh.1.gz
+man/man5/rssh.conf.5.gz
@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
etc/rssh.conf.default.dist
More information about the svn-ports-all
mailing list