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

[dmichelsen at users.sourceforge.net]

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

Log Message:
-----------
curl: Some cosmetics

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

Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile	2009-08-07 13:25:41 UTC (rev 5914)
+++ csw/mgar/pkg/curl/trunk/Makefile	2009-08-07 13:30:12 UTC (rev 5915)
@@ -26,17 +26,17 @@
 CATALOGNAME_CSWcurlrt = curlrt
 CATALOGNAME_CSWcurldevel = curldevel
 
-# Upstream check seem to interfere with build on 8s?
-#UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+SPKG_SOURCEURL = http://curl.haxx.se
 
-LIBDEPS += lib/openssl
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+
 CONFIGURE_ARGS = $(DIRPATHS) --with-ssl
 
 #Can't build amd64 until openldap has an amd64 build (Mantis 3028)
 #BUILD64 = 1
 EXTRA_BUILD_ISAS_sparc = sparcv9
 
-REQUIRED_PKGS_CSWcurl = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt
+REQUIRED_PKGS_CSWcurl  = CSWiconv CSWlibidn CSWlibnet CSWoldaprt CSWosslrt
 REQUIRED_PKGS_CSWcurl += CSWsasl CSWzlib CSWcurlrt
 REQUIRED_PKGS_CSWcurlrt = CSWlibidn CSWlibnet CSWoldaprt CSWosslrt CSWzlib CSWsasl
 REQUIRED_PKGS_CSWcurldevel = CSWcurlrt
@@ -47,26 +47,26 @@
 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)
+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)
+PKGFILES_CSWcurldevel = $(PKGFILES_DEVEL)
+PKGFILES_CSWcurlrt = $(PKGFILES_RT)
 
 include gar/category.mk
 
 post-install-isa-sparcv8:
-	@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
+	ginstall $(FILEDIR)/libcurl.so.3.0.0.s $(DESTDIR)$(libdir)/libcurl.so.3.0.0
+	ginstall $(FILEDIR)/libcurl.so.2.0.2.s $(DESTDIR)$(libdir)/libcurl.so.2.0.2
+	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
+	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
 	@$(MAKECOOKIE)
 
 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
-	@ln -s libcurl.so.3.0.0 $(INSTALLISADIR)$(libdir)/libcurl.so.3
-	@ln -s libcurl.so.2.0.2 $(INSTALLISADIR)$(libdir)libcurl.so.2
+	cp $(FILEDIR)/libcurl.so.3.0.0.i $(DESTDIR)$(libdir)/libcurl.so.3.0.0
+	cp $(FILEDIR)/libcurl.so.2.0.2.i $(DESTDIR)$(libdir)/libcurl.so.2.0.2
+	ln -s libcurl.so.3.0.0 $(DESTDIR)$(libdir)/libcurl.so.3
+	ln -s libcurl.so.2.0.2 $(DESTDIR)$(libdir)/libcurl.so.2
 	@$(MAKECOOKIE)
 
 post-merge:


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