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

[wbonnet at users.sourceforge.net]

Revision: 2823
          http://gar.svn.sourceforge.net/gar/?rev=2823&view=rev
Author:   wbonnet
Date:     2009-01-13 23:55:21 +0000 (Tue, 13 Jan 2009)

Log Message:
-----------


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

Added Paths:
-----------
    csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec

Removed Paths:
-------------
    csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodev.gspec

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


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

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


Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2009-01-13 23:35:21 UTC (rev 2822)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2009-01-13 23:55:21 UTC (rev 2823)
@@ -10,30 +10,45 @@
 MASTER_SITES  = http://www.cairographics.org/releases/
 DISTFILES     = cairo-$(GARVERSION).tar.gz 
 PKGDIST       = cairo-$(GARVERSION).tar.gz 
-DISTFILES    += CSWlibcairo.gspec CSWlibcairo.prototype CSWlibcairo.depend 
-DISTFILES    += CSWlibcairodev.gspec CSWlibcairodev.prototype CSWlibcairodev.depend 
-DISTFILES    += CSWlibcairodoc.gspec CSWlibcairodoc.prototype CSWlibcairodoc.depend 
-# DISTFILES    += $(call admfiles,CSWlibcairo, depend)
 
-CFLAGS       += -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-CXXFLAGS     += -xlibmil -xlibmopt -features=tmplife -norunpath
-LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
-
-export CFLAGS CXXFLAGS LDFLAGS
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-GREP = ggrep
+SPKG_DESC_CSWlibcairo 		= $(DESCRIPTION)
+SPKG_DESC_CSWlibcairodevel 	= $(DESCRIPTION) development package
 
-include gar/category.mk
+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_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
+
+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 
 
 post-extract:
-	( mv $(WORKDIR)/cairo-$(GARVERSION) $(WORKDIR)/$(GARNAME)-$(GARVERSION) )
+	( cd  $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) ; \
+		mv cairo-$(GARVERSION) $(GARNAME)-$(GARVERSION) )
 	@$(MAKECOOKIE)
 
-post-install:
-	( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | ggrep ELF | ggrep -e 'executable' -e 'dynamic lib' | ggrep 'not stripped' && strip {}"  \; )
+include gar/category.mk
 
+

Modified: csw/mgar/pkg/libcairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcairo/trunk/checksums	2009-01-13 23:35:21 UTC (rev 2822)
+++ csw/mgar/pkg/libcairo/trunk/checksums	2009-01-13 23:55:21 UTC (rev 2823)
@@ -1,10 +1,4 @@
 44d406e199c338cb60f7db32ffb32bdb  download/cairo-1.8.2.tar.gz
-7a9643495de17237dc340f420084f8ea  download/CSWlibcairo.gspec
-07e633e903977c46222d112a7e3cba2b  download/CSWlibcairo.prototype
-f4082db6a7c6682f24fa820150df07a9  download/CSWlibcairo.depend
-657e98aba3961d90ad097c407fde3539  download/CSWlibcairodev.gspec
-238c444d07f5a6d84b73dd79558da18b  download/CSWlibcairodev.prototype
-b1d4ecf06f684f9127fe0e79b30ab82b  download/CSWlibcairodev.depend
-6eaa028e18e5878a681f1356c9020acd  download/CSWlibcairodoc.gspec
-a6ddb8eaddea18e088f1462a0bc39bf8  download/CSWlibcairodoc.prototype
-d41d8cd98f00b204e9800998ecf8427e  download/CSWlibcairodoc.depend
+14919d48d4e00ee4e18fededcb1454ba  download/CSWlibcairo.gspec
+858cebcbabf59da9aaa959d915c6d1a9  download/CSWlibcairodevel.gspec
+081ffcd10145f9041df467a11342cc98  download/CSWlibcairodoc.gspec

Deleted: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodev.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodev.gspec	2009-01-13 23:35:21 UTC (rev 2822)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodev.gspec	2009-01-13 23:55:21 UTC (rev 2823)
@@ -1,4 +0,0 @@
-%var            bitname libcairo_devel
-%var            pkgname CSWlibcairodevel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING

Copied: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec (from rev 2822, csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodev.gspec)
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	                        (rev 0)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	2009-01-13 23:55:21 UTC (rev 2823)
@@ -0,0 +1,4 @@
+%var            bitname libcairo_devel
+%var            pkgname CSWlibcairodevel
+%include        url file://%{PKGLIB}/csw_dyndepend.gspec
+%copyright      url file://%{WORKSRC_FIRSTMOD}/COPYING


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