diff options
| -rw-r--r-- | security/tinyca/Makefile | 6 | ||||
| -rw-r--r-- | security/tinyca/files/patch-tinyca2 | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile index aeaad9cd1b41..c254daa15d0e 100644 --- a/security/tinyca/Makefile +++ b/security/tinyca/Makefile @@ -7,7 +7,7 @@ PORTNAME= tinyca PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= http://tinyca.sm-zone.net/ \ http://tinyca.sm-zone.net/old/ @@ -39,7 +39,9 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/lib/GUI/${file} ${SITE_PERL}/${PORTNAME}/GUI .endfor @${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${PREFIX}/etc/tinyca.cnf.sample - @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" -e "s:%%SITE_PERL%%:${SITE_PERL}:g" \ + @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ + -e "s:%%SITE_PERL%%:${SITE_PERL}:g" \ + -e "s:%%OPENSSLBASE%%:${OPENSSLBASE}:g" \ ${WRKSRC}/tinyca2 >${WRKSRC}/tinyca.new @${INSTALL_SCRIPT} ${WRKSRC}/tinyca.new ${PREFIX}/bin/tinyca diff --git a/security/tinyca/files/patch-tinyca2 b/security/tinyca/files/patch-tinyca2 index f008fb96a795..0fc0551890cf 100644 --- a/security/tinyca/files/patch-tinyca2 +++ b/security/tinyca/files/patch-tinyca2 @@ -12,18 +12,20 @@ $FreeBSD$ } use strict; -@@ -53,8 +53,8 @@ +@@ -55,9 +55,9 @@ + my $init = {}; # location of openssl - $init->{'opensslbin'} = "/usr/bin/openssl"; +-$init->{'opensslbin'} = "/usr/bin/openssl"; -$init->{'zipbin'} = "/usr/bin/zip"; -$init->{'tarbin'} = "/bin/tar"; ++$init->{'opensslbin'} = "%%OPENSSLBASE%%/bin/openssl"; +$init->{'zipbin'} = "%%PREFIX%%/bin/zip"; +$init->{'tarbin'} = "/usr/bin/tar"; if(not -x $init->{'opensslbin'}) { printf(gettext("Can't execute %s.\n"), $init->{'opensslbin'}); -@@ -73,7 +73,7 @@ +@@ -76,7 +76,7 @@ } # directory with the templates |