Attachment 42052 Details for Bug 65624 – file.diff

[patch] file.diff

file.diff (text/plain), 4.74 KB, created by Alex Kapranoff on 2004-04-16 15:10:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kapranoff

Created: 2004-04-16 15:10:30 UTC

Size: 4.74 KB

patch

obsolete

>diff -ruN /usr/ports/dns/maradns/Makefile maradns/Makefile
>--- /usr/ports/dns/maradns/Makefile	Thu Apr 15 12:12:38 2004
>+++ maradns/Makefile	Sat Apr 17 00:43:58 2004
>@@ -20,6 +20,10 @@
> USE_BZIP2=	yes
> MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
> 
>+USE_RC_SUBR=	yes
>+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
>+		RC_SUBR=${RC_SUBR}
>+
> MAN1=	askmara.1 getzone.1
> MAN5=	mararc.5
> MAN8=	maradns.8 zoneserver.8
>@@ -44,35 +48,41 @@
> 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${MANPREFIX}/man/man5
> 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${MANPREFIX}/man/man8
> 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${MANPREFIX}/man/man8
>-	${INSTALL_SCRIPT} ${FILESDIR}/maradns.sh.sample ${PREFIX}/etc/rc.d
>+	${MKDIR} ${PREFIX}/etc/maradns
>+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv1 \
>+		${PREFIX}/etc/maradns/example_csv1
>+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>+		'-e s!%%SERVICE%%!maradns!g' \
>+		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/maradns.sh
>+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>+		'-e s!%%SERVICE%%!zoneserver!g' \
>+		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/zoneserver.sh
>+	@${CHMOD} 755 ${PREFIX}/etc/rc.d/maradns.sh
>+	@${CHMOD} 755 ${PREFIX}/etc/rc.d/zoneserver.sh
>+
> .ifndef(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>+	@${MKDIR} -p ${DOCSDIR}/en/misc/spammers/hiddenonline
> 	${INSTALL_DATA} ${WRKSRC}/00README.FIRST ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/TODO.* ${DOCSDIR}
>-	@${MKDIR} ${DOCSDIR}/en
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/README ${DOCSDIR}/en
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/faq.* ${DOCSDIR}/en
> 	@${MKDIR} ${DOCSDIR}/en/examples
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_* \
> 		${DOCSDIR}/en/examples
>-	@${MKDIR} ${DOCSDIR}/en/misc
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/0README ${DOCSDIR}/en/misc
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/recursive-case-insensitive \
> 		${DOCSDIR}/en/misc
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${DOCSDIR}/en/misc
>-	@${MKDIR} ${DOCSDIR}/en/misc/spammers
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/spammers/*.* \
> 		${DOCSDIR}/en/misc/spammers
>-	@${MKDIR} ${DOCSDIR}/en/misc/spammers/hiddenonline
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/spammers/hiddenonline/*.* \
> 		${DOCSDIR}/en/misc/spammers/hiddenonline
> 	@${MKDIR} ${DOCSDIR}/en/tutorial
> 	${INSTALL_DATA} ${WRKSRC}/doc/en/tutorial/*.* ${DOCSDIR}/en/tutorial
>-	@${MKDIR} ${DOCSDIR}/fr
>+	@${MKDIR} -p ${DOCSDIR}/fr/tutorial
> 	${INSTALL_DATA} ${WRKSRC}/doc/fr/QuickStart ${DOCSDIR}/fr
> 	${INSTALL_DATA} ${WRKSRC}/doc/fr/faq.* ${DOCSDIR}/fr
>-	@${MKDIR} ${DOCSDIR}/fr/tutorial
> 	${INSTALL_DATA} ${WRKSRC}/doc/fr/tutorial/*.* ${DOCSDIR}/fr/tutorial
> .endif
> 
>diff -ruN /usr/ports/dns/maradns/files/maradns.sh.sample maradns/files/maradns.sh.sample
>--- /usr/ports/dns/maradns/files/maradns.sh.sample	Sat Apr 10 00:11:17 2004
>+++ maradns/files/maradns.sh.sample	Thu Jan  1 03:00:00 1970
>@@ -1,23 +0,0 @@
>-#!/bin/sh
>-
>-if ! PREFIX=$(expr $0 : "$/.*$/etc/rc\.d/$(basename $0)\$"); then
>-    echo "$0: Cannot determine the PREFIX" >&2
>-    exit 1
>-fi
>-
>-case "$1" in
>-start)
>-	if [ -x ${PREFIX}/sbin/maradns ]; then
>-		${PREFIX}/sbin/maradns > /var/log/maradns.log &
>-		echo -n ' maradns'
>-	fi;
>-	;;
>-stop)
>-	killall maradns && echo -n ' maradns'
>-	;;
>-*)
>-	echo "Usage: `basename $0` {start|stop}" >&2
>-	;;
>-esac
>-
>-exit 0
>diff -ruN /usr/ports/dns/maradns/files/rc_d.sh maradns/files/rc_d.sh
>--- /usr/ports/dns/maradns/files/rc_d.sh	Thu Jan  1 03:00:00 1970
>+++ maradns/files/rc_d.sh	Sat Apr 17 00:43:58 2004
>@@ -0,0 +1,38 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: %%SERVICE%%
>+# REQUIRE: SERVERS
>+# BEFORE: DAEMON
>+# KEYWORD: FreeBSD shutdown
>+#
>+# NOTE for FreeBSD 5.0+:
>+# If you want this script to start with the base rc scripts
>+# move %%SERVICE%%.sh to /etc/rc.d/%%SERVICE%%
>+
>+prefix=%%PREFIX%%
>+
>+# Define these %%SERVICE%%_* variables in one of these files:
>+#	/etc/rc.conf
>+#	/etc/rc.conf.local
>+#	/etc/rc.conf.d/%%SERVICE%%
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+#
>+%%SERVICE%%_enable=${%%SERVICE%%_enable:-"NO"}
>+%%SERVICE%%_flags=${%%SERVICE%%_flags:-""}	# Can be "-f /path/alternate_rc"
>+
>+. %%RC_SUBR%%
>+
>+name="%%SERVICE%%"
>+rcvar=`set_rcvar`
>+command="${prefix}/sbin/${name}"
>+command_args="| /usr/bin/logger -p daemon.notice -t %%SERVICE%% &"
>+
>+load_rc_config $name
>+
>+flags="${%%SERVICE%%_flags}"
>+
>+run_rc_command "$1"
>diff -ruN /usr/ports/dns/maradns/pkg-plist maradns/pkg-plist
>--- /usr/ports/dns/maradns/pkg-plist	Sat Apr 10 00:11:17 2004
>+++ maradns/pkg-plist	Sat Apr 17 00:43:58 2004
>@@ -1,7 +1,10 @@
> @comment $FreeBSD: ports/dns/maradns/pkg-plist,v 1.14 2003/11/11 16:49:01 sergei Exp $
> bin/askmara
> etc/mararc.sample
>-etc/rc.d/maradns.sh.sample
>+etc/rc.d/maradns.sh
>+etc/rc.d/zoneserver.sh
>+etc/maradns/example_csv1
>+@dirrm etc/maradns
> sbin/getzone
> sbin/maradns
> sbin/zoneserver

Actions: View | Diff

Attachments on bug 65624: 42052