aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/miredo/Makefile17
-rw-r--r--net/miredo/files/isatapd.in26
-rw-r--r--net/miredo/pkg-plist2
3 files changed, 7 insertions, 38 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7e2520c976b..17bb4434a22 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS= Judy.1:${PORTSDIR}/devel/judy
USE_BZIP2= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --localstatedir=/var
USE_LDCONFIG= yes
MAN1= teredo-mire.1
@@ -24,24 +25,18 @@ MAN5= miredo-server.conf.5 miredo.conf.5
MAN8= miredo-server.8 miredo.8 miredo-checkconf.8
USE_RC_SUBR= miredo_server miredo
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-USE_ICONV= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+USE_ICONV= yes
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
-CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}"
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB= NLS="@comment "
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == sparc64
-BROKEN= Does not compile on sparc64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/miredo/files/isatapd.in b/net/miredo/files/isatapd.in
deleted file mode 100644
index 38ae26f0978..00000000000
--- a/net/miredo/files/isatapd.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: isatapd
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable isatapd:
-#
-#isatapd_enable="YES"
-#
-isatapd_enable="${isatapd_enable-NO}"
-
-. /etc/rc.subr
-
-name=isatapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/${name}
-required_files=%%PREFIX%%/etc/isatapd.conf
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/net/miredo/pkg-plist b/net/miredo/pkg-plist
index d7555a67e96..d8968568068 100644
--- a/net/miredo/pkg-plist
+++ b/net/miredo/pkg-plist
@@ -14,7 +14,7 @@ include/libteredo/teredo.h
include/libteredo/teredo-udp.h
include/libteredo/tunnel.h
include/libtun6/tun6.h
-@unexec [ -f %%TARGETDIR%%/etc/miredo/miredo.conf ] && cmp -s %%TARGETDIR%%/etc/miredo/miredo.conf %%DOCSDIR%%/examples/miredo.conf && rm %%TARGETDIR%%/miredo/etc/miredo.conf || exit 0
+@unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%DOCSDIR%%/examples/miredo.conf && rm %D/etc/miredo/miredo.conf || true
etc/miredo/client-hook
@exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
%%DOCSDIR%%/examples/miredo-server.conf