[csw-devel] SF.net SVN: gar:[3464] csw/mgar/pkg/flac/trunk

[dmichelsen at users.sourceforge.net]

Revision: 3464
          http://gar.svn.sourceforge.net/gar/?rev=3464&view=rev
Author:   dmichelsen
Date:     2009-02-24 15:47:56 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
flax: Update to mGAR v2, dynamic gspec, 64 bit

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

Added Paths:
-----------
    csw/mgar/pkg/flac/trunk/files/no-stdint.patch

Removed Paths:
-------------
    csw/mgar/pkg/flac/trunk/files/CSWflac.depend
    csw/mgar/pkg/flac/trunk/files/CSWflac.gspec

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


Property changes on: csw/mgar/pkg/flac/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/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2009-02-24 15:18:34 UTC (rev 3463)
+++ csw/mgar/pkg/flac/trunk/Makefile	2009-02-24 15:47:56 UTC (rev 3464)
@@ -16,17 +16,26 @@
 SF_PROJ = flac
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWflac,depend)
 
+PATCHFILES = no-stdint.patch
+
+CATALOGNAME = libflac
+
+LICENSE = $(foreach lic,FDL GPL LGPL Xiph,COPYING.$(lic))
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=13478
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = flac-(\d+(?:\.\d+)*)-src
 
-LIBDEPS += lib/libogg
+REQUIRED_PKGS = CSWiconv CSWlibogg
 
+BUILD64 = 1
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check
 
 include gar/category.mk
+
+PATH := $(PATH):/usr/ccs/bin

Modified: csw/mgar/pkg/flac/trunk/checksums
===================================================================
--- csw/mgar/pkg/flac/trunk/checksums	2009-02-24 15:18:34 UTC (rev 3463)
+++ csw/mgar/pkg/flac/trunk/checksums	2009-02-24 15:47:56 UTC (rev 3464)
@@ -1,3 +1,2 @@
 153c8b15a54da428d1f0fadc756c22c7  download/flac-1.2.1.tar.gz
-7f89e44c4fbf879be7e21bb7607c2cbf  download/CSWflac.gspec
-abbe602ce1dfbc4230ac3a4341cedc28  download/CSWflac.depend
+e3144fad8810ceaca718adb6f09dc8fa  download/no-stdint.patch

Deleted: csw/mgar/pkg/flac/trunk/files/CSWflac.depend
===================================================================
--- csw/mgar/pkg/flac/trunk/files/CSWflac.depend	2009-02-24 15:18:34 UTC (rev 3463)
+++ csw/mgar/pkg/flac/trunk/files/CSWflac.depend	2009-02-24 15:47:56 UTC (rev 3464)
@@ -1,2 +0,0 @@
-P CSWiconv  libiconv - GNU iconv library
-P CSWlibogg libogg - Ogg bitstream and framing library.

Deleted: csw/mgar/pkg/flac/trunk/files/CSWflac.gspec
===================================================================
--- csw/mgar/pkg/flac/trunk/files/CSWflac.gspec	2009-02-24 15:18:34 UTC (rev 3463)
+++ csw/mgar/pkg/flac/trunk/files/CSWflac.gspec	2009-02-24 15:47:56 UTC (rev 3464)
@@ -1,8 +0,0 @@
-%var             bitname libflac
-%var             pkgname CSWflac
-%include         url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright	 url file://%{WORKSRC}/COPYING.FDL
-%copyright:merge url file://%{WORKSRC}/COPYING.GPL
-%copyright:merge url file://%{WORKSRC}/COPYING.LGPL
-%copyright:merge url file://%{WORKSRC}/COPYING.Xiph
-

Added: csw/mgar/pkg/flac/trunk/files/no-stdint.patch
===================================================================
--- csw/mgar/pkg/flac/trunk/files/no-stdint.patch	                        (rev 0)
+++ csw/mgar/pkg/flac/trunk/files/no-stdint.patch	2009-02-24 15:47:56 UTC (rev 3464)
@@ -0,0 +1,12 @@
+diff -Naur flac-1.2.1.orig/include/share/alloc.h flac-1.2.1.patch/include/share/alloc.h
+--- flac-1.2.1.orig/include/share/alloc.h	2007-09-12 07:32:21.000000000 +0200
++++ flac-1.2.1.patch/include/share/alloc.h	2009-02-24 16:19:58.442033162 +0100
+@@ -29,7 +29,7 @@
+ 
+ #include <limits.h> /* for SIZE_MAX */
+ #if !defined _MSC_VER && !defined __MINGW32__ && !defined __EMX__
+-#include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
++/* #include <stdint.h> /* for SIZE_MAX in case limits.h didn't get it */
+ #endif
+ #include <stdlib.h> /* for size_t, malloc(), etc */
+ 


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