mk/svn-package.mk: fix checkout of a revision in a single repository

[Roland Illig <rillig%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Roland Illig <rillig%NetBSD.org@localhost>
Pushed By:	rillig
Date:		Sat Mar 3 14:52:20 2018 +0000
Changeset:	78e07e09420f54796f71239aab77cc82ad350383

Modified Files:
	mk-scm-tests/files/test
	mk/svn-package.mk

Log Message:
mk/svn-package.mk: fix checkout of a revision in a single repository

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78e07e09420f54796f71239aab77cc82ad350383

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk-scm-tests/files/test | 21 +++++++++++----------
 mk/svn-package.mk       |  5 +++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diffs:
diff --git a/mk-scm-tests/files/test b/mk-scm-tests/files/test
index 2633193dac..6d6a5f02cd 100644
--- a/mk-scm-tests/files/test
+++ b/mk-scm-tests/files/test
@@ -192,7 +192,7 @@ test_scm() { # usage: test_scm scm-name
 	(fossil)	scm_display_name="Fossil"	scm_tag_varname="FOSSIL_VERSION";;
 	(git)		scm_display_name="Git"		scm_tag_varname="GIT_TAG"	;;
 	(hg)		scm_display_name="Mercurial"	scm_tag_varname="HG_TAG"	;;
-	(svn)		scm_display_name="Subversion"	scm_tag_varname=""		;;
+	(svn)		scm_display_name="Subversion"	scm_tag_varname="SVN_REVISION"	;;
 	esac
 
 	# Sets up a repository in $repodir, with these commits:
@@ -209,26 +209,27 @@ test_scm() { # usage: test_scm scm-name
 	step "Testing $scm_display_name"
 	SCM_UNDER_TEST="$1" pkgsrc_make clean
 	SCM_UNDER_TEST="$1" pkgsrc_make patch
-
+	:
 	assert_that --file "$wrkdir/pkgbase/today" --has-content "2018-03-01"
 
 	step "Testing $scm_display_name with CHECKOUT_DATE"
 	SCM_UNDER_TEST="$1" pkgsrc_make clean
 	SCM_UNDER_TEST="$1" CHECKOUT_DATE="2018-02-01" pkgsrc_make patch
-
+	:
 	assert_that --file "$wrkdir/pkgbase/today" --has-content "2018-01-01"
 
-	if [ "$scm_tag_varname" ]; then
-		step "Testing $scm_display_name with tagged checkout"
-		SCM_UNDER_TEST="$1" pkgsrc_make clean
-		eval "SCM_UNDER_TEST=\"\$1\" $scm_tag_varname=\"v2017\" pkgsrc_make patch"
-
-		assert_that --file "$wrkdir/pkgbase/today" --has-content "2017-01-01"
-	fi
+	step "Testing $scm_display_name with tagged checkout"
+	SCM_UNDER_TEST="$1" pkgsrc_make clean
+	tag_value="v2017"; test "$1" = "svn" && tag_value="1"
+	eval "SCM_UNDER_TEST=\"\$1\" $scm_tag_varname=\"\$tag_value\" pkgsrc_make patch"
+	:
+	assert_that --file "$wrkdir/pkgbase/today" --has-content "2017-01-01"
 
 	step "Dumping API variables for $scm_display_name (for manual inspection)"
 	SCM_UNDER_TEST="$1" pkgsrc_make clean
 	SCM_UNDER_TEST="$1" pkgsrc_make "show-all-$1"
+	:
+	: "needs to be inspected manually"
 }
 
 main() {
diff --git a/mk/svn-package.mk b/mk/svn-package.mk
index 1460d3e6c5..03ee9b259f 100644
--- a/mk/svn-package.mk
+++ b/mk/svn-package.mk
@@ -60,6 +60,11 @@ SVN_MODULE?=		${SVN_REPO:S,/$,,:S,/trunk$,,:S,/code$,,:T}
 SVN_REPOSITORIES+=	default
 SVN_REPO.default=	${SVN_REPO}
 SVN_MODULE.default=	${SVN_MODULE}
+.  for varbase in SVN_REVISION
+.    if defined(${varbase})
+${varbase}.default=	${${varbase}}
+.    endif
+.  endfor
 WRKSRC?=		${WRKDIR}/${SVN_MODULE}
 .endif