[153826] trunk/dports/net

mf2k at macports.org mf2k at macports.org
Wed Oct 12 23:23:03 CEST 2016


Revision: 153826
          https://trac.macports.org/changeset/153826
Author:   mf2k at macports.org
Date:     2016-10-12 14:23:02 -0700 (Wed, 12 Oct 2016)
Log Message:
-----------
ldns ldns-tools drill: Merge into single Portfile.

Modified Paths:
--------------
    trunk/dports/net/ldns/Portfile

Removed Paths:
-------------
    trunk/dports/net/drill/Portfile
    trunk/dports/net/ldns-tools/Portfile

Deleted: trunk/dports/net/drill/Portfile
===================================================================
--- trunk/dports/net/drill/Portfile	2016-10-12 14:44:21 UTC (rev 153825)
+++ trunk/dports/net/drill/Portfile	2016-10-12 21:23:02 UTC (rev 153826)
@@ -1,34 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-
-name                drill
-version             1.6.17
-categories          net devel
-platforms           darwin
-license             BSD
-maintainers         nomaintainer
-
-description         A dig-style dnssec-aware dns debugging tool
-long_description    Drill is a tool ala dig from BIND. \
-                    It was designed with DNSSEC in mind and should be a useful \
-                    debugging/query tool for DNSSEC.
-
-homepage            http://www.nlnetlabs.nl/projects/drill/
-master_sites        http://www.nlnetlabs.nl/downloads/ldns/
-
-checksums           rmd160  5382cfaafa7ec1fadcf390f804fbf14e04d7c03a \
-                    sha256  8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd
-
-distname            ldns-${version}
-dist_subdir         ldns
-
-depends_build       bin:glibtool:libtool
-depends_lib         port:ldns path:lib/libssl.dylib:openssl
-
-worksrcdir          ldns-${version}/drill
-configure.args      --mandir=${prefix}/share/man --with-ldns=${prefix} --with-ssl=${prefix}
-
-livecheck.type      regex
-livecheck.url       http://www.nlnetlabs.nl/projects/ldns/
-livecheck.regex     "The latest release is (\\d+(?:\\.\\d+)*)"

Modified: trunk/dports/net/ldns/Portfile
===================================================================
--- trunk/dports/net/ldns/Portfile	2016-10-12 14:44:21 UTC (rev 153825)
+++ trunk/dports/net/ldns/Portfile	2016-10-12 21:23:02 UTC (rev 153826)
@@ -1,18 +1,35 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
 
 name                ldns
+subport             ldns-tools {}
+subport             drill {}
+
 version             1.6.17
 categories          net devel
 platforms           darwin
 license             BSD
 maintainers         nomaintainer
 
-description         DNS library in C
-long_description    ldns is a library with the aim of simplifying DNS \
-                    programming in C. It is heavily based upon the Net::DNS module from \
-                    Perl.
+if {${subport} eq "ldns"} {
+    description         DNS library in C
+    long_description    ldns is a library with the aim of simplifying DNS \
+                        programming in C. It is heavily based upon the Net::DNS module from \
+                        Perl.
+}
+if {${subport} eq "ldns-tools"} {
+    description         Tools for working with dns and dnssec.
+    long_description    Tools as examples to the ldns library. \
+                        Useful for debugging/querying dns/dnssec servers.
+}
+if {${subport} eq "drill"} {
+    description         A dig-style dnssec-aware dns debugging tool
+    long_description    Drill is a tool ala dig from BIND. \
+                        It was designed with DNSSEC in mind and should be a useful \
+                        debugging/query tool for DNSSEC.
+}
 
 homepage            http://www.nlnetlabs.nl/projects/ldns/
 master_sites        http://www.nlnetlabs.nl/downloads/ldns/
@@ -20,23 +37,52 @@
 checksums           rmd160  5382cfaafa7ec1fadcf390f804fbf14e04d7c03a \
                     sha256  8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd
 
