Page MenuHomeFreeBSD
Files F167064411

D17352.id48562.diff
No OneTemporary
Actions

D17352.id48562.diff
View Options

Index: sysutils/cbsd/Makefile
===================================================================
--- sysutils/cbsd/Makefile
+++ sysutils/cbsd/Makefile
@@ -10,10 +10,6 @@
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 \
Index: sysutils/cbsd/files/patch-Makefile
===================================================================
--- /dev/null
+++ sysutils/cbsd/files/patch-Makefile
@@ -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
Index: sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
===================================================================
--- /dev/null
+++ sysutils/cbsd/files/patch-bin_cbsdsh_Makefile
@@ -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
Index: sysutils/cbsd/files/patch-sudoexec_initenv
===================================================================
--- /dev/null
+++ sysutils/cbsd/files/patch-sudoexec_initenv
@@ -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

File Metadata

Mime Type
text/plain
Expires
Wed, Aug 19, 8:27 PM (12 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36948363
Default Alt Text
D17352.id48562.diff (3 KB)

Event Timeline