diff options
| author | Veniamin Gvozdikov <vg@FreeBSD.org> | 2015-08-15 12:22:55 +0000 |
|---|---|---|
| committer | Veniamin Gvozdikov <vg@FreeBSD.org> | 2015-08-15 12:22:55 +0000 |
| commit | 0168a5ee42ae7d3f636b8f68af620bc8753b7f94 (patch) | |
| tree | ff6e8bb7b2ccd4f604eafe79ba4def7b6529dc8a /sysutils | |
| parent | 07cf05be918a77846dc710b8014d8be110b611e7 (diff) | |
| download | ports-0168a5ee42ae7d3f636b8f68af620bc8753b7f94.tar.gz ports-0168a5ee42ae7d3f636b8f68af620bc8753b7f94.zip | |
Notes
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/cbsd/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/cbsd/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/cbsd/files/patch-bin-cbsdsh-cbsd_fwatch.c | 39 |
3 files changed, 8 insertions, 43 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index be45659b7a6e..402fd55b2cee 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 10.1.4 +PORTVERSION= 10.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -20,6 +19,7 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 \ USE_GITHUB= yes GH_ACCOUNT= olevole +USES= libedit USE_RC_SUBR= cbsdd cbsdrsyncd SUB_FILES= pkg-message @@ -36,6 +36,10 @@ GROUPS= ${PORTNAME} IGNORE= does not support FreeBSD versions < 10.0 .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 +LIB_DEPENDS+= libxo.so:${PORTSDIR}/devel/libxo +.endif + do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index 4d3b90e5bde6..962ba866d15c 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,2 +1,2 @@ -SHA256 (olevole-cbsd-v10.1.4_GH0.tar.gz) = 5f43b415ee0d6ff805e0af83b2f1c1fb5cc84573f06f5900ee3721fe552ef3ec -SIZE (olevole-cbsd-v10.1.4_GH0.tar.gz) = 486257 +SHA256 (olevole-cbsd-v10.2.0_GH0.tar.gz) = dc545eec5e999d9fd5dc8753a9c6f57c76cc26ff1e2e6d7b9f0db7b56bbadeb7 +SIZE (olevole-cbsd-v10.2.0_GH0.tar.gz) = 519467 diff --git a/sysutils/cbsd/files/patch-bin-cbsdsh-cbsd_fwatch.c b/sysutils/cbsd/files/patch-bin-cbsdsh-cbsd_fwatch.c deleted file mode 100644 index 5a6bd0a03846..000000000000 --- a/sysutils/cbsd/files/patch-bin-cbsdsh-cbsd_fwatch.c +++ /dev/null @@ -1,39 +0,0 @@ ---- bin/cbsdsh/cbsd_fwatch.c.orig 2015-02-05 17:33:24.019144000 +0300 -+++ bin/cbsdsh/cbsd_fwatch.c 2015-02-05 16:57:53.000000000 +0300 -@@ -95,7 +95,6 @@ - return 1; - } - -- - if ((fd = open(watchfile, O_RDONLY)) == -1) { - out2fmt_flush("Cannot open: %s\n", watchfile); - ckfree(watchfile); -@@ -117,6 +116,7 @@ - out2fmt_flush("kevent\n"); - close(fd); - ckfree(watchfile); -+ close(kq); - return 1; - } - -@@ -134,9 +134,12 @@ - out2fmt_flush("kevent\n"); - close(fd); - ckfree(watchfile); -+ close(kq); - return 1; - } - -+ close(kq); -+ - if (nev != 0) { - if (ev.fflags & NOTE_DELETE) { - out2fmt_flush("deleted\n"); -@@ -173,5 +176,7 @@ - ev.fflags &= ~NOTE_REVOKE; - } - } -+ -+ ckfree(watchfile); - return 0; - } |