[csw-devel] SF.net SVN: gar:[4043] csw/mgar/pkg/libcairo/trunk

[wbonnet at users.sourceforge.net]

Revision: 4043
          http://gar.svn.sourceforge.net/gar/?rev=4043&view=rev
Author:   wbonnet
Date:     2009-03-29 12:01:52 +0000 (Sun, 29 Mar 2009)

Log Message:
-----------
Upgrade to 1.8.6

Modified Paths:
--------------
    csw/mgar/pkg/libcairo/trunk/Makefile
    csw/mgar/pkg/libcairo/trunk/checksums
    csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec
    csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec
    csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2009-03-29 10:09:17 UTC (rev 4042)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2009-03-29 12:01:52 UTC (rev 4043)
@@ -9,40 +9,39 @@
 
 MASTER_SITES  = http://www.cairographics.org/releases/
 DISTFILES     = cairo-$(GARVERSION).tar.gz 
-PKGDIST       = cairo-$(GARVERSION).tar.gz 
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 SPKG_DESC_CSWlibcairo 		= $(DESCRIPTION)
 SPKG_DESC_CSWlibcairodevel 	= $(DESCRIPTION) development package
+SPKG_DESC_CSWlibcairodoc 	= $(DESCRIPTION) documentaiton
 
 DISTFILES    += $(call admfiles,CSWlibcairo, )
 DISTFILES    += $(call admfiles,CSWlibcairodevel, )
 DISTFILES    += $(call admfiles,CSWlibcairodoc, )
 
 PKGFILES_CSWlibcairodevel  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibcairodevel += $(prefix)/include/.*
-PKGFILES_CSWlibcairodevel += $(prefix)/lib/.*\.a
-PKGFILES_CSWlibcairodevel += $(prefix)/lib/pkgconfig/.*
+PKGFILES_CSWlibcairodevel += /opt/csw/share/doc/libcairo_devel/.*
+PKGFILES_CSWlibcairodoc    = $(prefix)/share/gtk-doc.*
+PKGFILES_CSWlibcairodoc   += /opt/csw/share/doc/libcairo_doc/.*
 
-PKGFILES_CSWlibcairodoc   += $(prefix)/share/gtk-doc.*
-
 REQUIRED_PKGS_CSWlibcairodevel  = CSWlibcairo
 REQUIRED_PKGS_CSWlibcairodoc    = 
-REQUIRED_PKGS_CSWlibcairo 	   += CSWlibx11
-REQUIRED_PKGS_CSWlibcairo 	   += CSWfconfig
-REQUIRED_PKGS_CSWlibcairo 	   += CSWftype2
-REQUIRED_PKGS_CSWlibcairo 	   += CSWlibxrender
-REQUIRED_PKGS_CSWlibcairo 	   += CSWpixman
-REQUIRED_PKGS_CSWlibcairo 	   += CSWpng
-REQUIRED_PKGS_CSWlibcairo 	   += CSWzlib
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWlibx11
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWfconfig
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWftype2
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWlibxrender
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWpixman
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWpng
+# REQUIRED_PKGS_CSWlibcairo 	   += CSWzlib
 
-CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
-LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
+# CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
+# CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
+# LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
 
-CONFIGURE_ARGS = --prefix=/opt/csw --mandir=/opt/csw/share/man --disable-tests --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x 
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-tests --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x 
 
 post-extract:
 	( cd  $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) ; \

Modified: csw/mgar/pkg/libcairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcairo/trunk/checksums	2009-03-29 10:09:17 UTC (rev 4042)
+++ csw/mgar/pkg/libcairo/trunk/checksums	2009-03-29 12:01:52 UTC (rev 4043)
@@ -1,4 +1,4 @@
 4e64139ef6f668df24450f3b81dd0771  download/cairo-1.8.6.tar.gz
-14919d48d4e00ee4e18fededcb1454ba  download/CSWlibcairo.gspec
-858cebcbabf59da9aaa959d915c6d1a9  download/CSWlibcairodevel.gspec
-081ffcd10145f9041df467a11342cc98  download/CSWlibcairodoc.gspec
+f3fb20251979667412e927160a5bcf78  download/CSWlibcairo.gspec
+09a9ca79e382ac8cce6a7bce757a362e  download/CSWlibcairodevel.gspec
+8e110a0776ce7b62c01d4d721d2cc7b7  download/CSWlibcairodoc.gspec

Modified: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec	2009-03-29 10:09:17 UTC (rev 4042)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec	2009-03-29 12:01:52 UTC (rev 4043)
@@ -1,4 +1,9 @@
 %var            bitname libcairo
 %var            pkgname CSWlibcairo
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING
+%copyright      
+
+
+Please see /opt/csw/share/doc/%{GARNAME} for license information
+
+

Modified: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	2009-03-29 10:09:17 UTC (rev 4042)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	2009-03-29 12:01:52 UTC (rev 4043)
@@ -1,4 +1,9 @@
 %var            bitname libcairo_devel
 %var            pkgname CSWlibcairodevel
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING
+%copyright      
+
+
+Please see /opt/csw/share/doc/%{GARNAME} for license information
+
+

Modified: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec	2009-03-29 10:09:17 UTC (rev 4042)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec	2009-03-29 12:01:52 UTC (rev 4043)
@@ -1,4 +1,9 @@
-%var            bitname libcairodoc
+%var            bitname libcairo_doc
 %var            pkgname CSWlibcairodoc
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING
+%copyright      
+
+
+Please see /opt/csw/share/doc/%{GARNAME} for license information
+
+


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