[csw-devel] SF.net SVN: gar:[18007] csw/mgar/pkg/wget/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 18007
          http://gar.svn.sourceforge.net/gar/?rev=18007&view=rev
Author:   dmichelsen
Date:     2012-05-12 20:44:02 +0000 (Sat, 12 May 2012)
Log Message:
-----------
wget/trunk: Use just one CA fixing #4942 and use reinplacements for other things

Modified Paths:
--------------
    csw/mgar/pkg/wget/trunk/Makefile

Modified: csw/mgar/pkg/wget/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wget/trunk/Makefile	2012-05-12 16:52:20 UTC (rev 18006)
+++ csw/mgar/pkg/wget/trunk/Makefile	2012-05-12 20:44:02 UTC (rev 18007)
@@ -37,6 +37,19 @@
 EXTRA_MODULATORS = STATIC
 MODULATIONS_STATIC = disable enable
 
+# Use the same CA as OpenSSL as reported in #4942
+REINPLACEMENTS += capath
+REINPLACE_MATCH_capath = /etc/ssl/certs
+REINPLACE_WITH_capath = /etc/opt/csw/ssl/certs
+REINPLACE_FILES_capath += src/gnutls.c
+
+# Make sure our perl is used as the /usr/bin/perl lacks some needed modules
+REINPLACEMENTS += cswperl
+REINPLACE_MATCH_cswperl = \#!/usr/bin/env perl
+REINPLACE_WITH_cswperl = \#!/opt/csw/bin/perl
+REINPLACE_FILES_cswperl += tests/*.px
+REINPLACE_FILES_cswperl += tests/run-px
+
 EXTRA_CONFIGURE_STATIC-disable += --with-ssl
 # NTLM can only be enabled when used with OpenSSL instead of the defaulting GnuTLS
 #EXTRA_CONFIGURE_STATIC-disable += --enable-ntlm
@@ -62,12 +75,6 @@
 
 include gar/category.mk
 
-post-extract-modulated:
-	@# Make sure our perl is used as the /usr/bin/perl lacks some needed modules
-	-perl -pi -e 's,#!/usr/bin/env perl,#!/opt/csw/bin/perl,' \
-		$(WORKSRC)/tests/*.px \
-		$(WORKSRC)/tests/run-px
-
 merge-copy-static-wget-only:
 	ginstall $(INSTALLISADIR)$(bindir)/wget $(PKGROOT)$(bindir)/wget.static
 	@$(MAKECOOKIE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.