Index: head/sysutils/cbsd/Makefile =================================================================== --- head/sysutils/cbsd/Makefile (revision 481033) +++ head/sysutils/cbsd/Makefile (revision 481034) @@ -1,56 +1,52 @@ # $FreeBSD$ PORTNAME= cbsd DISTVERSION= 11.2.1 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru COMMENT= Yet another FreeBSD Jail and Bhyve Management Utility LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_mips= fails to link: cannot find -lc++ -BROKEN_mips64= fails to link: cannot find -lc++ -BROKEN_powerpc64= fails to link: cannot find -lc++ - 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/files/patch-Makefile =================================================================== --- head/sysutils/cbsd/files/patch-Makefile (nonexistent) +++ head/sysutils/cbsd/files/patch-Makefile (revision 481034) @@ -0,0 +1,11 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +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 (nonexistent) +++ head/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile (revision 481034) @@ -0,0 +1,11 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/cbsd/files/patch-sudoexec_initenv =================================================================== --- head/sysutils/cbsd/files/patch-sudoexec_initenv (nonexistent) +++ head/sysutils/cbsd/files/patch-sudoexec_initenv (revision 481034) @@ -0,0 +1,11 @@ +--- 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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property