From 871a6a8fdf79cf2f727f3ddd84dbcf62d53d4b1e Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <novel@FreeBSD.org>
Date: Mon, 27 Nov 2017 13:24:09 +0000
Subject: 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
---
 sysutils/cbsd/Makefile               | 16 +++++++++++-----
 sysutils/cbsd/distinfo               |  6 +++---
 sysutils/cbsd/files/pkg-deinstall.in | 23 +++++++++++++++++++++++
 sysutils/cbsd/pkg-deinstall          | 23 -----------------------
 4 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 sysutils/cbsd/files/pkg-deinstall.in
 delete mode 100644 sysutils/cbsd/pkg-deinstall

(limited to 'sysutils/cbsd')

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 6ae2825b13ca..6838cc427946 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-DISTVERSION=	11.1.9
+DISTVERSION=	11.1.10
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole@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
 
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index fa35a981e887..63659fcff88f 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -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
diff --git a/sysutils/cbsd/files/pkg-deinstall.in b/sysutils/cbsd/files/pkg-deinstall.in
new file mode 100644
index 000000000000..4bf3facc595b
--- /dev/null
+++ b/sysutils/cbsd/files/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+case $2 in
+POST-DEINSTALL)
+    echo
+    echo "The cbsd package has been deleted."
+    echo
+    echo "If you are *not* upgrading this package, you may want to"
+    echo "remove the following to complete the deinstallation process:"
+    echo
+    echo "1) Records in /etc/rc.conf"
+    echo
+    echo "  cbsdrsyncd_enable=\"YES\""
+    echo "  cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\""
+    echo "  cbsdd_enable=\"YES\""
+    echo "  devfs_load_rulesets=\"YES\""
+    echo "  cbsd_workdir=\"\$workdir\""
+    echo "  rcshutdown_timeout=\"900\""
+    echo "  sshd_flags=\"-oPort=22222\""
+    echo
+    echo "2) Remove %%LOCALBASE%%/etc/sudoers.d/cbsd_sudoers"
+    echo
+  ;;
+esac
diff --git a/sysutils/cbsd/pkg-deinstall b/sysutils/cbsd/pkg-deinstall
deleted file mode 100644
index 5ec593786833..000000000000
--- a/sysutils/cbsd/pkg-deinstall
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-case $2 in
-POST-DEINSTALL)
-    echo
-    echo "The cbsd package has been deleted."
-    echo
-    echo "If you are *not* upgrading this package, you may want to"
-    echo "remove the following to complete the deinstallation process:"
-    echo
-    echo "1) Records in /etc/rc.conf"
-    echo
-    echo "  cbsdrsyncd_enable=\"YES\""
-    echo "  cbsdrsyncd_flags=\"--config=\$workdir/etc/rsyncd.conf\""
-    echo "  cbsdd_enable=\"YES\""
-    echo "  devfs_load_rulesets=\"YES\""
-    echo "  cbsd_workdir=\"\$workdir\""
-    echo "  rcshutdown_timeout=\"900\""
-    echo "  sshd_flags=\"-oPort=22222\""
-    echo
-    echo "2) Remove /usr/local/etc/sudoers.d/cbsd_sudoers"
-    echo
-  ;;
-esac
-- 
cgit v1.2.3