[csw-devel] SF.net SVN: gar:[4141] csw/mgar/pkg/cmake/trunk

[valholla at users.sourceforge.net]

Revision: 4141
          http://gar.svn.sourceforge.net/gar/?rev=4141&view=rev
Author:   valholla
Date:     2009-04-01 21:20:21 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
isafix and misc changes

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

Property Changed:
----------------
    csw/mgar/pkg/cmake/trunk/


Property changes on: csw/mgar/pkg/cmake/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2009-04-01 21:19:28 UTC (rev 4140)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2009-04-01 21:20:21 UTC (rev 4141)
@@ -1,5 +1,5 @@
 GARNAME = cmake
-GARVERSION = 2.6.2
+GARVERSION = 2.6.3
 CATEGORIES = devel
 
 DESCRIPTION = Cross-platform make
@@ -15,19 +15,25 @@
 UPSTREAM_MASTER_SITES = http://www.cmake.org/files/
 MASTER_SITES = http://www.cmake.org/files/v2.6/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWcmake)
 
-# We define upstream file regex so we can be notifed of new upstream software release
+PACKAGES = CSWcmake
+CATALOGNAME_CSWcmake = cmake
+SPKG_DESC_CSWcmake = $(DESCRIPTION)
+
+REQUIRED_PKGS_CSWcmake  = CSWcurlrt CSWexpat CSWlibidn CSWoldaprt
+REQUIRED_PKGS_CSWcmake += CSWosslrt CSWxmlrpc-c CSWzlib 
+
+# We define upstream file regex so we can be notifed of 
+# new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 datadir = /share/$(GARNAME)-$(GARVERSION)
 sharedstatedir = /share
 docdir = /share/doc/$(GARNAME)-$(GARVERSION)
 
+NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS) --docdir=$(docdir)
 
-SKIPTEST = 1
-
 include gar/category.mk
 
 FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(GARNAME)-$(GARVERSION)/Modules
@@ -40,12 +46,29 @@
 	@echo "Docdir: $(docdir)"
 	# Do NOT include the CSW include pathes here
 	(cd $(WORKSRC); /usr/bin/env \
-		CFLAGS="$($(GARCOMPILER)_CC_$(GARFLAVOR))" \
-		CXXFLAGS="$($(GARCOMPILER)_CXX_$(GARFLAVOR))" \
+		CFLAGS="$($(GARCOMPILER)_CC_$(GARFLAVOR)) -I/opt/csw/include" \
+		CXXFLAGS="$($(GARCOMPILER)_CXX_$(GARFLAVOR)) -I/opt/csw/include" \
+		LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -R/opt/csw/lib" \
 		./bootstrap \
 		--prefix=$(prefix)	\
 		--datadir=$(datadir)	\
 		--docdir=$(docdir)	\
 		--mandir=/man		\
+		--system-libs \
 	)
 	@$(MAKECOOKIE)
+
+post-configure-modulated:
+	@(echo "==> Forcing use of system libraries")
+	@(echo "=====> curl, expat, xmlrpc, and zlib")
+	@(perl -i -plne 's/USE_SYSTEM_CURL:BOOL=OFF/USE_SYSTEM_CURL:BOOL=ON/' \
+		$(WORKSRC)/CMakeCache.txt)
+	@(perl -i -plne 's/USE_SYSTEM_EXPAT:BOOL=OFF/USE_SYSTEM_EXPAT:BOOL=ON/' \
+		$(WORKSRC)/CMakeCache.txt)
+	@(perl -i -plne 's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/' \
+		$(WORKSRC)/CMakeCache.txt)
+	@(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/' \
+		$(WORKSRC)/CMakeCache.txt)
+	@$(MAKECOOKIE)
+
+

Modified: csw/mgar/pkg/cmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/cmake/trunk/checksums	2009-04-01 21:19:28 UTC (rev 4140)
+++ csw/mgar/pkg/cmake/trunk/checksums	2009-04-01 21:20:21 UTC (rev 4141)
@@ -1,2 +1,2 @@
-9e82aa3beb991aa8e5797cf330618d42  download/cmake-2.6.2.tar.gz
+5ba47a94ce276f326abca1fd72a7e7c6  download/cmake-2.6.3.tar.gz
 871d267960a850d05e99246f5c438e62  download/CSWcmake.gspec


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