svn commit: r307611 - in head/ftp/atftp: . files

[Kevin Lo]

Author: kevlo
Date: Wed Nov 21 05:38:37 2012
New Revision: 307611
URL: http://svnweb.freebsd.org/changeset/ports/307611

Log:
  Fix build with clang.
  
  Feature safe:	yes

Modified:
  head/ftp/atftp/Makefile
  head/ftp/atftp/files/patch-tftp_def.h
  head/ftp/atftp/files/patch-tftpd.h

Modified: head/ftp/atftp/Makefile
==============================================================================
--- head/ftp/atftp/Makefile	Wed Nov 21 00:47:52 2012	(r307610)
+++ head/ftp/atftp/Makefile	Wed Nov 21 05:38:37 2012	(r307611)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	atftp
-# Date created:		5 October 2010
-# Whom:			kevlo
-#
 # $FreeBSD$
-#
 
 PORTNAME=	atftp
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/a/${PORTNAME}

Modified: head/ftp/atftp/files/patch-tftp_def.h
==============================================================================
--- head/ftp/atftp/files/patch-tftp_def.h	Wed Nov 21 00:47:52 2012	(r307610)
+++ head/ftp/atftp/files/patch-tftp_def.h	Wed Nov 21 05:38:37 2012	(r307611)
@@ -1,5 +1,5 @@
 --- tftp_def.h.orig	2004-02-13 11:16:09.000000000 +0800
-+++ tftp_def.h	2010-10-05 12:36:29.000000000 +0800
++++ tftp_def.h	2012-11-21 13:21:56.000000000 +0800
 @@ -19,6 +19,7 @@
  
  #include <sys/time.h>
@@ -8,3 +8,12 @@
  #include <netdb.h>
  
  /* standard return value */
+@@ -49,7 +50,7 @@
+ 
+ int timeval_diff(struct timeval *res, struct timeval *t1, struct timeval *t0);
+ int print_eng(double value, char *string, int size, char *format);
+-inline char *Strncpy(char *to, const char *from, size_t size);
++extern inline char *Strncpy(char *to, const char *from, size_t size);
+ int Gethostbyname(char *addr, struct hostent *host);
+ 
+ #endif

Modified: head/ftp/atftp/files/patch-tftpd.h
==============================================================================
--- head/ftp/atftp/files/patch-tftpd.h	Wed Nov 21 00:47:52 2012	(r307610)
+++ head/ftp/atftp/files/patch-tftpd.h	Wed Nov 21 05:38:37 2012	(r307611)
@@ -1,5 +1,5 @@
---- tftpd.h.orig	2010-10-11 11:33:53.000000000 +0800
-+++ tftpd.h	2010-10-11 11:34:33.000000000 +0800
+--- tftpd.h.orig	2004-02-27 10:05:26.000000000 +0800
++++ tftpd.h	2012-11-21 13:07:15.000000000 +0800
 @@ -71,6 +71,11 @@
  struct client_info {
       struct sockaddr_in client;
@@ -12,3 +12,12 @@
       struct client_info *next;
  };
  
+@@ -93,7 +98,7 @@
+ /*
+  * Defined in tftpd_list.c, operation on client structure list.
+  */
+-inline void tftpd_clientlist_ready(struct thread_data *thread);
++extern inline void tftpd_clientlist_ready(struct thread_data *thread);
+ void tftpd_clientlist_remove(struct thread_data *thread,
+                              struct client_info *client);
+ void tftpd_clientlist_free(struct thread_data *thread);