6 files changed, 21 insertions, 27 deletions

diff --git a/net/apinger/Makefile b/net/apinger/Makefile
index 962f20cac08b..356629d63250 100644
--- a/net/apinger/Makefile
+++ b/net/apinger/Makefile
@@ -3,7 +3,7 @@
 
 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/
@@ -16,16 +16,13 @@ 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
diff --git a/net/apinger/files/apinger.in b/net/apinger/files/apinger.in
index f284f64dc4f7..0dc75b415719 100644
--- a/net/apinger/files/apinger.in
+++ b/net/apinger/files/apinger.in
@@ -9,20 +9,20 @@
 # 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"
diff --git a/net/apinger/files/patch-src_apinger.h b/net/apinger/files/patch-src_apinger.h
index 417fa0908be2..e91635c97550 100644
--- a/net/apinger/files/patch-src_apinger.h
+++ b/net/apinger/files/patch-src_apinger.h
@@ -1,6 +1,6 @@
---- 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;
diff --git a/net/apinger/files/patch-src_icmp.c b/net/apinger/files/patch-src_icmp.c
index 5c9351f96cc9..3b0eced748de 100644
--- a/net/apinger/files/patch-src_icmp.c
+++ b/net/apinger/files/patch-src_icmp.c
@@ -1,6 +1,6 @@
---- 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);
diff --git a/net/apinger/files/patch-src_main.c b/net/apinger/files/patch-src_main.c
index 7902e4a0b53d..518c159fe20b 100644
--- a/net/apinger/files/patch-src_main.c
+++ b/net/apinger/files/patch-src_main.c
@@ -1,6 +1,6 @@
---- 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;
@@ -9,7 +9,7 @@
  
  struct timeval next_probe={0,0};
  
-@@ -277,7 +277,7 @@
+@@ -277,7 +277,7 @@ char *graph_location="/apinger/";
  		return 1;
  	}
  
diff --git a/net/apinger/pkg-plist b/net/apinger/pkg-plist
index 97a2fa7ff72a..74184a80d77d 100644
--- a/net/apinger/pkg-plist
+++ b/net/apinger/pkg-plist
@@ -1,5 +1,2 @@
 sbin/apinger
-etc/apinger.conf.sample
-%%DOCSDIR%%/README
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/AUTHORS
+@sample etc/apinger.conf.sample