summaryrefslogtreecommitdiff
path: root/sysutils/cbsd
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2020-11-20 15:26:34 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2020-11-20 15:26:34 +0000
commitd3881b9a5699efc1f9d60ac72dc862842d983d91 (patch)
tree9b04fdc1ee54806cde3e25a829589b5caaa9cf9a /sysutils/cbsd
parent- Update asterisk-chan_sccp to 4.3.2-eta (diff)
Update to 12.2.3
Changes: https://github.com/cbsd/cbsd/releases/tag/v12.2.3
Notes
Notes: svn path=/head/; revision=555767
Diffstat (limited to 'sysutils/cbsd')
-rw-r--r--sysutils/cbsd/Makefile7
-rw-r--r--sysutils/cbsd/distinfo6
-rw-r--r--sysutils/cbsd/files/extra-patch-Makefile10
-rw-r--r--sysutils/cbsd/files/extra-patch-sudoexec_initenv10
4 files changed, 4 insertions, 29 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 0e329c2fe8e4..507a767f4eac 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cbsd
-DISTVERSION= 12.2.2
+DISTVERSION= 12.2.3
CATEGORIES= sysutils
MAINTAINER= olevole@olevole.ru
@@ -34,11 +34,6 @@ BIN_FILES= \
.include <bsd.port.options.mk>
-.if ${ARCH} != amd64 && ${ARCH} != i386
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile \
- ${FILESDIR}/extra-patch-sudoexec_initenv
-.endif
-
do-install:
@${ECHO} "Installing in ${CBSD_HOME}"
${MKDIR} ${STAGEDIR}${CBSD_HOME}
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index a2fa02c112a5..c8ce60f1917a 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605547100
-SHA256 (cbsd-cbsd-12.2.2_GH0.tar.gz) = 9032a833297b4cd35d2c94c8c60039ee2eceef79f07e0b64a580af5fbee8a23d
-SIZE (cbsd-cbsd-12.2.2_GH0.tar.gz) = 5902135
+TIMESTAMP = 1605882594
+SHA256 (cbsd-cbsd-12.2.3_GH0.tar.gz) = fe39a6428abc10992c7623a283ecd0e9871cc77ae6d7623b0e1d505122ff1abe
+SIZE (cbsd-cbsd-12.2.3_GH0.tar.gz) = 5901154
diff --git a/sysutils/cbsd/files/extra-patch-Makefile b/sysutils/cbsd/files/extra-patch-Makefile
deleted file mode 100644
index e29fe9c25376..000000000000
--- a/sysutils/cbsd/files/extra-patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig 2020-09-22 20:57:26 UTC
-+++ Makefile
-@@ -96,7 +96,6 @@ cbsd: pkg-config-check
- ${CC} misc/src/fmagic.c -lmagic -o misc/fmagic && ${STRIP} misc/fmagic
- ${CC} misc/src/conv2human.c -I/usr/local/include -I/usr/local/include/libelf -L/usr/local/lib -lelf -o misc/conv2human -lutil && ${STRIP} misc/conv2human
- ${CC} misc/src/cbsd_fwatch.c -o misc/cbsd_fwatch && ${STRIP} misc/cbsd_fwatch
-- ${CC} misc/src/popcnttest.c -o misc/popcnttest -msse4.2 && ${STRIP} misc/popcnttest > /dev/null 2>&1 || /usr/bin/true
- ${CC} misc/src/cbsd_dot.c -o misc/cbsd_dot && ${STRIP} misc/cbsd_dot
- ${CC} misc/src/daemon.c -lutil -o misc/daemon && ${STRIP} misc/daemon
- ${CC} misc/src/resolv.c -o misc/resolv && ${STRIP} misc/resolv
diff --git a/sysutils/cbsd/files/extra-patch-sudoexec_initenv b/sysutils/cbsd/files/extra-patch-sudoexec_initenv
deleted file mode 100644
index 99b7a08f7810..000000000000
--- a/sysutils/cbsd/files/extra-patch-sudoexec_initenv
+++ /dev/null
@@ -1,10 +0,0 @@
---- sudoexec/initenv.orig 2020-09-22 20:57:34 UTC
-+++ sudoexec/initenv
-@@ -331,7 +331,6 @@ phase2()
- [ ! -f "${distdir}/misc/conv2human" ] && ${CC_CMD} -I/usr/local/include -I/usr/local/include/libelf -L/usr/local/lib ${distdir}/misc/src/conv2human.c -lelf -o ${distdir}/misc/conv2human -lutil
- [ ! -f "${distdir}/misc/cbsd_fwatch" ] && ${CC_CMD} ${distdir}/misc/src/cbsd_fwatch.c -o ${distdir}/misc/cbsd_fwatch
- [ ! -f "${distdir}/misc/cbsd_dot" ] && ${CC_CMD} ${distdir}/misc/src/cbsd_dot.c -o ${distdir}/misc/cbsd_dot
-- [ ! -f "${distdir}/misc/popcnttest" ] && ${CC_CMD} ${distdir}/misc/src/popcnttest.c -o ${distdir}/misc/popcnttest -msse4.2 > /dev/null 2>&1 || /usr/bin/true
- [ ! -f "${distdir}/misc/chk_arp_byip" ] && ${CC_CMD} ${distdir}/misc/src/chk_arp_byip.c -o ${distdir}/misc/chk_arp_byip
- [ ! -f "${distdir}/misc/cbsdtee" ] && ${CC_CMD} ${distdir}/misc/src/cbsdtee.c -o ${distdir}/misc/cbsdtee
- [ ! -f "${distdir}/misc/daemon" ] && ${CC_CMD} ${distdir}/misc/src/daemon.c -lutil -o ${distdir}/misc/daemon