7 files changed, 12 insertions, 78 deletions

diff --git a/net/ptpd/Makefile b/net/ptpd/Makefile
index 082366c17daf..e59e9b42f65e 100644
--- a/net/ptpd/Makefile
+++ b/net/ptpd/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	ptpd
-DISTVERSION=	1.0.0
-PORTREVISION=	3
+DISTVERSION=	1.1.0
 CATEGORIES=	net
 MASTER_SITES=	SF
 
-MAINTAINER=	gnn@FreeBSD.org
+MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	An implementation of the precision time protocol IEEE 1588
 
+LICENSE=	BSD
 LATEST_LINK=	ptpd1
 
 WRKSRC=		${WRKDIR}/ptpd-${DISTVERSION}/src
+CFLAGS+=	-DBSD_INTERFACE_FUNCTIONS
 
 PLIST_FILES=	sbin/ptpd
 PORTDOCS=	*
diff --git a/net/ptpd/distinfo b/net/ptpd/distinfo
index ce59c3a90ad1..c5f126d9f8c3 100644
--- a/net/ptpd/distinfo
+++ b/net/ptpd/distinfo
@@ -1,3 +1,3 @@
-MD5 (ptpd-1.0.0.tar.gz) = b112b2bedc7f6e6e11a838608b9e0357
-SHA256 (ptpd-1.0.0.tar.gz) = 8ac1fdcad1e246b0395097dd9af29966c6823533d7e6989aae91506048fb51bc
-SIZE (ptpd-1.0.0.tar.gz) = 382246
+MD5 (ptpd-1.1.0.tar.gz) = faa4823576dd49ccc94b741ff32b03f5
+SHA256 (ptpd-1.1.0.tar.gz) = a7c6ea83bd53da75ae04a7b7a25fe7c597b4e9ff1f93d46f4502e3fa8a2cb950
+SIZE (ptpd-1.1.0.tar.gz) = 401064
diff --git a/net/ptpd/files/patch-src-dep-constants_dep.h b/net/ptpd/files/patch-src-dep-constants_dep.h
deleted file mode 100644
index 9b1183a77e00..000000000000
--- a/net/ptpd/files/patch-src-dep-constants_dep.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dep/constants_dep.h.orig
-+++ dep/constants_dep.h
-@@ -46,6 +46,8 @@
- 
- # define IFCONF_LENGTH 10
- 
-+# define BSD_INTERFACE_FUNCTIONS
-+
- # define adjtimex ntp_adjtime
- 
- # include <machine/endian.h>
diff --git a/net/ptpd/files/patch-src-dep_net.c b/net/ptpd/files/patch-src-dep_net.c
deleted file mode 100644
index 884b6265efd1..000000000000
--- a/net/ptpd/files/patch-src-dep_net.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- dep/net.c.orig
-+++ dep/net.c
-@@ -8,26 +8,26 @@
-   
-   /* set multicast group address based on subdomainName */
-   if (!memcmp(subdomainName, DEFAULT_PTP_DOMAIN_NAME, PTP_SUBDOMAIN_NAME_LENGTH))
--    memcpy(subdomainAddress, DEFAULT_PTP_DOMAIN_ADDRESS, NET_ADDRESS_LENGTH);
-+    strncpy(subdomainAddress, DEFAULT_PTP_DOMAIN_ADDRESS, NET_ADDRESS_LENGTH);
-   else if(!memcmp(subdomainName, ALTERNATE_PTP_DOMAIN1_NAME, PTP_SUBDOMAIN_NAME_LENGTH))
--    memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN1_ADDRESS, NET_ADDRESS_LENGTH);
-+    strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN1_ADDRESS, NET_ADDRESS_LENGTH);
-   else if(!memcmp(subdomainName, ALTERNATE_PTP_DOMAIN2_NAME, PTP_SUBDOMAIN_NAME_LENGTH))
--    memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN2_ADDRESS, NET_ADDRESS_LENGTH);
-+    strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN2_ADDRESS, NET_ADDRESS_LENGTH);
-   else if(!memcmp(subdomainName, ALTERNATE_PTP_DOMAIN3_NAME, PTP_SUBDOMAIN_NAME_LENGTH))
--    memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN3_ADDRESS, NET_ADDRESS_LENGTH);
-+    strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN3_ADDRESS, NET_ADDRESS_LENGTH);
-   else
-   {
-     h = crc_algorithm(subdomainName, PTP_SUBDOMAIN_NAME_LENGTH) % 3;
-     switch(h)
-     {
-     case 0:
--      memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN1_ADDRESS, NET_ADDRESS_LENGTH);
-+      strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN1_ADDRESS, NET_ADDRESS_LENGTH);
-       break;
-     case 1:
--      memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN2_ADDRESS, NET_ADDRESS_LENGTH);
-+      strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN2_ADDRESS, NET_ADDRESS_LENGTH);
-       break;
-     case 2:
--      memcpy(subdomainAddress, ALTERNATE_PTP_DOMAIN3_ADDRESS, NET_ADDRESS_LENGTH);
-+      strncpy(subdomainAddress, ALTERNATE_PTP_DOMAIN3_ADDRESS, NET_ADDRESS_LENGTH);
-       break;
-     default:
-       ERROR("handle out of range for '%s'!\n", subdomainName);
diff --git a/net/ptpd/files/patch-src-dep_ptpd_dep.h b/net/ptpd/files/patch-src-dep_ptpd_dep.h
deleted file mode 100644
index 181ba507191a..000000000000
--- a/net/ptpd/files/patch-src-dep_ptpd_dep.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dep/ptpd_dep.h.orig
-+++ dep/ptpd_dep.h
-@@ -22,7 +22,7 @@
- 
- /* system messages */
- #define ERROR(x, ...)  fprintf(stderr, "(ptpd error) " x, ##__VA_ARGS__)
--#define PERROR(x, ...) fprintf(stderr, "(ptpd error) " x ": %m\n", ##__VA_ARGS__)
-+#define PERROR(x, ...) fprintf(stderr, "(ptpd error) " x ": %s\n", ##__VA_ARGS__, strerror(errno))
- #define NOTIFY(x, ...) fprintf(stderr, "(ptpd notice) " x, ##__VA_ARGS__)
- 
- /* debug messages */
diff --git a/net/ptpd/files/patch-src-ptpd.h b/net/ptpd/files/patch-src-ptpd.h
deleted file mode 100644
index 095a7560a982..000000000000
--- a/net/ptpd/files/patch-src-ptpd.h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ptpd.h
-===================================================================
---- ptpd.h	(revision 45)
-+++ ptpd.h	(working copy)
-@@ -4,6 +4,7 @@
- #define PTPD_H
- 
- #include "constants.h"
-+#include "limits.h"
- #include "dep/constants_dep.h"
- #include "dep/datatypes_dep.h"
- #include "datatypes.h"
diff --git a/net/ptpd/pkg-descr b/net/ptpd/pkg-descr
index b30e9eb3baa6..71698d9c2807 100644
--- a/net/ptpd/pkg-descr
+++ b/net/ptpd/pkg-descr
@@ -1,4 +1,7 @@
-This is a port of ptpd, the Precision Time Protocol, which is an
-implementation of IEEE 1588.
+ptpd is an implementation of version 1 the Precision Time Protocol
+(IEEE 1588-2002)
+
+PTP was developed to provide very precise time coordination of LAN connected
+computers.
 
 WWW: http://ptpd.sourceforge.net/