Index: head/sysutils/cbsd/Makefile =================================================================== --- head/sysutils/cbsd/Makefile (revision 483091) +++ head/sysutils/cbsd/Makefile (revision 483092) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= cbsd -DISTVERSION= 11.2.1 +DISTVERSION= 12.0.0 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru COMMENT= Yet another FreeBSD Jail and Bhyve Management Utility LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rsync:net/rsync \ sudo:security/sudo \ sqlite3:databases/sqlite3 \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss LIB_DEPENDS= libssh2.so:security/libssh2 \ libsqlite3.so:databases/sqlite3 USES= libedit pkgconfig USE_GITHUB= yes USE_RC_SUBR= cbsdd cbsdrsyncd 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 post-install: ${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ; @${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/bsdconfig @${LN} -sf ${CBSD_HOME}/share/bsdconfig/cbsd ${STAGEDIR}${PREFIX}/libexec/bsdconfig/cbsd .include Index: head/sysutils/cbsd/distinfo =================================================================== --- head/sysutils/cbsd/distinfo (revision 483091) +++ head/sysutils/cbsd/distinfo (revision 483092) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532783608 -SHA256 (cbsd-cbsd-11.2.1_GH0.tar.gz) = 6b3db975624fbd007bd08df8dd339048f7e7767b77e46eed910fcfbc7a68af61 -SIZE (cbsd-cbsd-11.2.1_GH0.tar.gz) = 5600235 +TIMESTAMP = 1540505309 +SHA256 (cbsd-cbsd-12.0.0_GH0.tar.gz) = 61c784260099ff15a7671493f647c33c4dde38c81e56a8c47fae6040dfc26f0c +SIZE (cbsd-cbsd-12.0.0_GH0.tar.gz) = 5743751 Index: head/sysutils/cbsd/files/patch-sudoexec_initenv =================================================================== --- head/sysutils/cbsd/files/patch-sudoexec_initenv (revision 483091) +++ head/sysutils/cbsd/files/patch-sudoexec_initenv (nonexistent) @@ -1,11 +0,0 @@ ---- sudoexec/initenv.orig 2018-09-28 16:11:43 UTC -+++ sudoexec/initenv -@@ -264,7 +264,7 @@ phase2() - echo "pkg-config must be present on the system to build CBSD from the source. Please install it first: pkg install pkgconf"; - exit 1 - fi -- ${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -lc++ -o ${distdir}/misc/sqlcli -+ ${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -o ${distdir}/misc/sqlcli - fi - installne "-s -o ${cbsduser} -g ${cbsduser} -m 500" ${distdir}/misc/sqlcli ${miscdir}/sqlcli - [ -f ${distdir}/misc/sqlcli ] && /bin/rm -f ${distdir}/misc/sqlcli Property changes on: head/sysutils/cbsd/files/patch-sudoexec_initenv ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cbsd/files/patch-Makefile =================================================================== --- head/sysutils/cbsd/files/patch-Makefile (revision 483091) +++ head/sysutils/cbsd/files/patch-Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- Makefile.orig 2018-09-28 16:15:34 UTC -+++ Makefile -@@ -76,7 +76,7 @@ cbsd: pkg-config-check - #${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli - # ICU? - #${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lpthread -licui18n -licuuc -licudata -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli -- ${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli -+ ${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -o misc/sqlcli && ${STRIP} misc/sqlcli - ${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail - ${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt - ${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip Property changes on: head/sysutils/cbsd/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile =================================================================== --- head/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile (revision 483091) +++ head/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile (nonexistent) @@ -1,11 +0,0 @@ ---- bin/cbsdsh/Makefile.orig 2018-09-28 16:10:13 UTC -+++ bin/cbsdsh/Makefile -@@ -21,7 +21,7 @@ NOMAN= yes - - DPADD= ${LIBEDIT} ${LIBTERMCAP} - #LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail --LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm -lc++ -+LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm - - #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib - CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib Property changes on: head/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property