diff options
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/build-freebsd-ports.py | 3 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-ca/Makefile | 4 | ||||
| -rw-r--r-- | buildtools/freebsd-skeleton/rpki-rp/Makefile | 4 |
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 |