summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/miredo/Makefile47
-rw-r--r--net/miredo/files/miredo.sh11
2 files changed, 34 insertions, 24 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7cc802863f3..844b6fc6c08 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,35 +1,44 @@
-# $NetBSD: Makefile,v 1.25 2019/01/05 21:46:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2019/01/06 00:12:39 schmonz Exp $
-DISTNAME= miredo-1.2.6
-CATEGORIES= net
-MASTER_SITES= http://www.remlab.net/files/miredo/
-EXTRACT_SUFX= .tar.xz
+DISTNAME= miredo-1.2.6
+PKGREVISION= 1
+CATEGORIES= net
+MASTER_SITES= http://www.remlab.net/files/miredo/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.remlab.net/miredo/
-COMMENT= Teredo IPv6 tunneling
-LICENSE= gnu-gpl-v2
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= https://www.remlab.net/miredo/
+COMMENT= Teredo IPv6 tunneling
+LICENSE= gnu-gpl-v2
NOT_FOR_PLATFORM= Interix-*-* NetBSD-[0-3].*-* SunOS-*-*
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
CONFIGURE_ARGS+= --enable-examplesdir=${EGDIR}
CONFIGURE_ARGS+= --disable-sample-conf
+CONFIGURE_ARGS+= --enable-miredo-user=${MIREDO_USER}
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
PKG_SYSCONFSUBDIR?= miredo
-EGDIR= ${PREFIX}/share/examples/miredo
-CONF_FILES= ${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
-CONF_FILES+= ${EGDIR}/miredo-server.conf \
- ${PKG_SYSCONFDIR}/miredo-server.conf
-CONF_FILES+= ${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
+EGDIR= ${PREFIX}/share/examples/miredo
+CONF_FILES= ${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
+CONF_FILES+= ${EGDIR}/miredo-server.conf \
+ ${PKG_SYSCONFDIR}/miredo-server.conf
+CONF_FILES+= ${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
-RCD_SCRIPTS= miredo
+RCD_SCRIPTS= miredo
+FILES_SUBST+= MIREDO_USER=${MIREDO_USER:Q}
-BUILD_DEFS+= VARBASE
+PKG_USERS_VARS+= MIREDO_USER
+PKG_GROUPS_VARS+= MIREDO_GROUP
+PKG_GROUPS+= ${MIREDO_GROUP}
+PKG_USERS+= ${MIREDO_USER}:${MIREDO_GROUP}
+
+BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
.include "../../net/libpcap/buildlink3.mk"
.include "../../devel/libjudy/buildlink3.mk"
diff --git a/net/miredo/files/miredo.sh b/net/miredo/files/miredo.sh
index a0152333b6a..1994a57dbd3 100644
--- a/net/miredo/files/miredo.sh
+++ b/net/miredo/files/miredo.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: miredo.sh,v 1.1 2011/02/09 22:59:50 pettai Exp $
+# $NetBSD: miredo.sh,v 1.2 2019/01/06 00:12:39 schmonz Exp $
# PROVIDE: miredo
# REQUIRE: NETWORKING
@@ -8,10 +8,11 @@
. /etc/rc.subr
name="miredo"
-rcvar=$name
-command="/usr/pkg/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+rcvar=${name}
+command="@PREFIX@/sbin/${name}"
+command_args="-u @MIREDO_USER@"
+required_files="@PKG_SYSCONFDIR@/miredo.conf"
+pidfile="@VARBASE@/run/${name}.pid"
load_rc_config $name
run_rc_command "$1"
-