From owner-freebsd-ports  Thu Apr 24 14:22:36 1997
Return-Path: <owner-ports>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id OAA02161
          for ports-outgoing; Thu, 24 Apr 1997 14:22:36 -0700 (PDT)
Received: from vader.cs.berkeley.edu (vader.CS.Berkeley.EDU [128.32.38.234])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id OAA02154
          for <ports@freebsd.org>; Thu, 24 Apr 1997 14:22:31 -0700 (PDT)
Received: (from asami@localhost) by vader.cs.berkeley.edu (8.8.5/8.7.3) id OAA04912; Thu, 24 Apr 1997 14:22:25 -0700 (PDT)
Date: Thu, 24 Apr 1997 14:22:25 -0700 (PDT)
Message-Id: <199704242122.OAA04912@vader.cs.berkeley.edu>
To: ache@nagual.ru
CC: ports@freebsd.org
Subject: new patch-ad for fspclient, please review
From: asami@vader.cs.berkeley.edu (Satoshi Asami)
Sender: owner-ports@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

Satoshi
-------
--- ./bsd/ls.c.org	Wed May  5 23:02:53 1993
+++ ./bsd/ls.c	Thu Apr 24 14:04:44 1997
@@ -96,7 +96,9 @@
 #ifndef ANSI_PROTOTYPES
 	extern int getopt();
 #else /* ANSI_PROTOTYPES */
+#if !defined(__FreeBSD__)
 	extern int getopt(int argc, char **argv, char *opts);
+#endif /* __FreeBSD__ */
 #endif /* ANSI_PROTOTYPES */
 	extern int optind, opterr;
 	int ch, exit_after_options;
--- ./bsd/getopt.c.org	Sun May  2 19:56:29 1993
+++ ./bsd/getopt.c	Thu Apr 24 14:10:51 1997
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(hpux) && !defined(sun)
+#if !defined(hpux) && !defined(sun) && !defined(__FreeBSD__)
 
 /* guarantee that we have a `working' getopt() function */
 #if defined(LIBC_SCCS) && !defined(lint)
--- ./client.0.0-h+/main.c.org	Wed May  5 22:22:34 1993
+++ ./client.0.0-h+/main.c	Thu Apr 24 14:14:54 1997
@@ -414,7 +414,9 @@
 #ifndef ANSI_PROTOTYPES
     extern int getopt();
 #else /* ANSI_PROTOTYPES */
+#if !defined(__FreeBSD__)
     extern int getopt(int argc, char **argv, char *optstring);
+#endif /* __FreeBSD__ */
 #endif /* ANSI_PROTOTYPES */
     extern char *optarg;
     extern int optind, opterr;