[csw-devel] SF.net SVN: gar:[5912] csw/mgar/pkg/curl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5912
          http://gar.svn.sourceforge.net/gar/?rev=5912&view=rev
Author:   dmichelsen
Date:     2009-08-07 12:44:29 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
curl: Update to 7.19.5 and enhance merge phase

Modified Paths:
--------------
    csw/mgar/pkg/curl/trunk/Makefile
    csw/mgar/pkg/curl/trunk/checksums

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2009-08-07 11:31:00 UTC (rev 5911)
+++ csw/mgar/pkg/curl/trunk/Makefile	2009-08-07 12:44:29 UTC (rev 5912)
@@ -1,5 +1,5 @@
 GARNAME = curl
-GARVERSION = 7.19.4
+GARVERSION = 7.19.5
 CATEGORIES = net
 
 DESCRIPTION = Command line tool and library for client-side URL transfers.
@@ -43,31 +43,32 @@
 
 SKIPTEST = 1
 
+EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-32.h,p"
+EXTRA_PAX_ARGS_64 = -s ",^\.$(includedir)/curl/curlbuild.h$$,.$(includedir)/curl/curlbuild-64.h,p"
+EXTRA_PAX_ARGS_isa-sparcv8 = $(EXTRA_PAX_ARGS_32)
+EXTRA_PAX_ARGS_isa-sparcv9 = $(EXTRA_PAX_ARGS_64)
+EXTRA_PAX_ARGS_isa-i386 = $(EXTRA_PAX_ARGS_32)
+EXTRA_PAX_ARGS_isa-amd64 = $(EXTRA_PAX_ARGS_64)
+
 PKGFILES_CSWcurldevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWcurlrt  = $(PKGFILES_RT)
 
 include gar/category.mk
 
 post-install-isa-sparcv8:
-	@cp $(FILEDIR)/libcurl.so.3.0.0.s $(INSTALLISADIR)/opt/csw/lib/libcurl.so.3.0.0
-	@cp $(FILEDIR)/libcurl.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2
-	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.3.0.0 libcurl.so.3 )
-	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.2.0.2 libcurl.so.2 )
-	@mv $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-32.h
-	@cp $(FILEDIR)/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h
-	$(DONADA)
+	@ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(INSTALLISADIR)$(libdir)/libcurl.so.3.0.0
+	@ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(INSTALLISADIR)$(libdir)/libcurl.so.2.0.2
+	@ln -s libcurl.so.3.0.0 $(INSTALLISADIR)$(libdir)/libcurl.so.3
+	@ln -s libcurl.so.2.0.2 $(INSTALLISADIR)$(libdir)/libcurl.so.2
+	@$(MAKECOOKIE)
 
-post-install-isa-sparcv9:
-	@mv $(INSTALLISADIR)/opt/csw/include/curl/curlbuild.h $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-64.h
-	$(DONADA)
-
-post-merge-isa-sparcv9:
-	@cp $(INSTALLISADIR)/opt/csw/include/curl/curlbuild-64.h $(PKGROOT)/opt/csw/include/curl/curlbuild-64.h
-	$(DONADA)
-
 post-install-isa-i386:
 	@cp $(FILEDIR)/libcurl.so.3.0.0.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.3.0.0
 	@cp $(FILEDIR)/libcurl.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libcurl.so.2.0.2
-	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.3.0.0 libcurl.so.3 )
-	@( cd $(INSTALLISADIR)/opt/csw/lib; ln -s libcurl.so.2.0.2 libcurl.so.2 )
-	$(DONADA)
+	@ln -s libcurl.so.3.0.0 $(INSTALLISADIR)$(libdir)/libcurl.so.3
+	@ln -s libcurl.so.2.0.2 $(INSTALLISADIR)$(libdir)libcurl.so.2
+	@$(MAKECOOKIE)
+
+post-merge:
+	ginstall $(FILEDIR)/curlbuild.h $(PKGROOT)$(includedir)/curl/curlbuild.h
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/curl/trunk/checksums
===================================================================
--- csw/mgar/pkg/curl/trunk/checksums	2009-08-07 11:31:00 UTC (rev 5911)
+++ csw/mgar/pkg/curl/trunk/checksums	2009-08-07 12:44:29 UTC (rev 5912)
@@ -1,6 +1,6 @@
-2734167c1e5f7ce6be99b75d2d371d85  download/curl-7.19.4.tar.bz2
-b63de55fb90feba487b1fd21e751d248  download/libcurl.so.3.0.0.s
+426d161661dce70c8ea9ad8f553363a3  download/curl-7.19.5.tar.bz2
+5aebb27149d80000d1107b58d65b551b  download/curlbuild.h
+a09fcad6dfcd9636061dfab7598357be  download/libcurl.so.2.0.2.i
 b46b41659b805013740eeb76e759af4b  download/libcurl.so.2.0.2.s
 30e826ef67b6ce799b32154250014dd9  download/libcurl.so.3.0.0.i
-a09fcad6dfcd9636061dfab7598357be  download/libcurl.so.2.0.2.i
-5aebb27149d80000d1107b58d65b551b  download/curlbuild.h
+b63de55fb90feba487b1fd21e751d248  download/libcurl.so.3.0.0.s


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