From owner-svn-ports-head@FreeBSD.ORG Tue Dec 16 13:45:55 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C21D1D4; Tue, 16 Dec 2014 13:45:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC59A32A; Tue, 16 Dec 2014 13:45:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBGDjsgU095027; Tue, 16 Dec 2014 13:45:54 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBGDjs2T095025; Tue, 16 Dec 2014 13:45:54 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201412161345.sBGDjs2T095025@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 16 Dec 2014 13:45:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374805 - in head/security/p5-openxpki: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2014 13:45:55 -0000 Author: mat Date: Tue Dec 16 13:45:53 2014 New Revision: 374805 URL: https://svnweb.freebsd.org/changeset/ports/374805 QAT: https://qat.redports.org/buildarchive/r374805/ Log: Don't overwrite Perl's lddlflags, and remove a bunch of checks, we always ship with -shared. With hat: perl Sponsored by: Absolight Added: head/security/p5-openxpki/files/patch-Makefile.PL (contents, props changed) Modified: head/security/p5-openxpki/Makefile Modified: head/security/p5-openxpki/Makefile ============================================================================== --- head/security/p5-openxpki/Makefile Tue Dec 16 13:35:01 2014 (r374804) +++ head/security/p5-openxpki/Makefile Tue Dec 16 13:45:53 2014 (r374805) @@ -3,6 +3,7 @@ PORTNAME= openxpki PORTVERSION= 0.25.0.1 +PORTREVISION= 1 CATEGORIES= security perl5 PKGNAMEPREFIX= p5- DIST_SUBDIR= openxpki Added: head/security/p5-openxpki/files/patch-Makefile.PL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/p5-openxpki/files/patch-Makefile.PL Tue Dec 16 13:45:53 2014 (r374805) @@ -0,0 +1,66 @@ +--- Makefile.PL.orig 2014-12-02 20:05:23 UTC ++++ Makefile.PL +@@ -249,49 +249,6 @@ else { + print STDERR "Logger is not installed. Continue anyway.\n"; + } + +-# check if we should add -shared +-# not all platforms support this feature +-my %flags = (); +- +-open $fh, '>test.c' or die "Cannot open test.c. Stopped"; +-print $fh "int main() {}\n"; +-close $fh; +-use Config; +-my $cc = $Config{'cc'}; +- +-my $cc_supports_shared = 1; +-if (open $fh, "$cc -shared -o test test.c 2>&1 |") { +- while (my $line = <$fh>) { +- if ($line =~ m{ unrecognized .* option .* -shared }xms) { +- $cc_supports_shared = 0; +- } +- } +- close $fh; +- if ($CHILD_ERROR) { +- $cc_supports_shared = 0; +- } +- +- if (! $cc_supports_shared) +- { +- print STDERR "C compiler does not support -shared.\n"; +- } +- else { +- if ($^O ne 'darwin') { +- print STDERR "C compiler supports -share. Adding it to LDDLFLAGS.\n"; +- $flags{'LDDLFLAGS'} = '-shared'; +- } +- else { +- print STDERR "C compiler claims to support -share. But we are on Mac OS X, experience shows that it still does not work with -share, so we won't add it to LDDLFLAGS ...\n"; +- } +- } +-} +-else { +- print STDERR "Could not run C compiler. Continue anyway.\n"; +-} +- +-unlink('test.c'); +-unlink('test'); +- + # See lib/ExtUtils/MakeMaker.pm for details of how to influence + # the contents of the Makefile that is written. + WriteMakefile( +@@ -299,7 +256,6 @@ WriteMakefile( + 'VERSION' => $openxpki_version, + 'LIBS' => ["-L$openssl_lib_dir -lcrypto"], + 'INC' => "-I. -I$openssl_inc_dir", +- 'CCFLAGS' => '-O2 -g '.$Config{ccflags}, + 'PREREQ_PM' => { + # 'Class::Accessor::Fast' => '0.31', # Constituent of module Class::Accessor + # # which is a prerequisite of Class::Accessor::Chained, see below +@@ -397,5 +353,4 @@ WriteMakefile( + 't/cfg.binary.openssl']}, + 'XSPROTOARG' => '-noprototypes', + 'EXE_FILES' => [ 'bin/openxpkictl','bin/openxpkicmd', 'bin/openxpkiadm', 'bin/openxpkicli'], +- %flags, + );