Those patch files should just be removed. Bump not needed because it
doesn't change anything (__GNUC__ is defined on all our compilers).
On 2020/01/08 15:31, Kurt Mosiejczuk wrote:
> This fixes comms/mgetty+sendfax for architectures that use gcc to
> compile.
>
> The problem was the patches for g3/* added "static" by themselves
> before the "#ifdef _GNUC". Since there was "static inline" inside the
> ifdef, on gcc archs it would end up being "static static inline" which,
> unsurprisingly, didn't work.
>
> I fixed by making it so the patch basically moves the static outside the
> #ifdef
>
> ok?
>
> --Kurt
>
> Index: patches/patch-g3_g3cat_c
> ===================================================================
> RCS file: /cvs/ports/comms/mgetty+sendfax/patches/patch-g3_g3cat_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-g3_g3cat_c
> --- patches/patch-g3_g3cat_c 14 Oct 2019 21:05:07 -0000 1.2
> +++ patches/patch-g3_g3cat_c 8 Jan 2020 20:23:27 -0000
> @@ -2,35 +2,47 @@ $OpenBSD: patch-g3_g3cat_c,v 1.2 2019/10
> Index: g3/g3cat.c
> --- g3/g3cat.c.orig
> +++ g3/g3cat.c
> -@@ -60,6 +60,7 @@ static int padding = 0; /* default: no
> padding done
> +@@ -60,8 +60,9 @@ static int padding = 0; /* default: no
> padding done
> static int b_written = 0; /* bytes of a line already */
> /* written */
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -83,6 +84,7 @@ void putcode _P2( (code, len), int code, int len )
> + void putcode _P2( (code, len), int code, int len )
> + {
> +@@ -83,8 +84,9 @@ void putcode _P2( (code, len), int code, int len )
> }
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -114,6 +116,7 @@ void putwhitespan _P1( (l), int l )
> + void putwhitespan _P1( (l), int l )
> + {
> +@@ -114,8 +116,9 @@ void putwhitespan _P1( (l), int l )
> putcode( t_white[l].bit_code, t_white[l].bit_length );
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -145,6 +148,7 @@ void putblackspan _P1( (l), int l )
> + void putblackspan _P1( (l), int l )
> + {
> +@@ -145,8 +148,9 @@ void putblackspan _P1( (l), int l )
> putcode( t_black[l].bit_code, t_black[l].bit_length );
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> + void puteol _P0( void ) /* write byte-aligned EOL */
> + {
> Index: patches/patch-g3_pbm2g3_c
> ===================================================================
> RCS file: /cvs/ports/comms/mgetty+sendfax/patches/patch-g3_pbm2g3_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-g3_pbm2g3_c
> --- patches/patch-g3_pbm2g3_c 14 Oct 2019 21:05:07 -0000 1.2
> +++ patches/patch-g3_pbm2g3_c 8 Jan 2020 20:23:27 -0000
> @@ -2,35 +2,47 @@ $OpenBSD: patch-g3_pbm2g3_c,v 1.2 2019/1
> Index: g3/pbm2g3.c
> --- g3/pbm2g3.c.orig
> +++ g3/pbm2g3.c
> -@@ -39,6 +39,7 @@ static unsigned int out_hibit = 0;
> +@@ -39,8 +39,9 @@ static unsigned int out_hibit = 0;
>
> static int out_byte_tab[ 256 ]; /* for g3 byte reversal
> */
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -59,6 +60,7 @@ void putcode _P2( (code, len), int code, int len )
> + void putcode _P2( (code, len), int code, int len )
> + {
> +@@ -59,8 +60,9 @@ void putcode _P2( (code, len), int code, int len )
> }
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -68,6 +70,7 @@ void puteol _P0( void ) /* write
> byte-aligned EOL */
> + void puteol _P0( void ) /* write byte-aligned EOL */
> + {
> +@@ -68,8 +70,9 @@ void puteol _P0( void ) /* write
> byte-aligned EOL */
> putcode( 0x800, 12 );
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> -@@ -99,6 +102,7 @@ void putwhitespan _P1( (l), int l )
> + void putwhitespan _P1( (l), int l )
> + {
> +@@ -99,8 +102,9 @@ void putwhitespan _P1( (l), int l )
> putcode( t_white[l].bit_code, t_white[l].bit_length );
> }
>
> +static
> #ifdef __GNUC__
> - static inline
> +-static inline
> ++inline
> #endif
> + void putblackspan _P1( (l), int l )
> + {
>
