Index: head/net/apinger/Makefile
===================================================================
--- head/net/apinger/Makefile	(revision 401240)
+++ head/net/apinger/Makefile	(revision 401241)
@@ -1,37 +1,34 @@
 # Created by: Michael L. Hostbaek (mich@freebsdcluster.org)
 # $FreeBSD$
 
 PORTNAME=	apinger
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://freebsdcluster.org/~mich/software/ \
 		http://www.bnet.pl/~jajcus/apinger/
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	IP device monitoring tool
 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	apinger
 SUB_FILES=	pkg-message
+PORTDOCS=	AUTHORS NEWS README
 
-OPTIONS_DEFINE=	IPV6
+OPTIONS_DEFINE=	IPV6 DOCS
 
 USES=		bison
 
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/apinger.conf ${STAGEDIR}${PREFIX}/etc/apinger.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}/AUTHORS
 
 .include <bsd.port.mk>
Index: head/net/apinger/files/apinger.in
===================================================================
--- head/net/apinger/files/apinger.in	(revision 401240)
+++ head/net/apinger/files/apinger.in	(revision 401241)
@@ -1,28 +1,28 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: apinger
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# apinger_enable (bool):   Set to NO by default.
-#               Set it to YES to enable apinger.
+# apinger_enable (bool):	Set to NO by default.
+#				Set it to YES to enable apinger.
 #
 
 . /etc/rc.subr
 
-name="apinger"
+name=apinger
 rcvar=apinger_enable
 
-command=%%PREFIX%%/sbin/${name}
-pidfile=/var/run/${name}.pid
-
 load_rc_config $name
 
-: ${apinger_enable="NO"}
+: ${apinger_enable:=NO}
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
 
 run_rc_command "$1"
Index: head/net/apinger/files/patch-src_apinger.h
===================================================================
--- head/net/apinger/files/patch-src_apinger.h	(revision 401240)
+++ head/net/apinger/files/patch-src_apinger.h	(revision 401241)
@@ -1,11 +1,11 @@
---- src/apinger.h.old	2008-07-10 22:38:08.000000000 +0200
-+++ src/apinger.h	2008-07-10 22:38:29.000000000 +0200
-@@ -119,7 +119,7 @@
+--- src/apinger.h.orig	2002-12-20 09:19:57 UTC
++++ src/apinger.h
+@@ -119,7 +119,7 @@ extern char *config_file;
  
  extern int icmp_sock;
  extern int icmp6_sock;
 -extern int ident;
 +extern uint16_t ident;
  
  extern struct timeval next_probe;
  
Index: head/net/apinger/files/patch-src_icmp.c
===================================================================
--- head/net/apinger/files/patch-src_icmp.c	(revision 401240)
+++ head/net/apinger/files/patch-src_icmp.c	(revision 401241)
@@ -1,11 +1,11 @@
---- src/icmp.c.orig
+--- src/icmp.c.orig	2002-12-19 08:24:33 UTC
 +++ src/icmp.c
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ socklen_t sl;
  	debug("checking CMSG...");
  	for (c = CMSG_FIRSTHDR(&msg); c; c = CMSG_NXTHDR(&msg, c)) {
  		debug("CMSG level: %i type: %i",c->cmsg_level,c->cmsg_type);
 -		if (c->cmsg_level != SOL_SOCKET || c->cmsg_type != SO_TIMESTAMP)
 +		if (c->cmsg_level != SOL_SOCKET || c->cmsg_type != SCM_TIMESTAMP)
  			continue;
  		if (c->cmsg_len < CMSG_LEN(sizeof(struct timeval)))
  			continue;
Index: head/net/apinger/files/patch-src_main.c
===================================================================
--- head/net/apinger/files/patch-src_main.c	(revision 401240)
+++ head/net/apinger/files/patch-src_main.c	(revision 401241)
@@ -1,20 +1,20 @@
---- src/main.c.old	2008-07-10 22:36:21.000000000 +0200
-+++ src/main.c	2008-07-10 22:36:53.000000000 +0200
-@@ -96,7 +96,7 @@
+--- src/main.c.orig	2003-03-26 11:27:47 UTC
++++ src/main.c
+@@ -96,7 +96,7 @@ char *config_file=CONFIG;
  
  int icmp_sock;
  int icmp6_sock;
 -int ident;
 +uint16_t ident;
  
  struct timeval next_probe={0,0};
  
-@@ -277,7 +277,7 @@
+@@ -277,7 +277,7 @@ char *graph_location="/apinger/";
  		return 1;
  	}
  
 -	ident=getpid();
 +	ident=getpid() & 0xFFFF;
  	signal(SIGTERM,signal_handler);
  	signal(SIGINT,signal_handler);
  	signal(SIGHUP,signal_handler);
Index: head/net/apinger/pkg-plist
===================================================================
--- head/net/apinger/pkg-plist	(revision 401240)
+++ head/net/apinger/pkg-plist	(revision 401241)
@@ -1,5 +1,2 @@
 sbin/apinger
-etc/apinger.conf.sample
-%%DOCSDIR%%/README
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/AUTHORS
+@sample etc/apinger.conf.sample