Attachment 147063 Details for Bug 193085 – dns/dnscheckengine STAGE cleanup

[patch] dns/dnscheckengine STAGE cleanup

2014-09-07.diff (text/plain), 4.86 KB, created by Chris Hutchinson on 2014-09-08 13:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-09-08 13:40:02 UTC

Size: 4.86 KB

patch

obsolete

>Index: dnscheckengine/Makefile
>===================================================================
>--- dnscheckengine/Makefile	(revision 366359)
>+++ dnscheckengine/Makefile	(working copy)
>@@ -8,9 +8,11 @@
> 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 \
>@@ -39,7 +41,6 @@
> 
> OPTIONS_DEFINE=		MYSQL DOCS
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMYSQL}
>@@ -48,35 +49,6 @@
> 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'
>@@ -91,16 +63,16 @@
> .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
>+		${STAGEDIR}${PREFIX}/etc/rc.d/dnscheck-dispatcher
>+	@${LN} -s ${STAGEDIR}${PREFIX}/libexec/dnscheck/dnscheck-dispatcher ${STAGEDIR}${PREFIX}/bin/dnscheck-dispatcher
> 	@${ECHO} bin/dnscheck-dispatcher >> ${TMPPLIST}
> .endif
>-	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} SU_CMD="${SU_CMD}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>+	@PKG_PREFIX=${STAGEDIR}${PREFIX} BATCH=${BATCH} SU_CMD="${SU_CMD}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> .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}
>Index: dnscheckengine/files/pkg-install.in
>===================================================================
>--- dnscheckengine/files/pkg-install.in	(revision 366359)
>+++ dnscheckengine/files/pkg-install.in	(working copy)
>@@ -12,7 +12,7 @@
>     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
>+cd ${PKG_PREFIX} && ln -s /usr/local/libexec/dnscheck/dnscheck bin/dnscheckengine
> 
> fi
> exit 0
>Index: dnscheckengine/pkg-plist
>===================================================================
>--- dnscheckengine/pkg-plist	(revision 366359)
>+++ dnscheckengine/pkg-plist	(working copy)
>@@ -7,6 +7,31 @@
> @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

Actions: View | Diff

Attachments on bug 193085: 146426 | 146427 | 146893 | 146895 | 147063