aboutsummaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-03-15 15:39:21 +0000
committerRob Austein <sra@hactrn.net>2013-03-15 15:39:21 +0000
commit8e91fc9bea8380f1465d0d81ac79541dc6d8080a (patch)
treed34d933e89bb3ed622bcbc38125c987aa970ad85 /buildtools
parent54b254dc5a689cf21f95cdca9dd1e9f3da550fb2 (diff)
Support ports of other branches.
svn path=/trunk/; revision=5158
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/build-freebsd-ports.py3
-rw-r--r--buildtools/freebsd-skeleton/rpki-ca/Makefile4
-rw-r--r--buildtools/freebsd-skeleton/rpki-rp/Makefile4
3 files changed, 6 insertions, 5 deletions
diff --git a/buildtools/build-freebsd-ports.py b/buildtools/build-freebsd-ports.py
index 456543fe..5bcf9d21 100644
--- a/buildtools/build-freebsd-ports.py
+++ b/buildtools/build-freebsd-ports.py
@@ -59,7 +59,8 @@ shutil.copytree(os.path.join(svndir, "buildtools", "freebsd-skeleton"), portsdir
base_rp = os.path.join(portsdir, "rpki-rp")
base_ca = os.path.join(portsdir, "rpki-ca")
-formatdict = { "SVNVERSION" : svnversion }
+formatdict = dict(SVNVERSION = svnversion,
+ SVNBRANCH = branch)
for port in ("rpki-rp", "rpki-ca"):
diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile
index aa0165b2..0ddc5f1d 100644
--- a/buildtools/freebsd-skeleton/rpki-ca/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile
@@ -2,8 +2,8 @@ PORTNAME= rpki-ca
PORTVERSION= 0.%(SVNVERSION)s
CATEGORIES= net
MASTER_SITES= http://download.rpki.net/
-DISTFILES= rpki-trunk-r%(SVNVERSION)s.tar.xz
-WRKSRC= ${WRKDIR}/rpki-trunk-r%(SVNVERSION)s
+DISTFILES= rpki-%(SVNBRANCH)s-r%(SVNVERSION)s.tar.xz
+WRKSRC= ${WRKDIR}/rpki-%(SVNBRANCH)s-r%(SVNVERSION)s
MAINTAINER= sra@hactrn.net
COMMENT= rpki.net RPKI CA tools
diff --git a/buildtools/freebsd-skeleton/rpki-rp/Makefile b/buildtools/freebsd-skeleton/rpki-rp/Makefile
index acf61df2..d55ed91d 100644
--- a/buildtools/freebsd-skeleton/rpki-rp/Makefile
+++ b/buildtools/freebsd-skeleton/rpki-rp/Makefile
@@ -2,8 +2,8 @@ PORTNAME= rpki-rp
PORTVERSION= 0.%(SVNVERSION)s
CATEGORIES= net
MASTER_SITES= http://download.rpki.net/
-DISTFILES= rpki-trunk-r%(SVNVERSION)s.tar.xz
-WRKSRC= ${WRKDIR}/rpki-trunk-r%(SVNVERSION)s
+DISTFILES= rpki-%(SVNBRANCH)s-r%(SVNVERSION)s.tar.xz
+WRKSRC= ${WRKDIR}/rpki-%(SVNBRANCH)s-r%(SVNVERSION)s
MAINTAINER= sra@hactrn.net
COMMENT= rpki.net RPKI relying party tools