Stage dns/dnscheckengine and assign maintainership to submitter

PR:		193085
Submitted by:	Chris Hutchinson
Reworked by:	marino

5 files changed, 68 insertions, 114 deletions

diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index 9df62380924f..e7362d785de0 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -3,14 +3,16 @@
 
 PORTNAME=	dnscheckengine
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	dns perl5
 MASTER_SITES=	ftp://www.ns.gen.tx.us/pub/software/dnscheck-se/
 DISTNAME=	DNSCheck-1.1
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	DNS checker from the folks that run the .SE top level domain
 
+LICENSE=	BSD2CLAUSE
+
 BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random \
 		p5-Digest-BubbleBabble>=0:${PORTSDIR}/security/p5-Digest-BubbleBabble \
 		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
@@ -23,86 +25,49 @@ BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
 		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
 		p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite
+		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
+		p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
+		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
 USES=		perl5
 USE_PERL5=	configure
+USE_MYSQL=	yes
 CONFIGURE_SCRIPT+=	Makefile.PL INSTALLSITESCRIPT=${PREFIX}/libexec/dnscheck
 
 WRKSRC=		${WRKDIR}/engine
 
 DOCSDIR=	${PREFIX}/share/doc/DNSCheck
-DOCS=		data-flow-batch.png DNSCheck.graffle data-flow-web.png call-flow.png database-schema.pdf
+DOCS=		data-flow-batch.png DNSCheck.graffle data-flow-web.png \
+		call-flow.png database-schema.pdf
 DOCSDB=		indexes.sql schema.sql drop.sql
-PORTDOCS=	${DOCS} db
-SUB_FILES=	pkg-install pkg-deinstall pkg-message
+PORTDOCS=	*
+SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		MYSQL DOCS
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMYSQL}
-BUILD_DEPENDS+=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-USE_MYSQL=	yes
-.endif
-
-MAN1=	dnscheck-zonediff.1 \
-	dnscheck-dispatcher.1 \
-	dnscheck-preflight.1 \
-	dnscheck-hostsyntax.1 \
-	dnscheck.1 \
-	dnscheck-12hourmailer.1
-
-MAN3=	DNSCheck::Test::Nameserver.3 \
-	DNSCheck::Config.3 \
-	DNSCheck.3 \
-	DNSCheck::Lookup::DNS.3 \
-	DNSCheck::Test::Consistency.3 \
-	DNSCheck::Test::Host.3 \
-	DNSCheck::Test::Connectivity.3 \
-	DNSCheck::Overview.3 \
-	DNSCheck::Test::Address.3 \
-	DNSCheck::Test::DNSSEC.3 \
-	DNSCheck::Test::SMTP.3 \
-	DNSCheck::Lookup::ASN.3 \
-	DNSCheck::Test::Zone.3 \
-	DNSCheck::Logger.3 \
-	DNSCheck::Test::Common.3 \
-	DNSCheck::Test::Delegation.3 \
-	DNSCheck::Test::SOA.3 \
-	DNSCheck::Lookup::Resolver.3 \
-	DNSCheck::Test::Mail.3
-
-MANCOMPRESSED=	no
-
 post-patch:
-	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
-		-e 's,%%PREFIX%%,${PREFIX},g'
-.if ${PORT_OPTIONS:MMYSQL}
-	@@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/contrib/dnscheck-dispatcher.sh
-.endif
-
-pre-install:
-	-@${FIND} ${WRKSRC} -name \*.orig -delete
+	@${FIND} ${WRKSRC} -name \*.orig -delete
+	@${GREP} -Rl '%%[[:alpha:]]\+%%' ${WRKSRC} | \
+		${XARGS} ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g'
+	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#" \
+		${WRKSRC}/contrib/dnscheck-dispatcher.sh
 
 post-install:
-.if ${PORT_OPTIONS:MMYSQL}
-# install startup script (if WITH_MYSQL is defined)
-	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnscheck-dispatcher.sh \
-		${PREFIX}/etc/rc.d/dnscheck-dispatcher
-	@${LN} -s ${PREFIX}/libexec/dnscheck/dnscheck-dispatcher ${PREFIX}/bin/dnscheck-dispatcher
-	@${ECHO} bin/dnscheck-dispatcher >> ${TMPPLIST}
-.endif
-	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} SU_CMD="${SU_CMD}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/dnscheck-dispatcher.sh \
+		${STAGEDIR}${PREFIX}/etc/rc.d/dnscheck-dispatcher
+	(cd ${STAGEDIR}${PREFIX}/bin && \
+		${LN} -s ../libexec/dnscheck/dnscheck-dispatcher . && \
+		${LN} -s ../libexec/dnscheck/dnscheck dnscheckengine)
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/db
-	@${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
-	@${INSTALL_DATA} '${WRKSRC}/doc/DNSCheck Lib Descriptions.pdf' ${DOCSDIR}
-	@${INSTALL_DATA} ${DOCSDB:S|^|${WRKSRC}/db/|} ${DOCSDIR}/db
-
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/db
+	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} '${WRKSRC}/doc/DNSCheck Lib Descriptions.pdf' \
+		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DOCSDB:S|^|${WRKSRC}/db/|} ${STAGEDIR}${DOCSDIR}/db
 .endif
-	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/dns/dnscheckengine/files/pkg-deinstall.in b/dns/dnscheckengine/files/pkg-deinstall.in
deleted file mode 100644
index 37490ab0c1f0..000000000000
--- a/dns/dnscheckengine/files/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PKG_PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-
-
-if [ "$2" != "DEINSTALL" ]; then
-    exit 0
-fi
-if [ -f ${PKG_PREFIX}/etc/rc.d/dnscheck-dispatcher ]; then
-    echo '===>   Stopping dnscheck dispatcher if it is running'
-    ${PKG_PREFIX}/etc/rc.d/dnscheck-dispatcher stop >/dev/null 2>/dev/null
-    echo '===>   Removing startup script for dnscheck dispatcher'
-    rm -f ${PKG_PREFIX}/etc/rc.d/dnscheck-dispatcher stop
-fi
-
-
-exit 0
diff --git a/dns/dnscheckengine/files/pkg-install.in b/dns/dnscheckengine/files/pkg-install.in
deleted file mode 100644
index a12a15b40d9e..000000000000
--- a/dns/dnscheckengine/files/pkg-install.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# $FreeBSD$ 
-#
-
-PKG_PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-
-if [ "$2" = "POST-INSTALL" ];then
-
-if [ -f ${PKG_PREFIX}/etc/rc.d/dnscheck-dispatcher  ]; then
-    echo '***Please add dns_dispatcher_enable="YES" to /etc/rc.conf to enable dnscheck-se-dispatcher to run at startup.***'
-    chmod +x ${PKG_PREFIX}/etc/rc.d/dnscheck-dispatcher
-    fi
-# install a link to put the dnscheck engine into the regular $PATH for more users
-
-ln -s ${PKG_PREFIX}/libexec/dnscheck/dnscheck ${PKG_PREFIX}/bin/dnscheckengine
-
-fi
-exit 0
diff --git a/dns/dnscheckengine/pkg-descr b/dns/dnscheckengine/pkg-descr
index cdab27fa5d81..bdaf93edbc62 100644
--- a/dns/dnscheckengine/pkg-descr
+++ b/dns/dnscheckengine/pkg-descr
@@ -1,6 +1,7 @@
-DNSCheck is a program that is designed to help people check, measure and 
-hopefully also understand the workings of the Domain Name System. When used to 
-check an domain (aka zone) is submitted to DNSCheck, it will investigate the
-general health by performing various tests and sanity checks.
+DNSCheck is a program that is designed to help people check, measure and
+hopefully also understand the workings of the Domain Name System. When
+used to check an domain (aka zone) is submitted to DNSCheck, it will
+investigate the general health by performing various tests and sanity
+checks.
 
 WWW: http://dnscheck.iis.se/
diff --git a/dns/dnscheckengine/pkg-plist b/dns/dnscheckengine/pkg-plist
index 174698c71fa0..8b3bf085593d 100644
--- a/dns/dnscheckengine/pkg-plist
+++ b/dns/dnscheckengine/pkg-plist
@@ -1,12 +1,37 @@
+bin/dnscheck-dispatcher
+bin/dnscheckengine
+etc/rc.d/dnscheck-dispatcher
 libexec/dnscheck/dnscheck
 libexec/dnscheck/dnscheck-12hourmailer
 libexec/dnscheck/dnscheck-dispatcher
 libexec/dnscheck/dnscheck-hostsyntax
 libexec/dnscheck/dnscheck-preflight
 libexec/dnscheck/dnscheck-zonediff
-@dirrm libexec/dnscheck
-bin/dnscheckengine
-%%PORTDOCS%%%%DOCSDIR%%/DNSCheck Lib Descriptions.pdf
+man/man1/dnscheck-zonediff.1.gz
+man/man1/dnscheck-dispatcher.1.gz
+man/man1/dnscheck-preflight.1.gz
+man/man1/dnscheck-hostsyntax.1.gz
+man/man1/dnscheck.1.gz
+man/man1/dnscheck-12hourmailer.1.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Nameserver.3.gz
+%%PERL5_MAN3%%/DNSCheck::Config.3.gz
+%%PERL5_MAN3%%/DNSCheck.3.gz
+%%PERL5_MAN3%%/DNSCheck::Lookup::DNS.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Consistency.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Host.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Connectivity.3.gz
+%%PERL5_MAN3%%/DNSCheck::Overview.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Address.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::DNSSEC.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::SMTP.3.gz
+%%PERL5_MAN3%%/DNSCheck::Lookup::ASN.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Zone.3.gz
+%%PERL5_MAN3%%/DNSCheck::Logger.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Common.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Delegation.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::SOA.3.gz
+%%PERL5_MAN3%%/DNSCheck::Lookup::Resolver.3.gz
+%%PERL5_MAN3%%/DNSCheck::Test::Mail.3.gz
 %%SITE_PERL%%/DNSCheck.pm
 %%SITE_PERL%%/DNSCheck/Test/Address.pm
 %%SITE_PERL%%/DNSCheck/Test/Consistency.pm
@@ -28,13 +53,14 @@ bin/dnscheckengine
 %%SITE_PERL%%/DNSCheck/Lookup/DNS.pm
 %%SITE_PERL%%/DNSCheck/Lookup/Resolver.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNSCheck/.packlist
-@dirrm %%SITE_PERL%%/DNSCheck/Test
-@dirrm %%SITE_PERL%%/DNSCheck/Lookup
-@dirrm %%SITE_PERL%%/DNSCheck
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNSCheck
 share/dnscheck/locale/en.yaml
 share/dnscheck/locale/sv.yaml
 share/dnscheck/config.yaml
 share/dnscheck/policy.yaml
+@dirrm %%SITE_PERL%%/DNSCheck/Test
+@dirrm %%SITE_PERL%%/DNSCheck/Lookup
+@dirrm %%SITE_PERL%%/DNSCheck
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNSCheck
+@dirrm libexec/dnscheck
 @dirrmtry share/dnscheck/locale
 @dirrmtry share/dnscheck