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

[dmichelsen at users.sourceforge.net]

Revision: 4297
          http://gar.svn.sourceforge.net/gar/?rev=4297&view=rev
Author:   dmichelsen
Date:     2009-04-14 11:32:34 +0000 (Tue, 14 Apr 2009)

Log Message:
-----------
libcairo: Move to dynamic gspec, fix DISTNAME

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

Removed Paths:
-------------
    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-04-13 19:29:36 UTC (rev 4296)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2009-04-14 11:32:34 UTC (rev 4297)
@@ -8,43 +8,43 @@
 endef
 
 MASTER_SITES  = http://www.cairographics.org/releases/
-DISTFILES     = cairo-$(GARVERSION).tar.gz 
+DISTNAME      = cairo-$(GARVERSION)
+DISTFILES     = $(DISTNAME).tar.gz 
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGES = CSWlibcairo CSWlibcairodevel CSWlibcairodoc
+CATALOGNAME_CSWlibcairo      = libcairo
+CATALOGNAME_CSWlibcairodevel = libcairo_devel
+CATALOGNAME_CSWlibcairodoc   = libcairo_doc
+
 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 += /opt/csw/share/doc/libcairo_devel/.*
-PKGFILES_CSWlibcairodoc    = $(prefix)/share/gtk-doc.*
-PKGFILES_CSWlibcairodoc   += /opt/csw/share/doc/libcairo_doc/.*
+PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.*
+PKGFILES_CSWlibcairodoc    = $(sharedstatedir)/gtk-doc.*
+PKGFILES_CSWlibcairodoc   += $(docdir)/libcairo_doc/.*
 
-REQUIRED_PKGS_CSWlibcairodevel  = CSWlibcairo
-REQUIRED_PKGS_CSWlibcairodoc    = 
-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      = CSWfconfig
+REQUIRED_PKGS_CSWlibcairo     += CSWftype2
+REQUIRED_PKGS_CSWlibcairo     += CSWlibxrender
+REQUIRED_PKGS_CSWlibcairo     += CSWpixman
+REQUIRED_PKGS_CSWlibcairo     += CSWpng
+REQUIRED_PKGS_CSWlibcairo     += CSWzlib
+REQUIRED_PKGS_CSWlibcairodevel = CSWlibcairo
+REQUIRED_PKGS_CSWlibcairodoc   = 
 
+# Wait for libpixman, libfontconfig and libXrender to be 64 bit
+#BUILD64 = 1
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-tests --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x 
 CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes
 CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes 
 
-post-extract:
-	( cd  $(WORKROOTDIR)/build-$(firstword $(MODULATIONS)) ; \
-		mv cairo-$(GARVERSION) $(GARNAME)-$(GARVERSION) )
-	@$(MAKECOOKIE)
-
 include gar/category.mk
 
 

Deleted: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec	2009-04-13 19:29:36 UTC (rev 4296)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairo.gspec	2009-04-14 11:32:34 UTC (rev 4297)
@@ -1,9 +0,0 @@
-%var            bitname libcairo
-%var            pkgname CSWlibcairo
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      
-
-
-Please see /opt/csw/share/doc/%{GARNAME} for license information
-
-

Deleted: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	2009-04-13 19:29:36 UTC (rev 4296)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodevel.gspec	2009-04-14 11:32:34 UTC (rev 4297)
@@ -1,9 +0,0 @@
-%var            bitname libcairo_devel
-%var            pkgname CSWlibcairodevel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      
-
-
-Please see /opt/csw/share/doc/%{GARNAME} for license information
-
-

Deleted: csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec	2009-04-13 19:29:36 UTC (rev 4296)
+++ csw/mgar/pkg/libcairo/trunk/files/CSWlibcairodoc.gspec	2009-04-14 11:32:34 UTC (rev 4297)
@@ -1,9 +0,0 @@
-%var            bitname libcairo_doc
-%var            pkgname CSWlibcairodoc
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%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.