ports/79650: net/ztelnet: patch for compilation on FreeBSD 5.x

[Johan van Selst]

>Number:         79650
>Category:       ports
>Synopsis:       net/ztelnet: patch for compilation on FreeBSD 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 07 20:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	[Cc: maintainer, cjh at FreeBSD.org]

	Attached is a patch to get ztelnet working on FreeBSD 5.x

	It adds a necessary function prototype.

	
>How-To-Repeat:
	
>Fix:

	


diff -uNr ztelnet/Makefile ztelnet/Makefile
--- ztelnet/Makefile	Thu Sep 30 07:54:34 2004
+++ ztelnet/Makefile	Thu Apr  7 21:30:54 2005
@@ -30,10 +30,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Install fails on FreeBSD >= 5.x"
-.endif
-
 post-patch:
 	# we can ignore warnings
 	@( cd ${WRKSRC}/ztelnet && \
Binary files ztelnet/files/.patch-al.swp and ztelnet/files/.patch-al.swp differ
diff -uNr ztelnet/files/patch-al ztelnet/files/patch-al
--- ztelnet/files/patch-al	Sun May 30 01:45:25 2004
+++ ztelnet/files/patch-al	Thu Apr  7 21:42:14 2005
@@ -18,7 +18,7 @@
  typedef struct {
  	char	*name;		/* command name */
  	char	*help;		/* help string (NULL for no help) */
-@@ -93,6 +91,10 @@
+@@ -93,6 +91,12 @@
  static int margc;
  static char *margv[20];
  
@@ -26,6 +26,8 @@
 +    void send_dont();
 +    void send_will();
 +    void send_do();
++    typedef int (*intrtn_t)();
++    static call(intrtn_t routine, ...);
      static void
  makeargv()
  {
@@ -148,14 +150,13 @@
  
  static Command cmdtab[] = {
  	{ "close",	closehelp,	bye,		1 },
-@@ -2548,18 +2528,14 @@
+@@ -2548,18 +2528,13 @@
   */
  
      /*VARARGS1*/
 -    static
 -call(va_alist)
 -    va_dcl
-+typedef int (*intrtn_t)();
 +static call(intrtn_t routine, ...)
  {
      va_list ap;
>Release-Note:
>Audit-Trail:
>Unformatted: