[Midnightbsd-cvs] mports: mports/Mk: Update zip to 3.0.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 1 21:00:02 EDT 2008
Log Message:
-----------
Update zip to 3.0.
* Add infozip license type and place the license in Licenses.
* Set the license in zip port.
* Use new sourceforge mirror
Modified Files:
--------------
mports/Mk:
bsd.mport.mk (r1.118 -> r1.119)
mports/archivers/zip:
Makefile (r1.2 -> r1.3)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/archivers/zip/files:
patch-aa (r1.1 -> r1.2)
patch-ab (r1.1 -> r1.2)
Added Files:
-----------
mports/Licenses:
infozip (r1.1)
Removed Files:
-------------
mports/archivers/zip/files:
patch-negfseek
-------------- next part --------------
--- /dev/null
+++ Licenses/infozip
@@ -0,0 +1,60 @@
+This is version 2007-Mar-4 of the Info-ZIP license.
+The definitive version of this document should be available at
+ftp://ftp.info-zip.org/pub/infozip/license.html indefinitely and
+a copy at http://www.info-zip.org/pub/infozip/license.html.
+
+
+Copyright (c) 1990-2007 Info-ZIP. All rights reserved.
+
+For the purposes of this copyright and license, "Info-ZIP" is defined as
+the following set of individuals:
+
+ Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+ Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
+ Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
+ David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
+ Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
+ Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
+ Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
+ Rich Wales, Mike White.
+
+This software is provided "as is," without warranty of any kind, express
+or implied. In no event shall Info-ZIP or its contributors be held liable
+for any direct, indirect, incidental, special or consequential damages
+arising out of the use of or inability to use 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 above disclaimer and the following restrictions:
+
+ 1. Redistributions of source code (in whole or in part) must retain
+ the above copyright notice, definition, disclaimer, and this list
+ of conditions.
+
+ 2. Redistributions in binary form (compiled executables and libraries)
+ must reproduce the above copyright notice, definition, disclaimer,
+ and this list of conditions in documentation and/or other materials
+ provided with the distribution. The sole exception to this condition
+ is redistribution of a standard UnZipSFX binary (including SFXWiz) as
+ part of a self-extracting archive; that is permitted without inclusion
+ of this license, as long as the normal SFX banner has not been removed
+ from the binary or disabled.
+
+ 3. Altered versions--including, but not limited to, ports to new operating
+ systems, existing ports with new graphical interfaces, versions with
+ modified or added functionality, and dynamic, shared, or static library
+ versions not from Info-ZIP--must be plainly marked as such and must not
+ be misrepresented as being the original source or, if binaries,
+ compiled from the original source. Such altered versions also must not
+ be misrepresented as being Info-ZIP releases--including, but not
+ limited to, labeling of the altered versions with the names "Info-ZIP"
+ (or any variation thereof, including, but not limited to, different
+ capitalizations), "Pocket UnZip," "WiZ" or "MacZip" without the
+ explicit permission of Info-ZIP. Such altered versions are further
+ prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
+ e-mail addresses or the Info-ZIP URL(s), such as to imply Info-ZIP
+ will provide support for the altered versions.
+
+ 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+ "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
+ own source and binary releases.
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/archivers/zip/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/zip/pkg-plist -L archivers/zip/pkg-plist -u -r1.1 -r1.2
--- archivers/zip/pkg-plist
+++ archivers/zip/pkg-plist
@@ -1,3 +1,4 @@
+ at comment $MidnightBSD$
bin/zip
bin/zipcloak
bin/zipnote
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/archivers/zip/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L archivers/zip/Makefile -L archivers/zip/Makefile -u -r1.2 -r1.3
--- archivers/zip/Makefile
+++ archivers/zip/Makefile
@@ -3,29 +3,30 @@
# Whom: ache
#
# $MidnightBSD$
-# $FreeBSD: ports/archivers/zip/Makefile,v 1.33 2006/07/28 14:42:53 sat Exp $
+# $FreeBSD: ports/archivers/zip/Makefile,v 1.38 2008/08/03 03:23:28 ache Exp $
#
PORTNAME= zip
-PORTVERSION= 2.32
+PORTVERSION= 3.0
CATEGORIES= archivers
-MASTER_SITES= http://ftp.info-zip.org/pub/infozip/src/ ${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= tools/zip/info-zip/src
-DISTFILES= zip232${EXTRACT_SUFX}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= infozip
+DISTFILES= ${PORTNAME}30${EXTRACT_SUFX}
+USE_ZIP= yes
MAINTAINER= ports at MidnightBSD.org
COMMENT= Create/update ZIP files compatible with pkzip
-LICENSE= unknown
+LICENSE= infozip
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}30
MAKEFILE= unix/Makefile
ALL_TARGET= generic
-MAN1= zip.1
+MAN1= zip.1 zipcloak.1 zipnote.1 zipsplit.1
do-install:
.for file in zip zipcloak zipnote zipsplit
${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man/${file}.1 ${PREFIX}/man/man1
.endfor
- ${INSTALL_MAN} ${WRKSRC}/man/zip.1 ${PREFIX}/man/man1
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/archivers/zip/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/zip/distinfo -L archivers/zip/distinfo -u -r1.1 -r1.2
--- archivers/zip/distinfo
+++ archivers/zip/distinfo
@@ -1,3 +1,3 @@
-MD5 (zip232.tar.gz) = 8a4da4460386e324debe97f3b7fe4d96
-SHA256 (zip232.tar.gz) = d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
-SIZE (zip232.tar.gz) = 807180
+MD5 (zip30.zip) = e88492c8abd68fa9cfba72bc08757dba
+SHA256 (zip30.zip) = 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a
+SIZE (zip30.zip) = 1287223
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.118
retrieving revision 1.119
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.118 -r1.119
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2917,7 +2917,7 @@
#
_LICENSES= agpl gpl gpl2 gpl3 lgpl lgpl3 bsd4 bsd3 bsd2 python ruby x11 guile artistic artistic2 \
bdb mpl npl publicdom zlib apache2 apache1.1 apache1 apsl2 apsl1 php openldap2.8 \
- restricted perl mit modula3 cddl opera liberation sgi bzip2 unknown other agg
+ restricted perl mit modula3 cddl opera liberation sgi bzip2 infozip unknown other agg
--- archivers/zip/files/patch-negfseek
+++ /dev/null
@@ -1,59 +0,0 @@
---- zipfile.c.orig Sun Nov 7 13:30:11 1999
-+++ zipfile.c Fri May 31 13:58:36 2002
-@@ -14,6 +14,10 @@
- #include "zip.h"
- #include "revision.h"
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
-+
- #ifdef VMS
- # include <rms.h>
- # include <starlet.h>
-@@ -628,6 +632,18 @@
-
- #endif /* !UTIL */
-
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+local off_t fsize(FILE *f) {
-+ struct stat s;
-+
-+ if (f == NULL) return 0;
-+ if (fstat(fileno(f), &s) < 0) return 0;
-+ return s.st_size;
-+}
-+#endif
-+#endif
-+
- /*
- * scanzipf_reg starts searching for the End Signature at the end of the file
- * The End Signature points to the Central Directory Signature which points
-@@ -667,7 +683,13 @@
- t[1] = '\0';
- t[2] = '\0';
- t[3] = '\0';
-- if (fseek(f, -4096L, SEEK_END) == 0) {
-+ if (
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+ fsize(f) >= 4096L &&
-+#endif
-+#endif
-+ fseek(f, -4096L, SEEK_END) == 0) {
- zipbeg = (ulg) (ftell(f) + 4096L);
- while (!found && zipbeg >= 4096) {
- zipbeg -= 4096L;
-@@ -678,6 +700,11 @@
- * XXX error check ??
- */
- fread(buf, 1, 4096, f);
-+#ifdef __FreeBSD__
-+#if __FreeBSD_version < 500028
-+ if (ftell(f) >= 8192L)
-+#endif
-+#endif
- fseek(f, -8192L, SEEK_CUR);
- t = &buf[4095];
- /*
Index: patch-ab
===================================================================
RCS file: /home/cvs/mports/archivers/zip/files/patch-ab,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/zip/files/patch-ab -L archivers/zip/files/patch-ab -u -r1.1 -r1.2
--- archivers/zip/files/patch-ab
+++ archivers/zip/files/patch-ab
@@ -1,14 +1,14 @@
---- unix/Makefile.orig Sun Apr 23 03:52:18 2006
-+++ unix/Makefile Fri Jul 7 05:15:13 2006
-@@ -17,7 +17,6 @@
+--- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400
++++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400
+@@ -22,7 +22,6 @@
LN = ln -s
- # (to use the Gnu compiler, change cc to gcc in CC)
+ # (to use the GNU compiler, change cc to gcc in CC)
-CC = cc
BIND = $(CC)
AS = $(CC) -c
CPP = /lib/cpp
-@@ -46,8 +45,7 @@
+@@ -57,8 +56,7 @@
# CFLAGS flags for C compile
# LFLAGS1 flags after output file spec, before obj file list
# LFLAGS2 flags after obj file list (libraries, etc)
Index: patch-aa
===================================================================
RCS file: /home/cvs/mports/archivers/zip/files/patch-aa,v
retrieving revision 1.1
retrieving revision 1.2
diff -L archivers/zip/files/patch-aa -L archivers/zip/files/patch-aa -u -r1.1 -r1.2
--- archivers/zip/files/patch-aa
+++ archivers/zip/files/patch-aa
@@ -1,6 +1,22 @@
---- unix/configure.orig Tue Apr 27 12:49:05 1999
-+++ unix/configure Tue Jun 24 17:47:35 2003
-@@ -23,7 +23,6 @@
+--- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400
++++ unix/configure 2008-08-03 06:35:03.000000000 +0400
+@@ -98,7 +98,6 @@
+ _EOF_
+ $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+ if test $? -eq 0; then
+- CFLAGS_OPT='-O3'
+ echo " GNU C ($CFLAGS_OPT)"
+ # Special Mac OS X shared library "ld" option?
+ if test ` uname -s 2> /dev/null ` = 'Darwin'; then
+@@ -110,7 +109,6 @@
+ rm -f conftest
+ fi
+ else
+- CFLAGS_OPT='-O'
+ echo " Other-unknown C ($CFLAGS_OPT)"
+ fi
+ fi
+@@ -224,7 +222,6 @@
[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
[ -f /lib/cpp ] && CPP=/lib/cpp
@@ -8,7 +24,7 @@
[ -f /xenix ] && CPP="${CC} -E"
[ -f /lynx.os ] && CPP="${CC} -E"
-@@ -38,7 +37,7 @@
+@@ -244,7 +241,7 @@
echo "int foo() { return 0;}" > conftest.c
$CC -c conftest.c >/dev/null 2>/dev/null
echo Check if compiler generates underlines
More information about the Midnightbsd-cvs
mailing list