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

Collapse All | Expand All

(-)b/x11/cde/Makefile (-1 / +7 lines)
Lines 40-45 MAKE_JOBS_UNSAFE=yes Link Here
40 
SUB_FILES=	pkg-message
 40 
SUB_FILES=	pkg-message
41 
LDFLAGS+=	-z muldefs #--allow-multiple-definition
 41 
LDFLAGS+=	-z muldefs #--allow-multiple-definition
42 

          42
          

        

            

              
              
              43
              
.include <bsd.port.pre.mk>

            

            

              44
              

            

            

              45
              
.if ${ARCH} == powerpc64le

            

            

              46
              
CPPFLAGS+=	-DPOWERPC64LE

            

            

              47
              
.endif

            

            

              48
              

            

        

          43
          
post-patch:

          49
          
post-patch:

        

        

          44
          
	@if [ -f /usr/include/iconv.h ]; then \

          50
          
	@if [ -f /usr/include/iconv.h ]; then \

        

        

          45
          
	    ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \

          51
          
	    ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \

        

  

    
      
            Lines 116-119
          do-install:
      
      
        Link Here
      
    
  

        

          116
          
post-install:

          122
          
post-install:

        

        

          117
          
	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \;

          123
          
	${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \;

        

        

          118
          

          124
          

        

          
            

              119
              
.include <bsd.port.mk>


              125
              
.include <bsd.port.post.mk>

            



(-)b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c
      (-5 / +10 lines)




  

    
      
            Lines 1-20
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2021-12-13 19:03:46 UTC


              1
              
--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig	2022-01-20 12:56:31.275926000 -0800

            

            

              2
              
+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c


              2
              
+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c	2022-01-20 12:59:47.461533000 -0800

            

            

              3
              
@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...)


              3
              
@@ -49,6 +49,9 @@

            

        

          4
          
 	va_list*		vp = va;

          4
          
 	va_list*		vp = va;

        

        

          5
          
 	Hash_region_f		region = 0;

          5
          
 	Hash_region_f		region = 0;

        

        

          6
          
 	void*			handle;

          6
          
 	void*			handle;

        

            

              
              
              7
              
+#ifdef POWERPC64LE

            

        

          7
          
+	va_listarg		tmpval;

          8
          
+	va_listarg		tmpval;

        

            

              
              
              9
              
+#endif

            

        

          8
          
 

          10
          
 

        

        

          9
          
 	va_start(ap, ref);

          11
          
 	va_start(ap, ref);

        

        

          10
          
 

          12
          
 

        

          
            

              11
              
@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...)


              13
              
@@ -151,7 +154,12 @@

            

        

          12
          
 				va_copy(*vp, ap);

          14
          
 				va_copy(*vp, ap);

        

        

          13
          
 				vp++;

          15
          
 				vp++;

        

        

          14
          
 			}

          16
          
 			}

        

          
            

              15
              
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));


              17
              
+#ifdef POWERPC64LE

            

        

          16
          
+			tmpval = va_listval(va_arg(ap, va_listarg));

          18
          
+			tmpval = va_listval(va_arg(ap, va_listarg));

        

        

          17
          
+			va_copy(ap, tmpval);

          19
          
+			va_copy(ap, tmpval);

        

            

              
              
              20
              
+#else

            

            

              21
              
 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));

            

            

              22
              
+#endif

            

        

          18
          
 			break;

          23
          
 			break;

        

        

          19
          
 		case 0:

          24
          
 		case 0:

        

        

          20
          
 			if (vp > va)

          25
          
 			if (vp > va)

        



(-)b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c
      (-5 / +10 lines)




  

    
      
            Lines 1-20
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2021-12-13 22:46:02 UTC


              1
              
--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig	2022-01-20 12:56:38.679529000 -0800

            

            

              2
              
+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c


              2
              
+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c	2022-01-20 13:02:26.179022000 -0800

            

            

              3
              
@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt,


              3
              
@@ -188,6 +188,9 @@

            

        

          4
          
 	char**		p_string;

          4
          
 	char**		p_string;

        

        

          5
          
 	char*		prv_f = 0;

          5
          
 	char*		prv_f = 0;

        

        

          6
          
 	va_list		prv_ap;

          6
          
 	va_list		prv_ap;

        

            

              
              
              7
              
+#ifdef POWERPC64LE

            

        

          7
          
+	va_listarg	tmpval;

          8
          
+	va_listarg	tmpval;

        

            

              
              
              9
              
+#endif

            

        

          8
          
 

          10
          
 

        

        

          9
          
 	va_start(ap, fmt);

          11
          
 	va_start(ap, fmt);

        

        

          10
          
 	if (!*s || *s == '\n')

          12
          
 	if (!*s || *s == '\n')

        

          
            

              11
              
@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt,


              13
              
@@ -233,7 +236,12 @@

            

        

          12
          
 			prv_f = f;

          14
          
 			prv_f = f;

        

        

          13
          
 			f = va_arg(ap, char*);

          15
          
 			f = va_arg(ap, char*);

        

        

          14
          
 			va_copy(prv_ap, ap);

          16
          
 			va_copy(prv_ap, ap);

        

          
            

              15
              
-			va_copy(ap, va_listval(va_arg(ap, va_listarg)));


              17
              
+#ifdef POWERPC64LE

            

        

          16
          
+			tmpval = va_listval(va_arg(ap, va_listarg));

          18
          
+			tmpval = va_listval(va_arg(ap, va_listarg));

        

        

          17
          
+			va_copy(ap, tmpval);

          19
          
+			va_copy(ap, tmpval);

        

            

              
              
              20
              
+#else

            

            

              21
              
 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));

            

            

              22
              
+#endif

            

        

          18
          
 			continue;

          23
          
 			continue;

        

        

          19
          
 		case 'c':

          24
          
 		case 'c':

        

        

          20
          
 			p_char = va_arg(ap, char*);

          25
          
 			p_char = va_arg(ap, char*);

        






  

  Return to bug 261359