diff options
| author | tron <tron@pkgsrc.org> | 2015-12-10 18:54:12 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2015-12-10 18:54:12 +0000 |
| commit | f99f456651d6f6762aaf241dde13e35c7779f18f (patch) | |
| tree | b143e22eb702c34ef43833888e4d4b4728389cb7 /security | |
| parent | 07aef4e08c1e5c425720479db81dfca34549fba9 (diff) | |
| download | pkgsrc-f99f456651d6f6762aaf241dde13e35c7779f18f.tar.gz | |
Fix build under (at least) NetBSD-current
Diffstat (limited to 'security')
| -rw-r--r-- | security/p5-GSSAPI/distinfo | 4 | ||||
| -rw-r--r-- | security/p5-GSSAPI/patches/patch-Makefile.PL | 44 |
2 files changed, 40 insertions, 8 deletions
diff --git a/security/p5-GSSAPI/distinfo b/security/p5-GSSAPI/distinfo index f08306d12b9..efa2030ee99 100644 --- a/security/p5-GSSAPI/distinfo +++ b/security/p5-GSSAPI/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:17:58 agc Exp $ +$NetBSD: distinfo,v 1.6 2015/12/10 18:54:12 tron Exp $ SHA1 (GSSAPI-0.28.tar.gz) = c857485532e92e266a75b56ed247284f94b2d3d4 RMD160 (GSSAPI-0.28.tar.gz) = 849d01d39851ec2726559d4f2b92832758a333ad SHA512 (GSSAPI-0.28.tar.gz) = 4bae4729c216da099f6f0479ef34874fa62c1afc57bf56860e1ce082e9e6a902ec072f9e976ab2f1914df1bbad6b6689af04a9867b3ca1a9f11d0287e58aa204 Size (GSSAPI-0.28.tar.gz) = 67915 bytes -SHA1 (patch-Makefile.PL) = 5cf70d9fd3f95f11a41db15869c9d63c1ca944d6 +SHA1 (patch-Makefile.PL) = c89bc56773586bec900b86fac78ef73b4a588200 diff --git a/security/p5-GSSAPI/patches/patch-Makefile.PL b/security/p5-GSSAPI/patches/patch-Makefile.PL index cffa544312c..6b30dd474fe 100644 --- a/security/p5-GSSAPI/patches/patch-Makefile.PL +++ b/security/p5-GSSAPI/patches/patch-Makefile.PL @@ -1,10 +1,12 @@ -$NetBSD: patch-Makefile.PL,v 1.1 2013/12/11 10:29:45 jperkin Exp $ +$NetBSD: patch-Makefile.PL,v 1.2 2015/12/10 18:54:12 tron Exp $ -Handle the pkgsrc krb5-config wrapper for SunOS. +1.) Handle the pkgsrc "krb5-config" wrapper for SunOS. +2.) Strip trailing linefeeds and other whitespace from the output of + the "krb5-config" wrapper to avoid generation of a broken makefile. ---- Makefile.PL.orig 2010-04-24 12:37:38.000000000 +0000 -+++ Makefile.PL -@@ -115,7 +115,7 @@ if (exists $options{gssapi_libs} || exis +--- Makefile.PL.orig 2010-04-24 13:37:38.000000000 +0100 ++++ Makefile.PL 2015-12-10 18:50:38.000000000 +0000 +@@ -115,7 +115,7 @@ unless ($libconf) { die "$krb5cmd does not respond libconf!"; } else { @@ -13,7 +15,7 @@ Handle the pkgsrc krb5-config wrapper for SunOS. $libconf = "-L/usr/lib -R/usr/lib -lgss"; } -@@ -153,7 +153,7 @@ if (exists $options{gssapi_libs} || exis +@@ -153,7 +153,7 @@ # $incconf = '-I/usr/include'; } @@ -22,3 +24,33 @@ Handle the pkgsrc krb5-config wrapper for SunOS. $incconf = "-I/usr/include/kerberosv5"; push @EXTRADEFINES, '-DSEAM'; } +@@ -240,20 +240,26 @@ + sub krb5_libconfig { + my ($cfgcmd) = @_; + $cfgcmd || die 'no $cfgcmd '; +- return `$cfgcmd --libs gssapi`; ++ my $output = `$cfgcmd --libs gssapi`; ++ chomp( $output ); ++ return $output; + } + #------------------------------------------------- + #------------------------------------------------- + sub krb5_cflags { + my ($cfgcmd) = @_; + $cfgcmd || die 'no $cfgcmd '; +- return `$cfgcmd --cflags gssapi`; ++ my $output = `$cfgcmd --cflags gssapi`; ++ chomp( $output ); ++ return $output; + } + #------------------------------------------------- + sub krb5_version { + my ($cfgcmd) = @_; + $cfgcmd || die 'no $cfgcmd '; +- return `$cfgcmd --version`; ++ my $output = `$cfgcmd --version`; ++ chomp( $output ); ++ return $output; + } + #------------------------------------------------- + #------------------------------------------------- |