[csw-devel] SF.net SVN: gar:[9245] csw/mgar/pkg/zlib/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Fri Mar 19 05:11:36 CET 2010
Revision: 9245
http://gar.svn.sourceforge.net/gar/?rev=9245&view=rev
Author: hson
Date: 2010-03-19 04:11:35 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
zlib: Update to 1.2.4
Modified Paths:
--------------
csw/mgar/pkg/zlib/trunk/Makefile
csw/mgar/pkg/zlib/trunk/checksums
csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff
csw/mgar/pkg/zlib/trunk/files/configure.diff
Added Paths:
-----------
csw/mgar/pkg/zlib/trunk/files/license
Modified: csw/mgar/pkg/zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zlib/trunk/Makefile 2010-03-18 22:01:55 UTC (rev 9244)
+++ csw/mgar/pkg/zlib/trunk/Makefile 2010-03-19 04:11:35 UTC (rev 9245)
@@ -1,5 +1,5 @@
GARNAME = zlib
-GARVERSION = 1.2.3
+GARVERSION = 1.2.4
CATEGORIES = lib
DESCRIPTION = Zlib Data Compression Library
@@ -18,9 +18,11 @@
SF_PROJ=libpng
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES += license
SPKG_SOURCEURL = http://www.zlib.net
+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
@@ -33,7 +35,7 @@
#NOISAEXEC = 1
EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium
-CONFIGURE_ARGS = --prefix=$(prefix) --exec_prefix=$(exec_prefix)
+CONFIGURE_ARGS = --prefix=$(prefix) --eprefix=$(exec_prefix)
CONFIGURE_ARGS += --libdir=$(libdir) --includedir=$(includedir) --shared
include gar/category.mk
Modified: csw/mgar/pkg/zlib/trunk/checksums
===================================================================
--- csw/mgar/pkg/zlib/trunk/checksums 2010-03-18 22:01:55 UTC (rev 9244)
+++ csw/mgar/pkg/zlib/trunk/checksums 2010-03-19 04:11:35 UTC (rev 9245)
@@ -1,3 +1,4 @@
-dee233bf288ee795ac96a98cc2e369b6 download/zlib-1.2.3.tar.bz2
-7e6ff59ded76dd7d90a5dc10ff25e20a download/Makefile.in.diff
-95c0edba1d5160ed41b871f2c83e813a download/configure.diff
+f42963676d4ac5dbf75bb9187aadd2a0 Makefile.in.diff
+eb5fb03fc91399bb0ad892223d339c09 configure.diff
+4f83c4bd64190ba690413ab698861b3f license
+763c6a0b4ad1cdf5549e3ab3f140f4cb zlib-1.2.4.tar.bz2
Modified: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2010-03-18 22:01:55 UTC (rev 9244)
+++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2010-03-19 04:11:35 UTC (rev 9245)
@@ -9,48 +9,12 @@
man3dir = ${mandir}/man3
OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-@@ -78,7 +78,7 @@
- rm -f _match.s
+@@ -134,7 +134,7 @@
+ - at mv objs/$*.o $@
- $(SHAREDLIBV): $(OBJS)
-- $(LDSHARED) -o $@ $(OBJS)
-+ $(LDSHARED) -h $(SHAREDLIBM) -o $@ $(OBJS)
+ $(SHAREDLIBV): $(PIC_OBJS)
+- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc
++ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) -lc
rm -f $(SHAREDLIB) $(SHAREDLIBM)
ln -s $@ $(SHAREDLIB)
ln -s $@ $(SHAREDLIBM)
-@@ -90,23 +90,23 @@
- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
-
- install: $(LIBS)
-- - at if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-- - at if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi
-- - at if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi
-- - at if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi
-- cp zlib.h zconf.h $(includedir)
-- chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-- cp $(LIBS) $(libdir)
-- cd $(libdir); chmod 755 $(LIBS)
-- -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-- cd $(libdir); if test -f $(SHAREDLIBV); then \
-+ - at if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
-+ - at if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
-+ - at if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
-+ - at if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-+ cp zlib.h zconf.h $(DESTDIR)$(includedir)
-+ chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-+ cp $(LIBS) $(DESTDIR)$(libdir)
-+ cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
-+ -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-+ cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
- rm -f $(SHAREDLIB) $(SHAREDLIBM); \
- ln -s $(SHAREDLIBV) $(SHAREDLIB); \
- ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
- (ldconfig || true) >/dev/null 2>&1; \
- fi
-- cp zlib.3 $(man3dir)
-- chmod 644 $(man3dir)/zlib.3
-+ cp zlib.3 $(DESTDIR)$(man3dir)
-+ chmod 644 $(DESTDIR)$(man3dir)/zlib.3
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
-
Modified: csw/mgar/pkg/zlib/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/configure.diff 2010-03-18 22:01:55 UTC (rev 9244)
+++ csw/mgar/pkg/zlib/trunk/files/configure.diff 2010-03-19 04:11:35 UTC (rev 9245)
@@ -1,14 +1,5 @@
---- ../build-global/zlib-1.2.3/configure 2005-07-11 22:11:57.000000000 +0200
-+++ zlib-1.2.3/configure 2009-04-01 00:31:48.271327549 +0200
-@@ -19,7 +19,7 @@
- # an error.
-
- LIBS=libz.a
--LDFLAGS="-L. ${LIBS}"
-+#LDFLAGS="-L. ${LIBS}"
- VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
- VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
- VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
+--- zlib-1.2.4/configure.orig 2010-03-12 16:06:14.000000000 +0100
++++ zlib-1.2.4/configure 2010-03-19 03:56:46.336725066 +0100
@@ -29,7 +29,7 @@
exec_prefix=${exec_prefix-'${prefix}'}
libdir=${libdir-'${exec_prefix}/lib'}
@@ -18,23 +9,19 @@
shared_ext='.so'
shared=0
gcc=0
-@@ -132,9 +132,9 @@
- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
- CFLAGS=${CFLAGS-"-O3"}
- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};;
-- SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."}
-+ SunOS\ 5*) SFLAGS="-KPIC $CFLAGS"
- CFLAGS=${CFLAGS-"-fast -xcg89"}
-- LDSHARED=${LDSHARED-"cc -G"};;
-+ LDSHARED=${LDSHARED-"cc -G $LDFLAGS"};;
+@@ -154,11 +154,11 @@
+ SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}
+ case `(uname -m || echo unknown) 2>/dev/null` in
+ i86*)
+- SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
+- CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
++ SFLAGS="${CFLAGS} -KPIC -L."
++ CFLAGS=${CFLAGS} ;;
+ *)
+- SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
+- CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
++ SFLAGS="${CFLAGS} -KPIC -L."
++ CFLAGS=${CFLAGS} ;;
+ esac ;;
SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
CFLAGS=${CFLAGS-"-O2"}
- LDSHARED=${LDSHARED-"ld"};;
-@@ -187,6 +187,7 @@
- if test $shared -eq 0; then
- LDSHARED="$CC"
- echo Building static library $LIBS version $VER with $CC.
-+ LDFLAGS="-L. ${LIBS}"
- else
- LDFLAGS="-L. ${SHAREDLIBV}"
- fi
Added: csw/mgar/pkg/zlib/trunk/files/license
===================================================================
--- csw/mgar/pkg/zlib/trunk/files/license (rev 0)
+++ csw/mgar/pkg/zlib/trunk/files/license 2010-03-19 04:11:35 UTC (rev 9245)
@@ -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.
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