[csw-devel] SF.net SVN: gar:[14757] csw/mgar/pkg/zlib/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jun 9 13:26:33 CEST 2011


Revision: 14757
          http://gar.svn.sourceforge.net/gar/?rev=14757&view=rev
Author:   dmichelsen
Date:     2011-06-09 11:26:32 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
zlib: Complete rework and split packages

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

Added Paths:
-----------
    csw/mgar/pkg/zlib/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/zlib/trunk/files/license

Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile	2011-06-09 11:17:44 UTC (rev 14756)
+++ csw/mgar/pkg/zlib/trunk/Makefile	2011-06-09 11:26:32 UTC (rev 14757)
@@ -2,7 +2,7 @@
 VERSION = 1.2.5
 CATEGORIES = lib
 
-DESCRIPTION = Zlib Data Compression Library
+DESCRIPTION = Zlib data compression library
 define BLURB
  zlib is designed to be a free, general-purpose, legally unencumbered -- that
  is, not covered by any patents -- lossless data-compression library for use 
@@ -15,27 +15,31 @@
  in compression
 endef
 
-SF_PROJ=libpng
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += license
+MASTER_SITES = http://www.zlib.net/
+DISTFILES  = $(DISTNAME).tar.bz2
+DISTFILES += COPYING
 
-SPKG_SOURCEURL = http://www.zlib.net
+PATCHFILES += Makefile.in.diff
+PATCHFILES += configure.diff
 
-LICENSE = license
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=5624
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
+PACKAGES += CSWlibz1
+SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1
+PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1)
+OBSOLETED_BY_CSWlibz1 = CSWzlib
 
-PATCHFILES = Makefile.in.diff
-PATCHFILES += configure.diff
+PACKAGES += CSWzlib-dev
+SPKG_DESC_CSWzlib-dev = Development files for libz.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWzlib-dev = CSWlibz1
 
 BUILD64 = 1
-#NOISAEXEC = 1
+
 EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium
 
-CONFIGURE_ARGS = --prefix=$(prefix) --eprefix=$(exec_prefix) 
-CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir)  --shared
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --eprefix=$(exec_prefix) 
+CONFIGURE_ARGS += --libdir=$(libdir)
+CONFIGURE_ARGS += --includedir=$(includedir)
+CONFIGURE_ARGS += --shared
 
 include gar/category.mk

Copied: csw/mgar/pkg/zlib/trunk/files/COPYING (from rev 14753, csw/mgar/pkg/zlib/trunk/files/license)
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/zlib/trunk/files/COPYING	2011-06-09 11:26:32 UTC (rev 14757)
@@ -0,0 +1,32 @@
+
+Copyright notice:
+
+ (C) 1995-2010 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup at gzip.org          madler at alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.

Deleted: csw/mgar/pkg/zlib/trunk/files/license
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/license	2011-06-09 11:17:44 UTC (rev 14756)
+++ csw/mgar/pkg/zlib/trunk/files/license	2011-06-09 11:26:32 UTC (rev 14757)
@@ -1,32 +0,0 @@
-
-Copyright notice:
-
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup at gzip.org          madler at alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign.  The sources are provided for free but without
-warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes.  Please read
-the FAQ for more information on the distribution of modified source versions.


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


More information about the devel mailing list