* fixes DEPENDS setting (missing `+').

* use perl5/module.mk and its stuff for perl module build
* using packlist, so PLIST entries for perl modules are not required.
* PKG_SYSCONFSUBDIR is handled automatically, no need to be in PLIST.
* fix substitute handling with USE_DESTDIR=yes.

Bump PKGREVISION.
This commit is contained in:
obache 2011-08-19 12:16:33 +00:00
parent aed62afa7b
commit 5181a6c5d2
4 changed files with 25 additions and 154 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.7 2011/08/14 14:42:45 obache Exp $
# $NetBSD: Makefile,v 1.8 2011/08/19 12:16:33 obache Exp $
#
DISTNAME= dnssec-tools-1.10
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.dnssec-tools.org/download/
@ -13,9 +13,8 @@ LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS= p5-Net-DNS-SEC-[0-9]*:../../security/p5-Net-DNS-SEC
DEPENDS= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
DEPENDS= p5-ExtUtils-MakeMaker-[0-9]*:../../devel/p5-ExtUtils-MakeMaker
DEPENDS+= p5-Net-DNS-SEC-[0-9]*:../../security/p5-Net-DNS-SEC
DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
BUILD_DEFS+= IPV6_READY
@ -38,7 +37,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-nsec3
CONFIGURE_ARGS+= --with-resolv-conf=${PKG_SYSCONFDIR}/dnssec-tools/resolv.conf
CONFIGURE_ARGS+= --with-root-hints=${PKG_SYSCONFDIR}/dnssec-tools/root.hints
CONFIGURE_ARGS+= --with-perl-build-args="INSTALLDIRS=vendor DESTDIR=${DESTDIR}"
CONFIGURE_ARGS+= --with-perl-build-args=${MAKE_PARAMS:Q}
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
@ -59,7 +58,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/validator/etc/resolv.conf ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/validator/etc/root.hints ${DESTDIR}${EGDIR}
.include "../../lang/perl5/packlist.mk"
.include "../../lang/perl5/buildlink3.mk"
PERL5_CONFIGURE= no
.include "../../lang/perl5/module.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2011/07/27 05:30:31 pettai Exp $
@comment $NetBSD: PLIST,v 1.5 2011/08/19 12:16:33 obache Exp $
bin/getaddr
bin/gethost
bin/getname
@ -15,149 +15,6 @@ include/validator/validator.h
lib/libsres.la
lib/libval-threads.la
lib/libval_shim.la
lib/perl5/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/perllocal.pod
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/Donuts/Rule.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Bind.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Csv.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Dns.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Dump.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Itar.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Libval.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Makefile.PL
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Mf.pm
lib/perl5/vendor_perl/5.12.0/Net/DNS/SEC/Tools/TrustAnchor/Secspider.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/BootStrap.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/QWPrimitives.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/conf.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/defaults.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/dnssectools.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/keyrec.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/keyrec.pod
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/rolllog.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/rollmgr.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/rollrec.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/rollrec.pod
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/timetrans.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Tools/tooloptions.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/Validator.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/SEC/defines.pl
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/DNS/ZoneFile/Fast.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/Net/addrinfo.pm
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/Dnspktflow/dnspktflow/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/Donuts/donuts/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/Drawvalmap/drawvalmap/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/Maketestzone/maketestzone/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/Mapper/mapper/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Tools/conf/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Validator/Validator.bs
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/DNS/SEC/Validator/Validator.so
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/addrinfo/addrinfo.bs
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/Net/addrinfo/addrinfo.so
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/convertar/.packlist
lib/perl5/vendor_perl/5.12.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/dnssec-tools/.packlist
lib/perl5/vendor_perl/bin/blinkenlights
lib/perl5/vendor_perl/bin/bubbles
lib/perl5/vendor_perl/bin/cleanarch
lib/perl5/vendor_perl/bin/cleankrf
lib/perl5/vendor_perl/bin/convertar
lib/perl5/vendor_perl/bin/dnspktflow
lib/perl5/vendor_perl/bin/donuts
lib/perl5/vendor_perl/bin/donutsd
lib/perl5/vendor_perl/bin/drawvalmap
lib/perl5/vendor_perl/bin/dtck
lib/perl5/vendor_perl/bin/dtconf
lib/perl5/vendor_perl/bin/dtconfchk
lib/perl5/vendor_perl/bin/dtdefs
lib/perl5/vendor_perl/bin/dtinitconf
lib/perl5/vendor_perl/bin/expchk
lib/perl5/vendor_perl/bin/fixkrf
lib/perl5/vendor_perl/bin/genkrf
lib/perl5/vendor_perl/bin/getdnskeys
lib/perl5/vendor_perl/bin/getds
lib/perl5/vendor_perl/bin/keyarch
lib/perl5/vendor_perl/bin/krfcheck
lib/perl5/vendor_perl/bin/lights
lib/perl5/vendor_perl/bin/lsdnssec
lib/perl5/vendor_perl/bin/lskrf
lib/perl5/vendor_perl/bin/lsroll
lib/perl5/vendor_perl/bin/maketestzone
lib/perl5/vendor_perl/bin/mapper
lib/perl5/vendor_perl/bin/rollchk
lib/perl5/vendor_perl/bin/rollctl
lib/perl5/vendor_perl/bin/rollerd
lib/perl5/vendor_perl/bin/rollinit
lib/perl5/vendor_perl/bin/rolllog
lib/perl5/vendor_perl/bin/rollrec-editor
lib/perl5/vendor_perl/bin/rollset
lib/perl5/vendor_perl/bin/signset-editor
lib/perl5/vendor_perl/bin/tachk
lib/perl5/vendor_perl/bin/timetrans
lib/perl5/vendor_perl/bin/trustman
lib/perl5/vendor_perl/bin/zonesigner
lib/perl5/vendor_perl/man/man1/blinkenlights.1
lib/perl5/vendor_perl/man/man1/bubbles.1
lib/perl5/vendor_perl/man/man1/cleanarch.1
lib/perl5/vendor_perl/man/man1/cleankrf.1
lib/perl5/vendor_perl/man/man1/convertar.1
lib/perl5/vendor_perl/man/man1/dnspktflow.1
lib/perl5/vendor_perl/man/man1/donuts.1
lib/perl5/vendor_perl/man/man1/donutsd.1
lib/perl5/vendor_perl/man/man1/drawvalmap.1
lib/perl5/vendor_perl/man/man1/dtck.1
lib/perl5/vendor_perl/man/man1/dtconf.1
lib/perl5/vendor_perl/man/man1/dtconfchk.1
lib/perl5/vendor_perl/man/man1/dtdefs.1
lib/perl5/vendor_perl/man/man1/dtinitconf.1
lib/perl5/vendor_perl/man/man1/expchk.1
lib/perl5/vendor_perl/man/man1/fixkrf.1
lib/perl5/vendor_perl/man/man1/genkrf.1
lib/perl5/vendor_perl/man/man1/getdnskeys.1
lib/perl5/vendor_perl/man/man1/getds.1
lib/perl5/vendor_perl/man/man1/keyarch.1
lib/perl5/vendor_perl/man/man1/krfcheck.1
lib/perl5/vendor_perl/man/man1/lights.1
lib/perl5/vendor_perl/man/man1/lsdnssec.1
lib/perl5/vendor_perl/man/man1/lskrf.1
lib/perl5/vendor_perl/man/man1/lsroll.1
lib/perl5/vendor_perl/man/man1/maketestzone.1
lib/perl5/vendor_perl/man/man1/mapper.1
lib/perl5/vendor_perl/man/man1/rollchk.1
lib/perl5/vendor_perl/man/man1/rollctl.1
lib/perl5/vendor_perl/man/man1/rollerd.1
lib/perl5/vendor_perl/man/man1/rollinit.1
lib/perl5/vendor_perl/man/man1/rolllog.1
lib/perl5/vendor_perl/man/man1/rollrec-editor.1
lib/perl5/vendor_perl/man/man1/rollset.1
lib/perl5/vendor_perl/man/man1/signset-editor.1
lib/perl5/vendor_perl/man/man1/tachk.1
lib/perl5/vendor_perl/man/man1/timetrans.1
lib/perl5/vendor_perl/man/man1/trustman.1
lib/perl5/vendor_perl/man/man1/zonesigner.1
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::BootStrap.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::Donuts::Rule.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::QWPrimitives.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Bind.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Csv.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Dns.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Dump.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Itar.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Libval.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Mf.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::TrustAnchor::Secspider.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::conf.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::defaults.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::dnssectools.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::keyrec.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::rolllog.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::rollmgr.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::rollrec.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::timetrans.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Tools::tooloptions.3
lib/perl5/vendor_perl/man/man3/Net::DNS::SEC::Validator.3
lib/perl5/vendor_perl/man/man3/Net::DNS::ZoneFile::Fast.3
lib/perl5/vendor_perl/man/man3/Net::addrinfo.3
man/man1/dnssec-tools.1
man/man1/getaddr.1
man/man1/gethost.1
@ -210,4 +67,3 @@ share/dnssec-tools/donuts/rules/recommendations.rules.txt
share/examples/dnssec-tools/dnsval.conf
share/examples/dnssec-tools/resolv.conf
share/examples/dnssec-tools/root.hints
@pkgdir etc/dnssec-tools

View file

@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.5 2011/07/27 05:33:03 pettai Exp $
$NetBSD: distinfo,v 1.6 2011/08/19 12:16:33 obache Exp $
SHA1 (dnssec-tools-1.10.tar.gz) = d0123ede6fdd7bd3fcee377338790a9029766563
RMD160 (dnssec-tools-1.10.tar.gz) = 1678b5bd9e0893be337c8a2f0704e5dd859496db
Size (dnssec-tools-1.10.tar.gz) = 2871794 bytes
SHA1 (patch-aa) = cf0f806152bf912d9e6d727f66bdb186ec2f55c7
SHA1 (patch-ab) = 07b5a0dbbca1c41cbb30b19f5a94ec9f8c900c15
SHA1 (patch-tools_donuts_Makefile.PL) = 283447b2e1ac4a83f462743ef2a397c3a29b87a1

View file

@ -0,0 +1,15 @@
$NetBSD: patch-tools_donuts_Makefile.PL,v 1.1 2011/08/19 12:16:33 obache Exp $
* fixes installed location reference.
--- tools/donuts/Makefile.PL.orig 2011-01-04 18:36:36.000000000 +0000
+++ tools/donuts/Makefile.PL
@@ -31,7 +31,7 @@ installrulefiles:
$(INSTALL) rules/*.txt $(RULESDIR)
installfixpaths:
- $(PERL) -p -i -e "s|/usr/local/share|$(PREFIX)/share|" $(DISTDIR)/$(INSTALLBIN)/donuts
+ $(PERL) -p -i -e "s|/usr/local/share|$(PREFIX)/share|" $(DESTINSTALLVENDORBIN)/donuts
';
}