From e313f65e0c0eb99454fac40616e9b5c722e60489 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 30 Nov 2016 13:43:55 +0100
Subject: [PATCH] msntp: move man-pages to /usr/share/man

---
 msntp/.footprint      |  7 ++++---
 msntp/.md5sum         |  2 +-
 msntp/.signature      |  8 ++++----
 msntp/Pkgfile         | 10 +++++-----
 msntp/msntp-1.6.patch | 32 ++++++++++++++++++++++++++------
 5 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/msntp/.footprint b/msntp/.footprint
index 6ead198da..e27e6a077 100644
--- a/msntp/.footprint
+++ b/msntp/.footprint
@@ -1,6 +1,7 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/msntp.1.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/msntp
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/msntp.1.gz
diff --git a/msntp/.md5sum b/msntp/.md5sum
index 662eedc4a..6124aeb74 100644
--- a/msntp/.md5sum
+++ b/msntp/.md5sum
@@ -1,2 +1,2 @@
-327de46321f991b1622a87064a18dbe5  msntp-1.6.patch
+54e325bf90a17c9e52c6e47d64feb068  msntp-1.6.patch
 3eefa15ace8567b46dfa67259407c333  msntp-1.6.tar.gz
diff --git a/msntp/.signature b/msntp/.signature
index c2b189098..96fd2f19a 100644
--- a/msntp/.signature
+++ b/msntp/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TpsnzVIWCG0i0PUYwbBwbMM0UwUGTs6d6zX8nRhljDbmcVVCL+iLPtciFAWXhdavE+E0t31EIovfjyGIlc5ZAE=
-SHA256 (Pkgfile) = 0a710e2524bb571a2e92c16765caccbf963cc5d46e52c6bf3d383582905e294a
-SHA256 (.footprint) = dba172906de21d972e9ad67aaaafd24ad4d73fe599ef35aebe48e941d88e5e05
+RWSE3ohX2g5d/VWTVAjtQ4UlkBNSIRoE6Jcht96O6yp//G25Qsf1by/vsly3U6Oj399IxK6YcSm+qVLtIzuHp6EgF2WLmMsn1gE=
+SHA256 (Pkgfile) = 46efc23033120de27a7ee8941f776caad223b97135e0a2e4c20baea46a7115ca
+SHA256 (.footprint) = d4cb1d3a9a0ae554ebc0bc81fa18cf63e6626bf276c811d2d517a02342cf5578
 SHA256 (msntp-1.6.tar.gz) = 30d170734d5ef8e7a5ba68ec2add4206a2133b43e3c7150100689304cf6528e5
-SHA256 (msntp-1.6.patch) = 53e4ae654234a05407188228d800a7e6a55b75ecb0ca6e4319a0ac07462566f2
+SHA256 (msntp-1.6.patch) = ff1acb783afbdca64f979ec0aed9017f17fde8b0deb9c34a7cd2942a81da971c
diff --git a/msntp/Pkgfile b/msntp/Pkgfile
index 1c6fa9d69..3ca39e600 100644
--- a/msntp/Pkgfile
+++ b/msntp/Pkgfile
@@ -4,15 +4,15 @@
 
 name=msntp
 version=1.6
-release=2
+release=3
 source=(http://distcache.freebsd.org/ports-distfiles/$name-$version.tar.gz \
         $name-$version.patch)
 
 build () {
     cd $name-$version
-    patch -p1 < ../$name-$version.patch
+    patch -p1 -i $SRC/$name-$version.patch
     make
-    mkdir -p $PKG/usr/{sbin,man/man1}
-    cp msntp $PKG/usr/sbin
-    cp msntp.1 $PKG/usr/man/man1
+    install -d $PKG/usr/{sbin,share/man/man1}
+    install msntp $PKG/usr/sbin
+    install -m 0644 msntp.1 $PKG/usr/share/man/man1
 }
diff --git a/msntp/msntp-1.6.patch b/msntp/msntp-1.6.patch
index 7873e1246..a7f29b9eb 100644
--- a/msntp/msntp-1.6.patch
+++ b/msntp/msntp-1.6.patch
@@ -1,6 +1,6 @@
 diff -Nru msntp-1.6.orig/Makefile msntp-1.6/Makefile
---- msntp-1.6.orig/Makefile	2002-09-08 13:16:22.000000000 +0200
-+++ msntp-1.6/Makefile	2002-09-08 13:19:23.000000000 +0200
+--- msntp-1.6.orig/Makefile	2016-11-30 13:36:11.403554863 +0100
++++ msntp-1.6/Makefile	2016-11-30 13:36:37.049294512 +0100
 @@ -11,7 +11,7 @@
  # CC = cc
  # CFLAGS = -O
@@ -11,8 +11,8 @@ diff -Nru msntp-1.6.orig/Makefile msntp-1.6/Makefile
  # Compiling this sort of ANSI C under SunOS 4.1 is a mug's game, because Sun's
  # Unix headers make GNU C vomit even in compatibility mode, but the following
 diff -Nru msntp-1.6.orig/header.h msntp-1.6/header.h
---- msntp-1.6.orig/header.h	2002-09-08 13:16:22.000000000 +0200
-+++ msntp-1.6/header.h	2002-09-08 13:27:13.000000000 +0200
+--- msntp-1.6.orig/header.h	2016-11-30 13:36:11.403554863 +0100
++++ msntp-1.6/header.h	2016-11-30 13:37:07.741518412 +0100
 @@ -19,10 +19,10 @@
  #define MAX_SOCKETS        10          /* Maximum number of addresses */
  
@@ -26,9 +26,18 @@ diff -Nru msntp-1.6.orig/header.h msntp-1.6/header.h
  #endif
  
  
+@@ -65,7 +65,7 @@
+ 
+ /* Defined in socket.c */
+ 
+-extern void open_sockets (int which, char *hostnames, int timespan);
++extern void open_socket (int which, char *hostnames, int timespan);
+ 
+ extern void write_socket (int which, void *packet, int length);
+ 
 diff -Nru msntp-1.6.orig/msntp.1 msntp-1.6/msntp.1
---- msntp-1.6.orig/msntp.1	2002-09-08 13:16:22.000000000 +0200
-+++ msntp-1.6/msntp.1	2002-09-08 13:27:59.000000000 +0200
+--- msntp-1.6.orig/msntp.1	2016-11-30 13:36:11.403554863 +0100
++++ msntp-1.6/msntp.1	2016-11-30 13:36:37.052627724 +0100
 @@ -143,7 +143,7 @@
  one copy of
  .I msntp
@@ -47,3 +56,14 @@ diff -Nru msntp-1.6.orig/msntp.1 msntp-1.6/msntp.1
  .PP
  .B address(es)
  are the DNS names or IP numbers of hosts to use for the challenge and response
+diff -Nru msntp-1.6.orig/unix.c msntp-1.6/unix.c
+--- msntp-1.6.orig/unix.c	2016-11-30 13:36:11.403554863 +0100
++++ msntp-1.6/unix.c	2016-11-30 13:37:36.770469102 +0100
+@@ -10,6 +10,7 @@
+ #include "header.h"
+ 
+ #include <sys/types.h>
++#include <signal.h>
+ #include <unistd.h>
+ #include <syslog.h>
+