Hello ports@, Subj:
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/zip/Makefile,v
retrieving revision 1.36
diff -d -u -r1.36 Makefile
--- Makefile 15 Sep 2007 10:14:33 -0000 1.36
+++ Makefile 12 Dec 2008 17:20:51 -0000
@@ -2,16 +2,13 @@
COMMENT= create/update ZIP files compatible with PKZip(tm)
-DISTNAME= zip-2.32
+VERSION= 3.0
+DISTNAME= zip${VERSION:S/.//}
+PKGNAME= zip-${VERSION}
CATEGORIES= archivers
-MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=tools/zip/info-zip/src/} \
- ftp://ftp.info-zip.org/pub/infozip/src/ \
- ${MASTER_SITE_SOURCEFORGE:=infozip/} \
- http://mirror.switch.ch/ftp/mirror/infozip/src/
-
-DISTFILES= zip232.tar.gz zcrypt29.zip
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=infozip/}
-HOMEPAGE= http://www.ctan.org/tex-archive/tools/zip/info-zip/Zip.html
+HOMEPAGE= http://infozip.sourceforge.net/
# Conditional
PERMIT_PACKAGE_CDROM= Yes
@@ -21,15 +18,15 @@
WANTLIB= c
MAKE_FLAGS= CC="${CC}" CFLAGS_NOOPT="${CFLAGS} -I. -DUNIX"
-FAKE_FLAGS= prefix="${WRKINST}${PREFIX}"
MAKE_FILE= unix/Makefile
-
ALL_TARGET= generic
-
-post-extract:
- @mv -f ${WRKDIR}/crypt.[ch] ${WRKSRC}
-
NO_REGRESS= Yes
+
+do-install:
+.for prog in zip zipcloak zipnote zipsplit
+ ${INSTALL_PROGRAM} ${WRKBUILD}/${prog} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKDIST}/man/${prog}.1 ${PREFIX}/man/man1
+.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/zip/distinfo,v
retrieving revision 1.4
diff -d -u -r1.4 distinfo
--- distinfo 5 Apr 2007 15:37:41 -0000 1.4
+++ distinfo 12 Dec 2008 17:20:51 -0000
@@ -1,10 +1,5 @@
-MD5 (zcrypt29.zip) = DJaboWYRg7BBoUKUXtJxDg==
-MD5 (zip232.tar.gz) = ik2kRgOG4yTevpfzt/5Nlg==
-RMD160 (zcrypt29.zip) = cBqkfZELdshahos0ORLr0thJvcM=
-RMD160 (zip232.tar.gz) = a5MmyKYLxr8Igl5BYUD9DKimp/E=
-SHA1 (zcrypt29.zip) = BCI+qIujz10PjWpfycGkzYxWj1Y=
-SHA1 (zip232.tar.gz) = W8Viv5XZruDLZiXmA4iY4fGRpKo=
-SHA256 (zcrypt29.zip) = r24P+vkLYfXcdBQTHU4mBlADCXqxe93fK/USIY1QAno=
-SHA256 (zip232.tar.gz) = 0NN0P3Mqm6oWL4DQxFZ7nFRbQaM4WCUEIROBDypW6y8=
-SIZE (zcrypt29.zip) = 20248
-SIZE (zip232.tar.gz) = 807180
+MD5 (zip30.tar.gz) = e3RVHmP47mqrb7yGZ2wNNw==
+RMD160 (zip30.tar.gz) = H8mdrz42SUujksdRSnFP49JY0jI=
+SHA1 (zip30.tar.gz) = yfQJns8ncrU8LdSo5QgGTOAV0YI=
+SHA256 (zip30.tar.gz) = 8Oi7H5t+sLAShUlaJpnfOkt2Z4TBdlqPGu7fY8CAY2k=
+SIZE (zip30.tar.gz) = 1118845
Index: patches/patch-fileio_c
===================================================================
RCS file: patches/patch-fileio_c
diff -N patches/patch-fileio_c
--- patches/patch-fileio_c 30 Jul 2006 17:33:40 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-fileio_c,v 1.2 2006/07/30 17:33:40 naddy Exp $
---- fileio.c.orig Thu Jun 16 05:31:52 2005
-+++ fileio.c Sun Jul 30 19:09:14 2006
-@@ -919,7 +919,15 @@ char *zip; /* path name of
- }
- #else
- strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */
-- return mktemp(t);
-+ {
-+ int fd = mkstemp(t);
-+ if (fd == -1) {
-+ perror("can't create temp file");
-+ exit(1);
-+ }
-+ close(fd);
-+ return (t);
-+ }
- #endif /* NO_MKTEMP */
- #endif /* TANDEM */
- #endif /* CMS_MVS */
Index: patches/patch-unix_Makefile
===================================================================
RCS file: patches/patch-unix_Makefile
diff -N patches/patch-unix_Makefile
--- patches/patch-unix_Makefile 30 Jul 2006 17:33:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-unix_Makefile,v 1.3 2006/07/30 17:33:40 naddy Exp $
---- unix/Makefile.orig Sun Apr 23 01:52:18 2006
-+++ unix/Makefile Sun Jul 30 19:09:14 2006
-@@ -128,11 +128,9 @@ $(ZIPMANUAL): man/zip.1
- # install
- install: $(ZIPS)
- -$(INSTALL_D) $(BINDIR)
-- $(INSTALL_PROGRAM) $(ZIPS) $(BINDIR)
-- -cd $(BINDIR); $(CHMOD) $(BINFLAGS) $(ZIPS)
-+ $(BSD_INSTALL_PROGRAM) $(ZIPS) $(BINDIR)
- -$(INSTALL_D) $(MANDIR)
-- $(INSTALL) man/zip.1 $(MANDIR)/zip.$(manext)
-- $(CHMOD) $(MANFLAGS) $(MANDIR)/zip.$(manext)
-+ $(BSD_INSTALL_MAN) man/zip.1 $(MANDIR)/zip.$(manext)
-
- uninstall:
- -cd $(BINDIR); rm -f $(ZIPS)
Index: patches/patch-unix_configure
===================================================================
RCS file: /cvs/ports/archivers/zip/patches/patch-unix_configure,v
retrieving revision 1.1
diff -d -u -r1.1 patch-unix_configure
--- patches/patch-unix_configure 30 Jul 2006 17:33:40 -0000 1.1
+++ patches/patch-unix_configure 12 Dec 2008 17:20:51 -0000
@@ -1,43 +1,28 @@
$OpenBSD: patch-unix_configure,v 1.1 2006/07/30 17:33:40 naddy Exp $
---- unix/configure.orig Sun Jul 30 19:28:24 2006
-+++ unix/configure Sun Jul 30 19:28:40 2006
-@@ -15,39 +15,6 @@ CC=${1-cc}
- CFLAGS=${2-"-I. -DUNIX"}
- LFLAGS1=""
- LN="ln -s"
--echo "Check C compiler type (optimization option)"
--cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __SUNPRO_C
-- bad code
--#endif
-- return 0;
--}
--_EOF_
--$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
--if test $? -eq 0; then
-- echo ' Sun C (-xO3)'
-- CFLAGS="${CFLAGS} -xO3"
--else
-- cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __DECC
-- bad code
--#endif
-- return 0;
--}
--_EOF_
-- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
-- if test $? -eq 0; then
-- echo ' DEC C (-O3)'
-- CFLAGS="${CFLAGS} -O3"
-- else
-- echo ' Other (gcc?) (-O2)'
-- CFLAGS="${CFLAGS} -O2"
-- fi
--fi
-
- echo Check for the C preprocessor
- # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+--- unix/configure.orig Fri Dec 12 22:58:30 2008
++++ unix/configure Fri Dec 12 22:59:38 2008
+@@ -98,7 +98,6 @@ int main()
+ _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 @@ _EOF_
+ rm -f conftest
+ fi
+ else
+- CFLAGS_OPT='-O'
+ echo " Other-unknown C ($CFLAGS_OPT)"
+ fi
+ fi
+@@ -244,7 +242,7 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then
+ echo "int foo() { return 0;}" > conftest.c
+ $CC -c conftest.c >/dev/null 2>/dev/null
+ echo Check if compiler generates underlines
+- nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
++ nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
+ [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
+ if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
+ if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o
]
Index: patches/patch-unix_unix_c
===================================================================
RCS file: /cvs/ports/archivers/zip/patches/patch-unix_unix_c,v
retrieving revision 1.2
diff -d -u -r1.2 patch-unix_unix_c
--- patches/patch-unix_unix_c 30 Jul 2006 17:33:40 -0000 1.2
+++ patches/patch-unix_unix_c 12 Dec 2008 17:20:51 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-unix_unix_c,v 1.2 2006/07/30 17:33:40 naddy Exp $
---- unix/unix.c.orig Tue May 30 00:35:00 2006
-+++ unix/unix.c Sun Jul 30 19:09:14 2006
-@@ -338,7 +338,7 @@ ulg filetime(f, a, n, t)
- struct stat s; /* results of stat() */
+--- unix/unix.c.orig Fri Dec 12 23:07:25 2008
++++ unix/unix.c Fri Dec 12 23:08:04 2008
+@@ -344,7 +344,7 @@ ulg filetime(f, a, n, t)
+ z_stat s; /* results of stat() */
/* converted to pointer from using FNMAX - 11/8/04 EG */
char *name;
- int len = strlen(f);
@@ -10,12 +10,22 @@
if (f == label) {
if (a != NULL)
-@@ -438,7 +438,7 @@ int set_extra_field(z, z_utim)
+@@ -570,7 +570,7 @@ int set_extra_field(z, z_utim)
{
- struct stat s;
+ z_stat s;
char *name;
- int len = strlen(z->name);
+ size_t len = strlen(z->name);
/* For the full sized UT local field including the UID/GID fields, we
* have to stat the file again. */
+@@ -695,7 +695,8 @@ char *d; /* directory to delete */
+ {
+ # ifdef NO_RMDIR
+ /* code from Greg Roelofs, who horked it from Mark Edwards (unzip) */
+- int r, len;
++ size_t len;
++ int r;
+ char *s; /* malloc'd string for system command */
+
+ len = strlen(d);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/zip/pkg/PLIST,v
retrieving revision 1.9
diff -d -u -r1.9 PLIST
--- pkg/PLIST 30 Jul 2006 17:33:40 -0000 1.9
+++ pkg/PLIST 12 Dec 2008 17:20:51 -0000
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.9 2006/07/30 17:33:40 naddy Exp $
-bin/zip
-bin/zipcloak
-bin/zipnote
-bin/zipsplit
+...@bin bin/zip
+...@bin bin/zipcloak
+...@bin bin/zipnote
+...@bin bin/zipsplit
@man man/man1/zip.1
+...@man man/man1/zipcloak.1
+...@man man/man1/zipnote.1
+...@man man/man1/zipsplit.1
; from f...@.
