diff -ruN cbsd.bak/Makefile cbsd/Makefile --- cbsd.bak/Makefile 2017-11-26 21:19:16.986427000 +0000 +++ cbsd/Makefile 2017-11-26 21:19:42.091156000 +0000 @@ -1,7 +1,7 @@ # $FreeBSD: head/sysutils/cbsd/Makefile 453546 2017-11-05 13:57:52Z novel $ PORTNAME= cbsd -DISTVERSION= 11.1.9 +DISTVERSION= 11.1.10 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -17,23 +17,31 @@ 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 \ + bin/cbsdsftp6 \ + misc/pwcrypt + 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 -ruN cbsd.bak/distinfo cbsd/distinfo --- cbsd.bak/distinfo 2017-11-26 21:19:16.884897000 +0000 +++ cbsd/distinfo 2017-11-26 21:20:49.751907000 +0000 @@ -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 = 1511731249 +SHA256 (cbsd-cbsd-11.1.10_GH0.tar.gz) = fee97003d2aba68a17a78413051407ae66d211f1f6dc88f63541b248cac7e262 +SIZE (cbsd-cbsd-11.1.10_GH0.tar.gz) = 5564640 diff -ruN cbsd.bak/files/pkg-deinstall.in cbsd/files/pkg-deinstall.in --- cbsd.bak/files/pkg-deinstall.in 1970-01-01 00:00:00.000000000 +0000 +++ cbsd/files/pkg-deinstall.in 2017-11-26 21:19:16.858851000 +0000 @@ -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 /usr/local/etc/sudoers.d/cbsd_sudoers" + echo + ;; +esac diff -ruN cbsd.bak/pkg-deinstall cbsd/pkg-deinstall --- cbsd.bak/pkg-deinstall 2017-11-26 21:19:16.858851000 +0000 +++ cbsd/pkg-deinstall 1970-01-01 00:00:00.000000000 +0000 @@ -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