+if {${subport} ne "ldns"} {
+    distname            ldns-${version}
+    dist_subdir         ldns
+}
+
 depends_build       bin:glibtool:libtool
 depends_lib         path:lib/libssl.dylib:openssl
 
-configure.args      --mandir=${prefix}/share/man --with-ssl=${prefix}
-configure.cppflags  -I${worksrcpath}/include
-build.type          gnu
+if {${subport} eq "ldns-tools"} {
+    depends_lib-append  port:ldns \
+                        port:libpcap
+}
+if {${subport} eq "drill"} {
+    depends_lib-append  port:ldns
+}
 
-pre-destroot {
-    reinplace "s,defined(@\$also),@\$also," ${worksrcpath}/doc/doxyparse.pl
+if {${subport} eq "ldns-tools"} {
+    worksrcdir          ldns-${version}/examples
 }
+if {${subport} eq "drill"} {
+    worksrcdir          ldns-${version}/drill
+}
+if {${subport} eq "ldns"} {
+    configure.args      --mandir=${prefix}/share/man --with-ssl=${prefix}
+} else {
+    configure.args      --mandir=${prefix}/share/man --with-ldns=${prefix} --with-ssl=${prefix}
+}
+if {${subport} eq "ldns"} {
+    configure.cppflags  -I${worksrcpath}/include
+}
+if {${subport} ne "drill"} {
+    build.type          gnu
+}
 
-post-destroot {
-    # Install pkg-config files not installed by the Makefile
-    reinplace "s/-arch \[^ \]*//g" ${worksrcpath}/packaging/libldns.pc
-    file mkdir ${destroot}${prefix}/lib/pkgconfig/
-    file copy ${worksrcpath}/packaging/libldns.pc \
-        ${destroot}${prefix}/lib/pkgconfig/libldns.pc
+if {${subport} eq "ldns"} {
+    pre-destroot {
+        reinplace "s,defined(@\$also),@\$also," ${worksrcpath}/doc/doxyparse.pl
+    }
+
+    post-destroot {
+        # Install pkg-config files not installed by the Makefile
+        reinplace "s/-arch \[^ \]*//g" ${worksrcpath}/packaging/libldns.pc
+        file mkdir ${destroot}${prefix}/lib/pkgconfig/
+        file copy ${worksrcpath}/packaging/libldns.pc \
+            ${destroot}${prefix}/lib/pkgconfig/libldns.pc
+    }
 }
 
 livecheck.type      regex

Deleted: trunk/dports/net/ldns-tools/Portfile
===================================================================
--- trunk/dports/net/ldns-tools/Portfile	2016-10-12 14:44:21 UTC (rev 153825)
+++ trunk/dports/net/ldns-tools/Portfile	2016-10-12 21:23:02 UTC (rev 153826)
@@ -1,34 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-
-name                ldns-tools
-version             1.6.17
-categories          net devel
-platforms           darwin
-license             BSD
-maintainers         nomaintainer
-
-description         Tools for working with dns and dnssec.
-long_description    Tools as examples to the ldns library. \
-                    Useful for debugging/querying dns/dnssec servers.
-
-homepage            http://www.nlnetlabs.nl/projects/ldns/
-master_sites        http://www.nlnetlabs.nl/downloads/ldns/
-
-checksums           rmd160  5382cfaafa7ec1fadcf390f804fbf14e04d7c03a \
-                    sha256  8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd
-
-distname            ldns-${version}
-dist_subdir         ldns
-
-depends_build       bin:glibtool:libtool
-depends_lib         port:ldns path:lib/libssl.dylib:openssl port:libpcap
-
-worksrcdir          ldns-${version}/examples
-configure.args      --mandir=${prefix}/share/man --with-ldns=${prefix} --with-ssl=${prefix}
-build.type          gnu
-
-livecheck.type      regex
-livecheck.url       http://www.nlnetlabs.nl/projects/ldns/
-livecheck.regex     "The latest release is (\\d+(?:\\.\\d+)*)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161012/0633888d/attachment-0002.html>


More information about the macports-changes mailing list