View | Details | Raw Unified | Return to bug 275140 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/p4/Makefile.inc (-3 / +3 lines)
Lines 1-7 Link Here
1 
P4VERSION?=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
 1 
P4VERSION?=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
2 
YEAR=		2022
 2 
YEAR=		2023
3 
MAJOR=		2
 3 
MAJOR=		1
4 
MINOR=		2407422
 4 
MINOR=		2442900
5 

          5
          

        

        

          6
          
JAM?=		${LOCALBASE}/bin/jam

          6
          
JAM?=		${LOCALBASE}/bin/jam

        

        

          7
          
OSVER?=		${OSREL:S/.//}

          7
          
OSVER?=		${OSREL:S/.//}

        



(-)b/devel/p4/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-3
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1679422608


              1
              
TIMESTAMP = 1684444969

            

            

              2
              
SHA256 (p4source-2407422.tgz) = 4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b


              2
              
SHA256 (p4source-2442900.tgz) = efdc59bf1443a6709998299cdff3a9cc52c5a6de790602ecb6ad70c6f509a496

            

            

              3
              
SIZE (p4source-2407422.tgz) = 6325949


              3
              
SIZE (p4source-2442900.tgz) = 6569147

            



(-)b/devel/p4/files/patch-Jamrules
      (-2 / +2 lines)




  

    
      
            Lines 1-4
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- Jamrules.orig	2023-01-19 09:37:52 UTC


              1
              
--- Jamrules.orig	2022-12-15 10:39:01 UTC

            

        

          2
          
+++ Jamrules

          2
          
+++ Jamrules

        

        

          3
          
@@ -673,12 +673,11 @@

          3
          
@@ -673,12 +673,11 @@

        

        

          4
          
 	# P4BIN is set to ../p4-bin (relative to P4)

          4
          
 	# P4BIN is set to ../p4-bin (relative to P4)

        

  

    
      
            Lines 14-20
          
      
      
        Link Here
      
    
  

        

          14
          
 		$(BUILD)

          14
          
 		$(BUILD)

        

        

          15
          
 		$(TYPE:L) ;

          15
          
 		$(TYPE:L) ;

        

        

          16
          
 

          16
          
 

        

          
            

              17
              
@@ -1224,11 +1223,6 @@


              17
              
@@ -1245,11 +1244,6 @@

            

        

          18
          
 		OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;

          18
          
 		OPTIM += -Wno-parentheses -Wno-switch -fwrapv ;

        

        

          19
          
 

          19
          
 

        

        

          20
          
 		_mflags = ;

          20
          
 		_mflags = ;

        



(-)b/devel/p4/files/patch-zlib_deflate.c
      (-3 / +3 lines)




  

    
      
            Lines 1-11
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- zlib/deflate.c.orig	2023-04-08 02:21:18 UTC


              1
              
--- zlib/deflate.c.orig	2022-11-09 18:15:37 UTC

            

        

          2
          
+++ zlib/deflate.c

          2
          
+++ zlib/deflate.c

        

          
            

              3
              
@@ -56,7 +56,7 @@


              3
              
@@ -58,7 +58,7 @@

            

        

          4
          
  * Perforce change. Disable neon speedup (for now)

          4
          
  * Perforce change. Disable neon speedup (for now)

        

        

          5
          
  * on Apple M1 builds.

          5
          
  * on Apple M1 builds.

        

        

          6
          
 */

          6
          
 */

        

        

          7
          
-#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__)

          7
          
-#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__)

        

          
            

              8
              
+#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) || defined( OS_FREEBSD ) ) && defined(__aarch64__)


              8
              
+#if ( defined( OS_DARWIN ) || defined( OS_MACOSX ) ) && defined(__aarch64__) || defined( OS_FREEBSD )

            

        

          9
          
 #undef __ARM_NEON__

          9
          
 #undef __ARM_NEON__

        

        

          10
          
 #undef __ARM_NEON

          10
          
 #undef __ARM_NEON

        

        

          11
          
 #endif

          11
          
 #endif

        



(-)b/devel/p4api/Makefile
      (-1 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

        

          1
          
PORTNAME=	p4api

          1
          
PORTNAME=	p4api

        

        

          2
          
PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}

          2
          
PORTVERSION=	${YEAR}.${MAJOR}.${MINOR}

        

            

              3
              
PORTREVISION=	1

              
              
            

        

          4
          
CATEGORIES=	devel

          3
          
CATEGORIES=	devel

        

        

          5
          
# Perforce does not version their distfiles when they patch.

          4
          
# Perforce does not version their distfiles when they patch.

        

        

          6
          
# This does not play well with FreeBSD's conventions.

          5
          
# This does not play well with FreeBSD's conventions.

        






  

  Return to bug 275140