ports/58582: port: security/slush unbreak -current build

[elvis at sslab.cs.ccu.edu.tw]

>Number:         58582
>Category:       ports
>Synopsis:       port: security/slush unbreak -current build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 26 14:50:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     elvis
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
System Software Lab. CSIE CCU Taiwan
>Environment:
System: FreeBSD sslab.cs.ccu.edu.tw 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #10: Sat Oct 4 14:23:21 CST 2003 root at sslab.cs.ccu.edu.tw:/ftp/obj/usr/src/sys/SSLAB i386

>Description:
	Unbreak the build of security/slush
	The Original patch takes the getopt.h which 5.0 needs
>How-To-Repeat:
	cd /usr/ports/security/slush ; make 
>Fix:

Simply take back getopt.h on -current
diff -u -ruN slush/Makefile slush.fix/Makefile
--- slush/Makefile	Sun May 18 20:13:18 2003
+++ slush.fix/Makefile	Mon Oct 27 04:18:12 2003
@@ -24,10 +24,6 @@
 BROKEN=		does not build
 .endif
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/slush
diff -u -ruN slush/files/patch-ab slush.fix/files/patch-ab
--- slush/files/patch-ab	Mon May 10 01:50:07 1999
+++ slush.fix/files/patch-ab	Mon Oct 27 06:22:42 2003
@@ -1,19 +1,13 @@
-*** slush.c-	Fri May  7 03:31:04 1999
---- slush.c	Fri May  7 03:31:14 1999
-***************
-*** 34,40 ****
-  #include <signal.h>
-  #include <string.h>
-  #include <stdlib.h>
-! #include <getopt.h>
-  #include <termios.h>
-  #include <pwd.h>
-  #include <sys/ioctl.h>
---- 34,40 ----
-  #include <signal.h>
-  #include <string.h>
-  #include <stdlib.h>
-! /* #include <getopt.h> */
-  #include <termios.h>
-  #include <pwd.h>
-  #include <sys/ioctl.h>
+--- slush.c-	Mon Oct 27 06:19:50 2003
++++ slush.c	Mon Oct 27 06:21:46 2003
+@@ -34,7 +34,10 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/param.h>
++#if __FreeBSD_version >= 500000
+ #include <getopt.h>
++#endif
+ #include <termios.h>
+ #include <pwd.h>
+ #include <sys/ioctl.h>
diff -u -ruN slush/files/patch-ac slush.fix/files/patch-ac
--- slush/files/patch-ac	Mon May 10 01:50:07 1999
+++ slush.fix/files/patch-ac	Mon Oct 27 06:23:06 2003
@@ -1,25 +1,22 @@
-*** slushd.c.orig	Tue Apr  6 05:14:04 1999
---- slushd.c	Sat May  8 23:53:40 1999
+*** slushd.c-	Mon Oct 27 06:19:54 2003
+--- slushd.c	Mon Oct 27 06:22:02 2003
 ***************
 *** 40,46 ****
+--- 40,50 ----
   #include <ctype.h>
   #include <stdlib.h>
   #include <netdb.h>
-! #include <getopt.h>
-  #include <pwd.h>
-  #include <grp.h>
-  #include <fcntl.h>
---- 40,46 ----
-  #include <ctype.h>
-  #include <stdlib.h>
-  #include <netdb.h>
-! #include <libutil.h>
++ #include <sys/param.h>
++ #if __FreeBSD_version >= 500000
+  #include <getopt.h>
++ #endif
++ #include <libutil.h>
   #include <pwd.h>
   #include <grp.h>
   #include <fcntl.h>
 ***************
 *** 51,56 ****
---- 51,57 ----
+--- 55,61 ----
   #include <sys/stat.h>
   #include <sys/ioctl.h>
   #include <sys/file.h>
@@ -87,7 +84,7 @@
   }
   
   /* Retrieve client X509 certificate and test authentication */
---- 655,684 ----
+--- 659,688 ----
   void log_uwtmp(struct passwd *pw, struct in_addr *i, char *tty, int is_logout)
   {
   	struct utmp ut;
>Release-Note:
>Audit-Trail:
>Unformatted: