Date: 27 Jan 2002 22:52:30 -0000
Message-ID: <20020127225230.24506.qmail@ingwaz.pair.com>
To: gopher@complete.org
From: Robert Hahn <rhahn@tenletters.com>
Subject: [gopher] Re: gopher patches for FreeBSD
Sender: gopher-bounce@complete.org
Errors-to: gopher-bounce@complete.org
Precedence: bulk
Reply-to: gopher@complete.org

Hey, guys

Given that Mac OS X is ported from FreeBSD (just a different kernel), I have a feeling that incorporating Kris' patch might do the trick - or get me a lot closer to a working install.

However, I don't yet know how to take patches like these and roll them in.  Can someone provide me with steps (or a link to steps) to take to patch the source I downloaded?  Thanks a bunch.

John Goerzen: I will keep you posted on how well this goes - you might not need to do anything with those files I sent you. :)

thanks, all,
Robert Hahn


Kris Kennaway wrote:
> Hi there,
> 
> I had to apply the following patches to make gopher 3.0.2 compile on FreeBSD.
> 
> Kris
> 
> find . -name '*.[ch]' | xargs perl -pi -e 's,<malloc.h>,<stdlib.h>,'
> 
> --- ./object/util.h.orig	Fri Aug 18 17:28:56 2000
> +++ ./object/util.h	Sat Jan 26 02:16:25 2002
> @@ -57,7 +57,6 @@
>  void   Fromhexstr(char * , char *);
>  void   Tohexstr(char *input, char *output);
>  void   Hexall(char *input, char *output);
> -char   *strcasestr(char *inputline, char *match);
>  char   *skip_whitespace(char *);
>  
>  /* 
> 
> --- ./object/util.c.orig	Tue Dec 19 17:19:20 2000
> +++ ./object/util.c	Sat Jan 26 02:16:51 2002
> @@ -584,28 +584,6 @@
>  
>  
>  /*
> - * String insensitive strstr
> - */
> -
> -char *
> -strcasestr(char *inputline, char *match)
> -{
> -     int matchlen=0;
> -     int i, inlen;
> -
> -     matchlen = strlen(match);
> -     inlen = strlen(inputline);
> -
> -     for(i=0; i<inlen; i++) {
> -	  if (strncasecmp(inputline+i, match, matchlen)==0)
> -	       return(inputline+i);
> -     }
> -
> -     return(NULL);
> -}
> -
> -
> -/*
>   * Iterate over a string, return a pointer to the next character
>   * that isn't whitespace.
>   */
> 
> --- Makefile.in.orig	Sat Jan 26 03:10:15 2002
> +++ Makefile.in	Sat Jan 26 03:10:23 2002
> @@ -140,7 +140,7 @@
>  objects: object/libgopher.a
>  
>  gopherd/gopherd: object/libgopher.a $(srcdir)/gopherd/*.c $(srcdir)/gopherd/*.h $(srcdir)/conf.h
> -	(cd gopherd; $(MAKE) $(MFLAGS))
> +	(cd gopherd; $(MAKE) $(MFLAGS) all)
>  
>  # gopher is dependant on conf.h - (as are other things)
>  gopher/gopher: object/libgopher.a conf.h $(srcdir)/gopher/*c $(srcdir)/gopher/*h
> 
> -- Attached file included as plaintext by Listar --
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.0.6 (FreeBSD)
> Comment: For info see http://www.gnupg.org
> 
> iD8DBQE8UpVDWry0BWjoQKURApz7AKDbqf6yoPfLVzKQF/u2UqgltwvxTwCeOjJw
> ZtQptJbv89VLyzHASh8eOZo=
> =fdtb
> -----END PGP SIGNATURE-----
> 
> 
>