diff options
| author | dinoex <dinoex@FreeBSD.org> | 2014-04-13 00:58:26 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2014-04-13 00:58:26 +0800 |
| commit | e4deae7ad1f3a76342b464f194cd47200e067d54 (patch) | |
| tree | 9322eefc9b7b0674e64f98a473e386f1a28aec00 | |
| parent | 223f9942d32be9062c9f52443e0b7166b2035f1b (diff) | |
| download | freebsd-ports-gnome-e4deae7ad1f3a76342b464f194cd47200e067d54.tar.gz freebsd-ports-gnome-e4deae7ad1f3a76342b464f194cd47200e067d54.tar.zst freebsd-ports-gnome-e4deae7ad1f3a76342b464f194cd47200e067d54.zip | |
- fix perl path for CURRENT
PR: 188486
| -rw-r--r-- | security/openssl/files/patch-Configure | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure index cbb673a6854b..4ec9dd2c36d6 100644 --- a/security/openssl/files/patch-Configure +++ b/security/openssl/files/patch-Configure @@ -1,5 +1,5 @@ ---- Configure.orig 2012-03-03 14:18:06.000000000 +0100 -+++ Configure 2012-03-25 19:22:16.000000000 +0200 +--- Configure.orig 2014-03-17 17:14:20.000000000 +0100 ++++ Configure 2014-04-12 17:20:19.000000000 +0200 @@ -150,7 +150,7 @@ # which has to be accompanied by explicit -D_THREAD_SAFE and # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which @@ -9,7 +9,7 @@ #config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib -@@ -407,19 +407,20 @@ +@@ -409,19 +409,20 @@ "android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### *BSD [do see comment about ${BSDthreads} above!] @@ -39,3 +39,16 @@ "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -1922,10 +1923,12 @@ + if ( $perl =~ m@^/@) { + &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); + &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); ++ &dofile("apps/tsget",$perl,'^#!/', '#!%s'); + } else { + # No path for Perl known ... + &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); + &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); ++ &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s'); + } + if ($depflags ne $default_depflags && !$make_depend) { + print <<EOF; |