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

(-)cbsd/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1 
# $FreeBSD: head/sysutils/cbsd/Makefile 481034 2018-10-01 14:22:37Z 0mp $
 1 
# $FreeBSD: head/sysutils/cbsd/Makefile 481034 2018-10-01 14:22:37Z 0mp $
2 

          2
          

        

        

          3
          
PORTNAME=	cbsd

          3
          
PORTNAME=	cbsd

        

          
            

              4
              
DISTVERSION=	11.2.1


              4
              
DISTVERSION=	12.0.0

            

        

          5
          
CATEGORIES=	sysutils

          5
          
CATEGORIES=	sysutils

        

        

          6
          

          6
          

        

        

          7
          
MAINTAINER=	olevole@olevole.ru

          7
          
MAINTAINER=	olevole@olevole.ru

        



(-)cbsd/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-3
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1532783608


              1
              
TIMESTAMP = 1540505309

            

            

              2
              
SHA256 (cbsd-cbsd-11.2.1_GH0.tar.gz) = 6b3db975624fbd007bd08df8dd339048f7e7767b77e46eed910fcfbc7a68af61


              2
              
SHA256 (cbsd-cbsd-12.0.0_GH0.tar.gz) = 61c784260099ff15a7671493f647c33c4dde38c81e56a8c47fae6040dfc26f0c

            

            

              3
              
SIZE (cbsd-cbsd-11.2.1_GH0.tar.gz) = 5600235


              3
              
SIZE (cbsd-cbsd-12.0.0_GH0.tar.gz) = 5743751

            



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




  

    
      
            Lines 1-11
          
      
      
        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

            



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




  

    
      
            Lines 1-11
          
      
      
        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

            



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




  

    
      
            Lines 1-11
          
      
      
        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 232508