svn commit: r401241 - in head/net/apinger: . files
Michael Landin Hostbaek
mich at FreeBSD.org
Wed Nov 11 12:59:50 UTC 2015
Author: mich
Date: Wed Nov 11 12:59:48 2015
New Revision: 401241
URL: https://svnweb.freebsd.org/changeset/ports/401241
Log:
apinger cleanup
- Add DOCS option, enabled by default
- Move docs from pkg-plist to PORTDOCS
- Use IPV6_CONFIGURE_ENABLE knob
- Make rclint happy
- Regenerate patches with make makepatch
- Add @sample to apinger.conf
- Bump PORTREVISION due to rc script changei
PR: ports/204465
Submitted by: garga
Sponsored by: Rubicon Communications (Netgate)
Modified:
head/net/apinger/Makefile
head/net/apinger/files/apinger.in
head/net/apinger/files/patch-src_apinger.h
head/net/apinger/files/patch-src_icmp.c
head/net/apinger/files/patch-src_main.c
head/net/apinger/pkg-plist
Modified: head/net/apinger/Makefile
==============================================================================
--- head/net/apinger/Makefile Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/Makefile Wed Nov 11 12:59:48 2015 (r401241)
@@ -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
Modified: head/net/apinger/files/apinger.in
==============================================================================
--- head/net/apinger/files/apinger.in Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/files/apinger.in Wed Nov 11 12:59:48 2015 (r401241)
@@ -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"
Modified: head/net/apinger/files/patch-src_apinger.h
==============================================================================
--- head/net/apinger/files/patch-src_apinger.h Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/files/patch-src_apinger.h Wed Nov 11 12:59:48 2015 (r401241)
@@ -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;
Modified: head/net/apinger/files/patch-src_icmp.c
==============================================================================
--- head/net/apinger/files/patch-src_icmp.c Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/files/patch-src_icmp.c Wed Nov 11 12:59:48 2015 (r401241)
@@ -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);
Modified: head/net/apinger/files/patch-src_main.c
==============================================================================
--- head/net/apinger/files/patch-src_main.c Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/files/patch-src_main.c Wed Nov 11 12:59:48 2015 (r401241)
@@ -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;
}
Modified: head/net/apinger/pkg-plist
==============================================================================
--- head/net/apinger/pkg-plist Wed Nov 11 12:24:01 2015 (r401240)
+++ head/net/apinger/pkg-plist Wed Nov 11 12:59:48 2015 (r401241)
@@ -1,5 +1,2 @@
sbin/apinger
-etc/apinger.conf.sample
-%%DOCSDIR%%/README
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/AUTHORS
+ at sample etc/apinger.conf.sample
More information about the svn-ports-all
mailing list