14 files changed, 98 insertions, 80 deletions

diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index bc84bed3aa68..8191d0cf1c05 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.11.0
+PORTVERSION=	1.0.0
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
@@ -16,9 +16,14 @@ COMMENT=	DNS server designed to utilize the MySQL database
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 USE_BZIP2=	yes
 
+USE_RC_SUBR=	mydns.sh
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 INFO=		mydns
 MAN5=		mydns.conf.5
 MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydnsptrconvert.8 mydns-conf.8
@@ -68,8 +73,6 @@ pre-fetch:
 	@${ECHO} ""
 
 post-install:
-	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh > ${WRKSRC}/mydns.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
 	@install-info ${PREFIX}/info/mydns.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/contrib
@@ -81,6 +84,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/
 .endif
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
-	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/dns/mydns-ng/distinfo b/dns/mydns-ng/distinfo
index 8027b41f1d8f..a966c5f30a75 100644
--- a/dns/mydns-ng/distinfo
+++ b/dns/mydns-ng/distinfo
@@ -1,2 +1,2 @@
-MD5 (mydns-0.11.0.tar.bz2) = 16cc087d63c59bdb56f1564d92d6ab0a
-SIZE (mydns-0.11.0.tar.bz2) = 545293
+MD5 (mydns-1.0.0.tar.bz2) = 3a0b312f53c6a8fb17cb7d2cf27fad24
+SIZE (mydns-1.0.0.tar.bz2) = 545441
diff --git a/dns/mydns-ng/files/mydns.sh b/dns/mydns-ng/files/mydns.sh
deleted file mode 100644
index 493a4356d676..000000000000
--- a/dns/mydns-ng/files/mydns.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		%%%PREFIX%%%/sbin/mydns -b
-		;;
-	stop)
-		kill `cat /var/run/mydns.pid`
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/dns/mydns-ng/files/mydns.sh.in b/dns/mydns-ng/files/mydns.sh.in
new file mode 100644
index 000000000000..572f96630bc6
--- /dev/null
+++ b/dns/mydns-ng/files/mydns.sh.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: mydns
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mydns:
+# mydns_enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MyDNS.
+#
+
+. %%RC_SUBR%%
+
+name="mydns"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${mydns_enable="NO"}
+
+command="%%PREFIX%%/sbin/mydns"
+command_args="-b"
+pidfile="/var/run/mydns.pid"
+required_files="%%PREFIX%%/etc/mydns.conf"
+
+run_rc_command "$1"
diff --git a/dns/mydns-ng/files/patch-configure b/dns/mydns-ng/files/patch-configure
deleted file mode 100644
index 65ebf6726437..000000000000
--- a/dns/mydns-ng/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig      Fri Mar 28 11:51:06 2003
-+++ configure   Fri Mar 28 11:51:21 2003
-@@ -7803,6 +7803,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
diff --git a/dns/mydns-ng/pkg-message b/dns/mydns-ng/files/pkg-message.in
index ba5c5b91050b..a4840bb5b715 100644
--- a/dns/mydns-ng/pkg-message
+++ b/dns/mydns-ng/files/pkg-message.in
@@ -1,11 +1,14 @@
 **********************************************************************
 To get MyDNS working you will need to do some configuration, first you
-will need to create %%%PREFIX%%%/etc/mydns.conf based on the
+will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
 database tables, you can use the output of
-%%%PREFIX%%%/sbin/mydns --create-tables
-as a template.
 
-If you're upgrading from a version before 0.9.12 then please read the
-instructions at http://mydns.bboy.net/ptr.html before running MyDNS
+ %%PREFIX%%/sbin/mydns --create-tables
+
+as a template. Finally enable MyDNS by adding
+
+ mydns_enable="YES"
+
+into your rc.conf.
 *********************************************************************
diff --git a/dns/mydns-ng/pkg-plist b/dns/mydns-ng/pkg-plist
index 791e30a5e0ac..90017934acca 100644
--- a/dns/mydns-ng/pkg-plist
+++ b/dns/mydns-ng/pkg-plist
@@ -4,7 +4,6 @@ bin/mydnsexport
 bin/mydnsimport
 bin/mydnsptrconvert
 etc/mydns.conf.sample
-etc/rc.d/mydns.sh.sample
 sbin/mydns
 %%NLS%%share/locale/es/LC_MESSAGES/mydns.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mydns.mo
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index bc84bed3aa68..8191d0cf1c05 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mydns
-PORTVERSION=	0.11.0
+PORTVERSION=	1.0.0
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
@@ -16,9 +16,14 @@ COMMENT=	DNS server designed to utilize the MySQL database
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 USE_BZIP2=	yes
 
