svn commit: r454948 - in head/sysutils/cbsd: . files

[Roman Bogorodskiy]

Author: novel
Date: Mon Nov 27 13:24:09 2017
New Revision: 454948
URL: https://svnweb.freebsd.org/changeset/ports/454948

Log:
  sysutils/cbsd: update to 11.1.10
  
   - update to 11.1.10
   - fix misc portlint/stage-qa warnings:
      * properly order USE*
      * move pkg-deinstall to files/pkg-deinstall.in to be able
        to use %%LOCALBASE%% substitution
      * strip unstripped binaries using STRIP_CMD
  
  PR:		223881
  Submitted by:	maintainer

Added:
  head/sysutils/cbsd/files/pkg-deinstall.in
     - copied, changed from r454947, head/sysutils/cbsd/pkg-deinstall
Deleted:
  head/sysutils/cbsd/pkg-deinstall
Modified:
  head/sysutils/cbsd/Makefile
  head/sysutils/cbsd/distinfo

Modified: head/sysutils/cbsd/Makefile
==============================================================================
--- head/sysutils/cbsd/Makefile	Mon Nov 27 13:18:08 2017	(r454947)
+++ head/sysutils/cbsd/Makefile	Mon Nov 27 13:24:09 2017	(r454948)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	11.1.9
+DISTVERSION=	11.1.10
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole at olevole.ru
@@ -17,23 +17,29 @@ RUN_DEPENDS=	rsync:net/rsync \
 LIB_DEPENDS=	libssh2.so:security/libssh2 \
 		libsqlite3.so:databases/sqlite3
 
-USE_GITHUB=	yes
-
 USES=	libedit
+
+USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd
 
-SUB_FILES=	pkg-message
-PLIST_FILES+=	man/man8/cbsd.8.gz
+SUB_FILES=	pkg-message pkg-deinstall
 
 CBSD_HOME?=	${PREFIX}/cbsd
 
 USERS=	${PORTNAME}
 GROUPS=	${PORTNAME}
 
+BIN_FILES=	\
+		bin/cbsdsh/mknodes \
+		bin/cbsdsh/mksyntax
+
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
 	${CP} -a ${WRKSRC}/ ${STAGEDIR}${CBSD_HOME}
+.for i in ${BIN_FILES}
+	${STRIP_CMD} ${STAGEDIR}${CBSD_HOME}/${i}
+.endfor
 	${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
 

Modified: head/sysutils/cbsd/distinfo
==============================================================================
--- head/sysutils/cbsd/distinfo	Mon Nov 27 13:18:08 2017	(r454947)
+++ head/sysutils/cbsd/distinfo	Mon Nov 27 13:24:09 2017	(r454948)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509885163
-SHA256 (cbsd-cbsd-11.1.9_GH0.tar.gz) = 33793d90609113920e744943f6ba6f7a5a706d9a9a9d0d9ffcfdc801447f4241
-SIZE (cbsd-cbsd-11.1.9_GH0.tar.gz) = 5560634
+TIMESTAMP = 1511787846
+SHA256 (cbsd-cbsd-11.1.10_GH0.tar.gz) = fee97003d2aba68a17a78413051407ae66d211f1f6dc88f63541b248cac7e262
+SIZE (cbsd-cbsd-11.1.10_GH0.tar.gz) = 5564640

Copied and modified: head/sysutils/cbsd/files/pkg-deinstall.in (from r454947, head/sysutils/cbsd/pkg-deinstall)
==============================================================================
--- head/sysutils/cbsd/pkg-deinstall	Mon Nov 27 13:18:08 2017	(r454947, copy source)
+++ head/sysutils/cbsd/files/pkg-deinstall.in	Mon Nov 27 13:24:09 2017	(r454948)
@@ -17,7 +17,7 @@ POST-DEINSTALL)
     echo "  rcshutdown_timeout=\"900\""
     echo "  sshd_flags=\"-oPort=22222\""
     echo
-    echo "2) Remove /usr/local/etc/sudoers.d/cbsd_sudoers"
+    echo "2) Remove %%LOCALBASE%%/etc/sudoers.d/cbsd_sudoers"
     echo
   ;;
 esac