From f01a69722f1a8f010e39bd98f3b07c132a3662f0 Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Wed, 21 Nov 2012 05:38:37 +0000 Subject: Fix build with clang. Feature safe: yes --- ftp/atftp/Makefile | 7 +------ ftp/atftp/files/patch-tftp_def.h | 11 ++++++++++- ftp/atftp/files/patch-tftpd.h | 13 +++++++++++-- 3 files changed, 22 insertions(+), 9 deletions(-) (limited to 'ftp/atftp') diff --git a/ftp/atftp/Makefile b/ftp/atftp/Makefile index 2ec7a1355f0f..102c0320d51c 100644 --- a/ftp/atftp/Makefile +++ b/ftp/atftp/Makefile @@ -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} diff --git a/ftp/atftp/files/patch-tftp_def.h b/ftp/atftp/files/patch-tftp_def.h index 5f75fe4cdf92..9e15a047673f 100644 --- a/ftp/atftp/files/patch-tftp_def.h +++ b/ftp/atftp/files/patch-tftp_def.h @@ -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 @@ -8,3 +8,12 @@ #include /* 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 diff --git a/ftp/atftp/files/patch-tftpd.h b/ftp/atftp/files/patch-tftpd.h index 49b9794f3018..5e2789a1dc33 100644 --- a/ftp/atftp/files/patch-tftpd.h +++ b/ftp/atftp/files/patch-tftpd.h @@ -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); -- cgit v1.2.3