+USE_RC_SUBR=	mydns.sh
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 INFO=		mydns
 MAN5=		mydns.conf.5
 MAN8=		mydns.8 mydnscheck.8 mydnsexport.8 mydnsimport.8 mydnsptrconvert.8 mydns-conf.8
@@ -68,8 +73,6 @@ pre-fetch:
 	@${ECHO} ""
 
 post-install:
-	@${SED} 's|%%%PREFIX%%%|${PREFIX}|g' < ${FILESDIR}/mydns.sh > ${WRKSRC}/mydns.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/mydns.sh ${PREFIX}/etc/rc.d/mydns.sh.sample
 	@install-info ${PREFIX}/info/mydns.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/contrib
@@ -81,6 +84,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/
 .endif
 	@${PREFIX}/sbin/mydns --dump-config >${PREFIX}/etc/mydns.conf.sample
-	@${SED} -e 's,%%%PREFIX%%%,${PREFIX},g' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/dns/mydns/distinfo b/dns/mydns/distinfo
index 8027b41f1d8f..a966c5f30a75 100644
--- a/dns/mydns/distinfo
+++ b/dns/mydns/distinfo
@@ -1,2 +1,2 @@
-MD5 (mydns-0.11.0.tar.bz2) = 16cc087d63c59bdb56f1564d92d6ab0a
-SIZE (mydns-0.11.0.tar.bz2) = 545293
+MD5 (mydns-1.0.0.tar.bz2) = 3a0b312f53c6a8fb17cb7d2cf27fad24
+SIZE (mydns-1.0.0.tar.bz2) = 545441
diff --git a/dns/mydns/files/mydns.sh b/dns/mydns/files/mydns.sh
deleted file mode 100644
index 493a4356d676..000000000000
--- a/dns/mydns/files/mydns.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		%%%PREFIX%%%/sbin/mydns -b
-		;;
-	stop)
-		kill `cat /var/run/mydns.pid`
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/dns/mydns/files/mydns.sh.in b/dns/mydns/files/mydns.sh.in
new file mode 100644
index 000000000000..572f96630bc6
--- /dev/null
+++ b/dns/mydns/files/mydns.sh.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: mydns
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mydns:
+# mydns_enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MyDNS.
+#
+
+. %%RC_SUBR%%
+
+name="mydns"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${mydns_enable="NO"}
+
+command="%%PREFIX%%/sbin/mydns"
+command_args="-b"
+pidfile="/var/run/mydns.pid"
+required_files="%%PREFIX%%/etc/mydns.conf"
+
+run_rc_command "$1"
diff --git a/dns/mydns/files/patch-configure b/dns/mydns/files/patch-configure
deleted file mode 100644
index 65ebf6726437..000000000000
--- a/dns/mydns/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig      Fri Mar 28 11:51:06 2003
-+++ configure   Fri Mar 28 11:51:21 2003
-@@ -7803,6 +7803,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
diff --git a/dns/mydns/pkg-message b/dns/mydns/files/pkg-message.in
index ba5c5b91050b..a4840bb5b715 100644
--- a/dns/mydns/pkg-message
+++ b/dns/mydns/files/pkg-message.in
@@ -1,11 +1,14 @@
 **********************************************************************
 To get MyDNS working you will need to do some configuration, first you
-will need to create %%%PREFIX%%%/etc/mydns.conf based on the
+will need to create %%PREFIX%%/etc/mydns.conf based on the
 installed sample file. Following that you will need to setup your
 database tables, you can use the output of
-%%%PREFIX%%%/sbin/mydns --create-tables
-as a template.
 
-If you're upgrading from a version before 0.9.12 then please read the
-instructions at http://mydns.bboy.net/ptr.html before running MyDNS
+ %%PREFIX%%/sbin/mydns --create-tables
+
+as a template. Finally enable MyDNS by adding
+
+ mydns_enable="YES"
+
+into your rc.conf.
 *********************************************************************
diff --git a/dns/mydns/pkg-plist b/dns/mydns/pkg-plist
index 791e30a5e0ac..90017934acca 100644
--- a/dns/mydns/pkg-plist
+++ b/dns/mydns/pkg-plist
@@ -4,7 +4,6 @@ bin/mydnsexport
 bin/mydnsimport
 bin/mydnsptrconvert
 etc/mydns.conf.sample
-etc/rc.d/mydns.sh.sample
 sbin/mydns
 %%NLS%%share/locale/es/LC_MESSAGES/mydns.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mydns.mo