Ticket #11672: maradns-1.1.55_to_1.2.12.05.diff

File maradns-1.1.55_to_1.2.12.05.diff, 7.2 KB (added by boeyms@…, 18 years ago)
  • net/maradns/Portfile

    diff -Naur dports/net/maradns/Portfile dports-devel/net/maradns/Portfile
    old new  
    33PortSystem 1.0
    44
    55name                    maradns
    6 version                 1.1.55
     6version                 1.2.12.05
     7
     8set branch              [strsed ${version} {s/\.[0-9]*\.[0-9]*$//}]
     9
    710categories              net
    811platforms               darwin
    9 maintainers             nomaintainer@macports.org
     12maintainers             boeyms@fastmail.fm openmaintainer@macports.org
    1013description             DNS server supporting authoritative, recursive and caching DNS
    1114long_description        MaraDNS is a fully functional DNS server supporting \
    1215                        authoritative DNS, recursive DNS, and caching DNS.
    1316
    1417homepage                http://www.maradns.org/
    15 master_sites    http://www.maradns.org/download/1.1/
    16 checksums               md5 8f42f1e1de21fdd5287f58985e189a32
     18master_sites            http://www.maradns.org/download/${branch}/${version} \
     19                        sourceforge
     20                       
     21checksums               md5     b0094bf223fe052f4551c6a20391ba92 \
     22                        sha1    4b250eed12dd8d8551d020bd270abaebac41e329
    1723use_bzip2               yes
    1824
     25patchfiles              patch-configure patch-install.darwin
     26
     27post-extract {
     28        cd ${worksrcpath}
     29# Delete unneeded stress-testing code (not built by default).  It may be worth
     30# adding this as a variant in a future revision.
     31        file delete -force sqa
     32# Delete Portuguese documentation sources (documentation not built by default;
     33# will need to add a section to build these docs if localisation desired)
     34        file delete -force doc/pt_br
     35# Delete unneeded English documentation sources (documentation already built)
     36# and support files that will otherwise be installed in the doc directories
     37        file delete -force doc/en/source
     38        file delete doc/en/man/read.manpage
     39        file delete doc/en/pdf/tmac.an.patch
     40        eval file delete [glob doc/en/*/{Makefile,*.embed,make.*}]
     41# Fix installation script (called by "make install") so that configuration
     42# files and directories are placed in destroot
     43        reinplace "s|\$RPM_BUILD_ROOT|${destroot}${prefix}|g" build/install.sh
     44# Fix hardcoding of default paths to chroot, log and zone file dirs, and
     45# configuration file, in source and docs. copy.devs.c is only used if maradns
     46# is built for Solaris, and maraconf.sh is neither installed by default nor yet
     47# by this Portfile, but hey.
     48        set marabindocpages     "duende maradns mararc zoneserver"
     49        set marasetupdocpages   "authoritative compile convert dangling \
     50                dnsmaster dnsslave dnstcp quick_start recursive update"
     51        set marareinplace       "s|/etc/mara|${prefix}/etc/mara|g"
     52        foreach docpage ${marabindocpages} {
     53                eval reinplace "${marareinplace}" \
     54                doc/en/text/man.${docpage}.txt \
     55                doc/en/tutorial/man.${docpage}.html
     56        }
     57        foreach docpage ${marasetupdocpages} {
     58                eval reinplace "${marareinplace}" \
     59                doc/en/text/${docpage}.txt \
     60                doc/en/tutorial/${docpage}.html
     61        }
     62        eval reinplace "${marareinplace}" \
     63                MaraDns.h \
     64                build/copy.devs.c \
     65                parse/ParseMaraRc.c \
     66                tools/maraconf.sh \
     67                doc/en/QuickStart \
     68                doc/en/examples/example_authoritative_mararc.txt \
     69                doc/en/examples/example_full_mararc \
     70                doc/en/examples/example_mararc \
     71                doc/en/examples/example_recursive_mararc.txt \
     72                doc/en/man/duende.8 \
     73                doc/en/man/maradns.8 \
     74                doc/en/man/zoneserver.8 \
     75                doc/en/man/mararc.5
     76}
     77
     78
    1979configure.pre_args
    2080
    2181build.target
     
    2383destroot.env    PREFIX=${destroot}${prefix}
    2484destroot.destdir
    2585
     86# Keep chroot directory for duende (monitors and logs maradns instances)
     87#
     88# (This places a .turd file in the logger directory, but the duende man page
     89# states that it requires a _blank_ logger directory to run (emphasis added).
     90# Testing has not revealed any interference from the .turd file so far, but
     91# the testing done may not have been exhaustive (I don't know enough about
     92# chroot jails).)
     93destroot.keepdirs       ${destroot}${prefix}/etc/maradns/logger
     94
    2695post-destroot {
    27         xinstall -m 755 -d ${destroot}${prefix}/etc/maradns/logger
    28         xinstall -m 644 ${filespath}/mararc ${destroot}${prefix}/etc/maradns
    29         reinplace "s|__PREFIX__|${prefix}|g" ${destroot}${prefix}/etc/maradns/mararc
    30         file delete -force ${destroot}${prefix}/maradns-${version}
     96# Delete remaining unneeded build files; this also deletes the man page for
     97# the mqhash tool, which is not installed by default, but it appears to be only
     98# for development testing.
     99        file delete -force \
     100                ${destroot}${prefix}/share/doc/maradns-${version}/Makefile \
     101                ${destroot}${prefix}/share/doc/maradns-${version}/man
     102        file rename ${destroot}${prefix}/etc/mararc \
     103                ${destroot}${prefix}/etc/example-mararc
    31104}
    32105
    33106startupitem.create      yes
     
    36109startupitem.start       "\[ -x \${BIN} \] && \${BIN} &; echo \$! > \${PID}"
    37110startupitem.stop        "\[ -r \${PID} \] && /bin/kill \$(cat \${PID})"
    38111
     112post-install {
     113        ui_msg "***************************************************************"
     114        ui_msg "* To make MaraDNS functional, you will need to create"
     115        ui_msg "* ${prefix}/etc/mararc.  Please read the mararc man page"
     116        ui_msg "* for details.  Example mararc files are in"
     117        ui_msg "* ${prefix}/share/doc/maradns-${version}/examples ."
     118        ui_msg "***************************************************************"
     119}
     120
    39121platform darwin 8 {
    40122        build.args      CC="/usr/bin/gcc-4.0 -DDARWIN"
    41123}
    42124
     125variant authonly {
     126        configure.args-append   --authonly
     127        startupitem.init        \
     128                "PID=${prefix}/var/run/${name}.pid\nBIN=${prefix}/sbin/maradns.authonly"
     129}
  • net/maradns/files/mararc

    diff -Naur dports/net/maradns/files/mararc dports-devel/net/maradns/files/mararc
    old new  
    1 ipv4_bind_addresses = "127.0.0.1"
    2 chroot_dir = "__PREFIX__/etc/maradns"
    3 recursive_acl = "127.0.0.1"
    4 hide_disclaimer = "NO"
    5 
  • net/maradns/files/patch-configure

    diff -Naur dports/net/maradns/files/patch-configure dports-devel/net/maradns/files/patch-configure
    old new  
     1--- configure   2006-05-16 09:28:36.000000000 +1000
     2+++ configure.new       2007-02-02 16:53:12.000000000 +1100
     3@@ -114,7 +114,7 @@
     4        echo \(if you typed in \"make\" before, just type it again\)
     5        echo
     6        echo THIS PORT HAS NOT BEEN FULLY TESTED\; USE AT YOUR OWN RISK
     7-       EXITCODE=1
     8+       EXITCODE=0
     9 # This is a a template for adding support to a new OS for MaraDNS.
     10 # Some points: If you port MaraDNS, make sure the underlying OS has
     11 # /dev/urandom support or have the default mararc have a
  • net/maradns/files/patch-install.darwin

    diff -Naur dports/net/maradns/files/patch-install.darwin dports-devel/net/maradns/files/patch-install.darwin
    old new  
     1--- build/install.darwin        2005-02-20 06:04:35.000000000 +1100
     2+++ build/install.darwin.new    2007-02-04 16:52:16.000000000 +1100
     3@@ -35,7 +35,7 @@
     4 # The directory to put man pages which describe the server programs
     5 MAN8="$PREFIX/share/man/man8/"
     6 # The directory to put a copy of the MaraDNS documents on the system
     7-DOCS="$PREFIX/maradns-$VERSION"
     8+DOCS="$PREFIX/share/doc/maradns-$VERSION"
     9 
     10 # Mandrake does not have a /usr/local/man.  Ugh.
     11 # As a result, we need the following kludge to get this to