summaryrefslogtreecommitdiff
path: root/sysutils/cbsd/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cbsd/files')
-rw-r--r--sysutils/cbsd/files/patch-Makefile11
-rw-r--r--sysutils/cbsd/files/patch-bin_cbsdsh_Makefile11
-rw-r--r--sysutils/cbsd/files/patch-sudoexec_initenv11
3 files changed, 0 insertions, 33 deletions
diff --git a/sysutils/cbsd/files/patch-Makefile b/sysutils/cbsd/files/patch-Makefile
deleted file mode 100644
index 4c3e7a129e18..000000000000
--- a/sysutils/cbsd/files/patch-Makefile
+++ /dev/null
@@ -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
diff --git a/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile b/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
deleted file mode 100644
index cce045701e5b..000000000000
--- a/sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
+++ /dev/null
@@ -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
diff --git a/sysutils/cbsd/files/patch-sudoexec_initenv b/sysutils/cbsd/files/patch-sudoexec_initenv
deleted file mode 100644
index b637af3a1aa9..000000000000
--- a/sysutils/cbsd/files/patch-sudoexec_initenv
+++ /dev/null
@@ -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