From 4888588fda6c07859a891a8d0da709b21b6f2155 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 15 Aug 2013 11:38:35 +0200
Subject: [PATCH] makedist.sh for git + git in READMEs

---
 README      |  2 +-
 README.git  |  5 ++---
 makedist.sh | 28 +++++++++++-----------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/README b/README
index 0c21e655..e8abfab3 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ INSTALLATION
 
 If you are building from the repository you will need to have (gnu)
 autotools like libtool and autoreconf installed. A list of all the commands
-needed to build everything can be found in README.svn. Note that the actual
+needed to build everything can be found in README.git. Note that the actual
 commands may be a little bit different on your machine. Most notable, you'll need to run libtoolize (or glibtoolize), if you skip this step, you'll get an error about missing config.sub.
 
 * Developers
diff --git a/README.git b/README.git
index cd402d49..174ea97c 100644
--- a/README.git
+++ b/README.git
@@ -1,6 +1,5 @@
-
-# The ldns subversion repository can found at:
-# www.nlnetlabs.nl/ldns/svn/
+# The ldns git repository can found at:
+# git.nlnetlabs.nl/ldns/
 
 # small list of commands to build all on a linux system
 # libtoolize is needed for most other targets
diff --git a/makedist.sh b/makedist.sh
index 608fc652..4af22cd2 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 #
-# Build a LDNS distribution tar from the SVN repository.
-# Ripped from NSD. Adapted by Miek
+# Build a LDNS distribution tar from the GIT repository.
+# Ripped from NSD. Adapted by Miek. Adapted by Willem
 #
 
 # Abort script on unexpected errors.
@@ -14,7 +14,7 @@ cwd=`pwd`
 # Utility functions.
 usage () {
     cat >&2 <<EOF
-Usage $0: [-h] [-s] [-d SVN_root]
+Usage $0: [-h] [-s] [-c <tag/branch>]
 Generate a distribution tar file for libdns.
 
     -h           This usage information.
@@ -23,7 +23,7 @@ Generate a distribution tar file for libdns.
     -rc <nr>     Build a release candidate, the given string will be added
                  to the version number 
                  (which will then be ldns-<version>rc<number>)
-    -d SVN_root  Retrieve the libdns source from the specified repository.
+    -c <tag/br>  Checkout this tag or branch (defaults to master).
 EOF
     exit 1
 }
@@ -76,7 +76,7 @@ replace_all () {
     replace_text "$1" "@date@" "`date +'%b %e, %Y'`"
 }
     
-
+CHECKOUT="master"
 SNAPSHOT="no"
 RC="no"
 
@@ -86,8 +86,8 @@ while [ "$1" ]; do
         "-h")
             usage
             ;;
-        "-d")
-            SVNROOT="$2"
+        "-c")
+            CHECKOUT="$2"
             shift
             ;;
         "-s")
@@ -104,13 +104,7 @@ while [ "$1" ]; do
     shift
 done
 
-# Check if SVNROOT is specified.
-if [ -z "$SVNROOT" ]; then
-    error "SVNROOT must be specified (using -d)"
-fi
-
 # Start the packaging process.
-info "SVNROOT  is $SVNROOT"
 info "SNAPSHOT is $SNAPSHOT"
 
 #question "Do you wish to continue with these settings?" || error "User abort."
@@ -122,10 +116,10 @@ temp_dir=`mktemp -d ldns-dist-XXXXXX`
 info "Directory '$temp_dir' created."
 cd $temp_dir
 
-info "Exporting source from SVN."
-svn export "$SVNROOT" ldns || error_cleanup "SVN command failed"
-
-cd ldns || error_cleanup "LDNS not exported correctly from SVN"
+info "Exporting source from GIT"
+git clone git://git.nlnetlabs.nl/ldns/ || error_cleanup "git command failed"
+cd ldns || error_cleanup "LDNS not exported correctly from git"
+git checkout "$CHECKOUT" || error_cleanup "Could not checkout $CHECKOUT"
 
 info "Running  Libtoolize script (libtoolize)."
 libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."
-- 
2.47.3