View | Details | Raw Unified | Return to bug 231789
Collapse All | Expand All

(-)Makefile (-4 lines)
Lines 10-19 Link Here
10 
LICENSE=	BSD2CLAUSE
 10 
LICENSE=	BSD2CLAUSE
11 
LICENSE_FILE=	${WRKSRC}/LICENSE
 11 
LICENSE_FILE=	${WRKSRC}/LICENSE
12 

          12
          

        

            

              13
              
BROKEN_mips=		fails to link: cannot find -lc++

              
              
            

            

              14
              
BROKEN_mips64=		fails to link: cannot find -lc++

            

            

              15
              
BROKEN_powerpc64=	fails to link: cannot find -lc++

            

            

              16
              

            

        

          17
          
RUN_DEPENDS=	rsync:net/rsync \

          13
          
RUN_DEPENDS=	rsync:net/rsync \

        

        

          18
          
		sudo:security/sudo \

          14
          
		sudo:security/sudo \

        

        

          19
          
		sqlite3:databases/sqlite3 \

          15
          
		sqlite3:databases/sqlite3 \

        



(-)files/patch-Makefile
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- Makefile.orig	2018-09-28 16:15:34 UTC

            

            

              2
              
+++ Makefile

            

            

              3
              
@@ -76,7 +76,7 @@ cbsd: pkg-config-check

            

            

              4
              
 	#${CC} misc/src/sqlcli.c -static -pthread -lsqlite3 -lm -L/usr/local/lib -I/usr/local/include -o misc/sqlcli && ${STRIP} misc/sqlcli

            

            

              5
              
 	# ICU?

            

            

              6
              
 	#${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

            

            

              7
              
-	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -lc++ -o misc/sqlcli && ${STRIP} misc/sqlcli

            

            

              8
              
+	${CC} misc/src/sqlcli.c `pkg-config sqlite3 --cflags --libs` -lm -o misc/sqlcli && ${STRIP} misc/sqlcli

            

            

              9
              
 	${CC} misc/src/cbsdlogtail.c -o misc/cbsdlogtail && ${STRIP} misc/cbsdlogtail

            

            

              10
              
 	${CC} misc/src/pwcrypt.c -lcrypt -o misc/pwcrypt && ${STRIP} misc/pwcrypt

            

            

              11
              
 	${CC} misc/src/chk_arp_byip.c -o misc/chk_arp_byip && ${STRIP} misc/chk_arp_byip

            



(-)files/patch-bin_cbsdsh_Makefile
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- bin/cbsdsh/Makefile.orig	2018-09-28 16:10:13 UTC

            

            

              2
              
+++ bin/cbsdsh/Makefile

            

            

              3
              
@@ -21,7 +21,7 @@ NOMAN=		yes

            

            

              4
              
 

            

            

              5
              
 DPADD= ${LIBEDIT} ${LIBTERMCAP}

            

            

              6
              
 #LDADD= -ledit -ltermcap -lsqlite3 -lm -pthread -ljail

            

            

              7
              
-LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm -lc++

            

            

              8
              
+LDADD= -ledit -ltermcap -lm -pthread -ljail `pkg-config sqlite3 --libs` -lm

            

            

              9
              
 

            

            

              10
              
 #CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/lib -L/usr/local/lib

            

            

              11
              
 CFLAGS+=-DSHELL -I. -I${.CURDIR} -DCBSD -I/usr/local/include -L/usr/local/lib

            



(-)files/patch-sudoexec_initenv
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- sudoexec/initenv.orig	2018-09-28 16:11:43 UTC

            

            

              2
              
+++ sudoexec/initenv

            

            

              3
              
@@ -264,7 +264,7 @@ phase2()

            

            

              4
              
 			echo "pkg-config must be present on the system to build CBSD from the source. Please install it first: pkg install pkgconf";

            

            

              5
              
 			exit 1

            

            

              6
              
 		fi

            

            

              7
              
-		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -lc++ -o ${distdir}/misc/sqlcli

            

            

              8
              
+		${CC_CMD} ${distdir}/misc/src/sqlcli.c $( pkg-config sqlite3 --cflags --libs ) -lm -o ${distdir}/misc/sqlcli

            

            

              9
              
 	fi

            

            

              10
              
 	installne "-s -o ${cbsduser} -g ${cbsduser} -m 500" ${distdir}/misc/sqlcli ${miscdir}/sqlcli

            

            

              11
              
 	[ -f ${distdir}/misc/sqlcli ] && /bin/rm -f ${distdir}/misc/sqlcli

            






  

  Return to bug 231789