From owner-svn-ports-head@freebsd.org Mon Nov 27 13:24:10 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7DB3E512FB; Mon, 27 Nov 2017 13:24:10 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EF5C70FAE; Mon, 27 Nov 2017 13:24:10 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARDO9mP051500; Mon, 27 Nov 2017 13:24:09 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARDO91D051496; Mon, 27 Nov 2017 13:24:09 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201711271324.vARDO91D051496@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Mon, 27 Nov 2017 13:24:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454948 - in head/sysutils/cbsd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: novel X-SVN-Commit-Paths: in head/sysutils/cbsd: . files X-SVN-Commit-Revision: 454948 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2017 13:24:10 -0000 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@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