summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-11-01 14:24:32 +0000
committerjoerg <joerg@pkgsrc.org>2009-11-01 14:24:32 +0000
commit4256c6515ea40590e2a5e2057d6cf7aca8b4a4cb (patch)
tree02b2037357b292ec6515fe45b9a15acfd8aef5f0 /archivers
parentbc21e1ac169baca250abbfad2e33f74cd92e8bf9 (diff)
downloadpkgsrc-4256c6515ea40590e2a5e2057d6cf7aca8b4a4cb.tar.gz
Retire archivers/zip1. It was originally needed because zip didn't
include the encryption support, but that has been addressed ages ago.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/Makefile3
-rw-r--r--archivers/zip1/DESCR4
-rw-r--r--archivers/zip1/Makefile55
-rw-r--r--archivers/zip1/PLIST5
-rw-r--r--archivers/zip1/distinfo15
-rw-r--r--archivers/zip1/patches/patch-aa95
-rw-r--r--archivers/zip1/patches/patch-ab15
-rw-r--r--archivers/zip1/patches/patch-ac36
-rw-r--r--archivers/zip1/patches/patch-ad14
-rw-r--r--archivers/zip1/patches/patch-ae20
-rw-r--r--archivers/zip1/patches/patch-af15
-rw-r--r--archivers/zip1/patches/patch-ag12
12 files changed, 1 insertions, 288 deletions
diff --git a/archivers/Makefile b/archivers/Makefile
index 1cbd22e452d..86592026571 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2009/08/31 09:28:39 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2009/11/01 14:24:32 joerg Exp $
#
COMMENT= Archivers
@@ -92,7 +92,6 @@ SUBDIR+= xmill
SUBDIR+= xpk
SUBDIR+= xz
SUBDIR+= zip
-SUBDIR+= zip1
SUBDIR+= zoo
SUBDIR+= zziplib
diff --git a/archivers/zip1/DESCR b/archivers/zip1/DESCR
deleted file mode 100644
index 1aa5b8142a8..00000000000
--- a/archivers/zip1/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Zip is a compression and file packaging utility. It is compatible with
-PKZIP 1.x (Phil Katz ZIP) for MSDOS systems. There is a companion to zip
-called unzip (of course) which you should be able to find the same place
-you got zip.
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
deleted file mode 100644
index f3d38f5f8b8..00000000000
--- a/archivers/zip1/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.47 2009/10/29 20:45:23 tnn Exp $
-#
-
-DISTNAME= zip1-1.1
-PKGREVISION= 2
-CATEGORIES= archivers
-MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/
-DISTFILES= zip11.zip zcrypt10.zip
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.info-zip.org/pub/infozip/
-COMMENT= Create/update ZIP files compatible with pkzip version 1
-LICENSE= generic-nonlicense
-
-RESTRICTED= Do not modify. Do not sell for profit.
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
-MAKE_JOBS_SAFE= no
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}
-MAKE_FILE= makefile
-BUILD_TARGET= zip zipcloak
-
-.include "../../mk/bsd.prefs.mk"
-
-MAKE_FLAGS+= CFLAGS=${CFLAGS:M*:Q}
-.if ${OPSYS} == "Linux" || ${OPSYS} == "Interix" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
-CFLAGS+= -DSYSV -DMODERN -DTERMIOS
-.else
-CFLAGS+= -DDIRENT
-MAKE_FLAGS+= LFLAGS2=-lcompat
-.endif
-.if ${OPSYS} == "NetBSD"
-# NetBSD's unzip doesn't understand "imploded" compression, so force pkgsrc.
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-TOOLS_PLATFORM.unzip= ${PREFIX}/bin/unzip
-.endif
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-
-do-install:
- cd ${WRKSRC} && ${INSTALL_PROGRAM} zip \
- ${DESTDIR}${PREFIX}/bin/zip1
- cd ${WRKSRC} && ${INSTALL_MAN} zip.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zip1.1
- cd ${WRKSRC} && ${INSTALL_PROGRAM} zipcloak \
- ${DESTDIR}${PREFIX}/bin/zipcloak1
- ${LN} -fs zip1.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipcloak1.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zip1/PLIST b/archivers/zip1/PLIST
deleted file mode 100644
index e05038d6756..00000000000
--- a/archivers/zip1/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2004/11/23 02:42:10 tv Exp $
-bin/zip1
-bin/zipcloak1
-man/man1/zip1.1
-man/man1/zipcloak1.1
diff --git a/archivers/zip1/distinfo b/archivers/zip1/distinfo
deleted file mode 100644
index 0173bfa79bd..00000000000
--- a/archivers/zip1/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/11/03 19:59:39 minskim Exp $
-
-SHA1 (zip11.zip) = 71c84e82593d8ee3dd9189bf712524ceb93cc1bb
-RMD160 (zip11.zip) = 964753913220106757fcbb2d449efb4463a3275d
-Size (zip11.zip) = 158736 bytes
-SHA1 (zcrypt10.zip) = e1638d3c5af1081789948518177c173df9f6e50f
-RMD160 (zcrypt10.zip) = 40b6910a7831cb5c8bb069deef8bd11b0fdf603e
-Size (zcrypt10.zip) = 14674 bytes
-SHA1 (patch-aa) = 2fdbff4e159d58229d2f0841077a9ebae2a46031
-SHA1 (patch-ab) = d81a0b000e96bd0c09b7817e7572390aa173ef2c
-SHA1 (patch-ac) = 0d0301ee6aafb271e97c45eac44164c7430ab084
-SHA1 (patch-ad) = 63882bc4380af7b6f5277ba15a94b95f2dc68447
-SHA1 (patch-ae) = 2c3db9728a7dc5f88349eb077b24f69794415956
-SHA1 (patch-af) = ce00e3835e0dea4d4367db97c3f24f0b51f411b6
-SHA1 (patch-ag) = cade7fa5a127c093be08e0af9a1bd8d2204adcab
diff --git a/archivers/zip1/patches/patch-aa b/archivers/zip1/patches/patch-aa
deleted file mode 100644
index c68f1ec1a92..00000000000
--- a/archivers/zip1/patches/patch-aa
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/03 20:34:56 joerg Exp $
-
---- fileio.c.orig 1992-08-29 21:51:00.000000000 +0000
-+++ fileio.c
-@@ -38,7 +38,6 @@
- # define MATCH dosmatch
- # endif /* ?OS2 */
- #else /* !MSDOS */
-- extern int errno; /* error number from system functions */
- # ifdef VMS
- # define RMDIR
- # define link rename
-@@ -59,16 +58,6 @@
- #endif /* ?VMS */
-
-
--/* For now, assume DIRENT implies System V implies TERMIO */
--#ifdef DIRENT
--# ifndef MINIX
--# ifndef TERMIO
--# define TERMIO
--# endif /* !TERMIO */
--# endif /* !MINIX */
--#endif /* DIRENT */
--
--
- #ifndef EXPORT
- # ifdef MSVMS
- # ifdef MSDOS
-@@ -77,7 +66,13 @@
- # define getch() getc(stderr)
- # endif /* ?MSDOS */
- # else /* !MSVMS */
--# ifdef TERMIO /* Amdahl, Cray, all SysV? */
-+# if defined(TERMIOS)
-+# include <termios.h>
-+# define sgttyb termios
-+# define sg_flags c_lflag
-+# define GTTY(f, s) tcgetattr(f, (void *) s)
-+# define STTY(f, s) tcsetattr(f, TCSAFLUSH, (void *) s)
-+# elif defined(TERMIO) /* Amdahl, Cray, all SysV? */
- # ifdef CONVEX
- # include <sys/termios.h>
- # include <sgtty.h>
-@@ -99,11 +94,16 @@
- # define GTTY gtty
- # define STTY stty
- # endif /* ?TERMIO */
-+#ifdef MODERN
-+#include <fcntl.h>
-+#include <unistd.h>
-+#else
- int isatty OF((int));
- char *ttyname OF((int));
- int open OF((char *, int, ...));
- int close OF((int));
- int read OF((int, voidp *, int));
-+#endif
- # endif /* ?MSVMS */
- #endif /* !EXPORT */
-
-@@ -197,6 +197,9 @@
- #endif /* !UTIL */
-
-
-+#ifdef MODERN
-+#include <unistd.h>
-+#else
- /* Library functions not in (most) header files */
- char *mktemp OF((char *));
- int link OF((char *, char *));
-@@ -207,6 +210,7 @@ int unlink OF((char *));
- * parameter is an unsigned long.
- */
- #endif /* !CONVEX */
-+#endif
-
-
- #ifndef UTIL /* the companion #endif is a bit of ways down ... */
-@@ -215,11 +219,15 @@ int unlink OF((char *));
- int utime OF((char *, time_t *));
- #endif /* !__TURBOC__ */
- #ifndef MSDOS
-+#ifdef MODERN
-+#include <fcntl.h>
-+#else
- int open OF((char *, int, ...));
- int close OF((int));
- # ifndef RMDIR
- int rmdir OF((char *));
- # endif /* !RMDIR */
-+#endif
- #endif /* !MSDOS */
-
-
diff --git a/archivers/zip1/patches/patch-ab b/archivers/zip1/patches/patch-ab
deleted file mode 100644
index 8ed5fc79b84..00000000000
--- a/archivers/zip1/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:35:52 agc Exp $
-
---- tailor.h.orig Mon Oct 21 13:34:28 1991
-+++ tailor.h Sat Jun 20 17:18:04 1998
-@@ -1,10 +1,5 @@
- /* tailor.h -- Not copyrighted 1991 Mark Adler */
-
--/* const's are inconsistently used across ANSI libraries--kill for all
-- header files. */
--#define const
--
--
- /* Use prototypes and ANSI libraries if __STDC__ */
- #ifdef __STDC__
- # ifndef PROTO
diff --git a/archivers/zip1/patches/patch-ac b/archivers/zip1/patches/patch-ac
deleted file mode 100644
index 5ffbc9bd044..00000000000
--- a/archivers/zip1/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:35:52 agc Exp $
-
---- zip.1.orig Mon Oct 21 13:33:32 1991
-+++ zip.1 Sat Jun 20 17:36:55 1998
-@@ -6,11 +6,11 @@
- .\"
- .\" zip.1 by Mark Adler.
- .\"
--.TH ZIP 1
-+.TH ZIP1 1
- .SH NAME
--zip \- package and compress (archive) files
-+zip1 \- package and compress (archive) files in Zip 1.x format
- .SH SYNOPSIS
--.B zip
-+.B zip1
- [
- .B \-cdefghijklmnoqrsuwyz
- ] [
-@@ -22,11 +22,14 @@
- list ]
- .br
- .SH DESCRIPTION
--.I Zip
-+.I Zip1
-+(hereafter called Zip)
- is a compression and file packaging utility for Unix, MSDOS, OS/2, and VMS.
- It is
- analogous to a combination of tar and compress and is compatible with PKZIP
--(Phil Katz ZIP) for MSDOS systems.
-+(Phil Katz ZIP) for MSDOS systems (version 1). Use the zip(1) utility to
-+create Zip version 2 archives, which include better compression but are
-+incompatible with PKUNZIP version 1.
- .PP
- There is a companion to
- .I Zip
diff --git a/archivers/zip1/patches/patch-ad b/archivers/zip1/patches/patch-ad
deleted file mode 100644
index e3b79473f25..00000000000
--- a/archivers/zip1/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:35:52 agc Exp $
-
---- zip.h.orig Mon Oct 21 13:34:06 1991
-+++ zip.h Sat Jun 20 17:21:28 1998
-@@ -176,7 +176,9 @@
- int issymlnk OF((ulg a));
- # ifdef S_IFLNK
- # define rdsymlnk(p,b,n) readlink(p,b,n)
-+#ifndef MODERN
- extern int readlink OF((char *, char *, int));
-+#endif
- # else /* !S_IFLNK */
- # define rdsymlnk(p,b,n) (0)
- # endif /* !S_IFLNK */
diff --git a/archivers/zip1/patches/patch-ae b/archivers/zip1/patches/patch-ae
deleted file mode 100644
index 4e5dd8112cb..00000000000
--- a/archivers/zip1/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:35:53 agc Exp $
-
---- zipup.c.orig Mon Oct 21 13:33:48 1991
-+++ zipup.c Sat Jun 20 17:03:09 1998
-@@ -34,10 +34,15 @@
- # include <fcntl.h>
- # define fhow (O_RDONLY|O_BINARY)
- # else /* !MSDOS */
-+#ifdef MODERN
-+#include <fcntl.h>
-+#include <unistd.h>
-+#else
- int open OF((char *, int));
- int read OF((int, char *, int));
- int close OF((int));
- int lseek OF((int,long,int));
-+#endif
- # define fhow 0
- # endif /* ?MSDOS */
- typedef int ftype;
diff --git a/archivers/zip1/patches/patch-af b/archivers/zip1/patches/patch-af
deleted file mode 100644
index 2d3b1927f20..00000000000
--- a/archivers/zip1/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/10/03 20:34:56 joerg Exp $
-
---- implode.h.orig 2005-07-22 15:19:13.000000000 +0000
-+++ implode.h
-@@ -98,10 +98,6 @@ struct match
- */
-
- extern FDATA fd; /* file data */
--#ifndef MSDOS
--extern int errno; /* system error code */
--#endif /* MSDOS */
--
- extern MATCH *ma_buf; /* match info buffer */
- #define MA_BUFSIZE 512
- /* MA_BUFSIZE must be such that
diff --git a/archivers/zip1/patches/patch-ag b/archivers/zip1/patches/patch-ag
deleted file mode 100644
index ff5847b3071..00000000000
--- a/archivers/zip1/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/11/03 19:59:39 minskim Exp $
-
---- crypt.c.orig 1991-11-08 13:59:54.000000000 -0800
-+++ crypt.c
-@@ -23,7 +23,6 @@
- local int decrypt_byte OF((void));
- local void update_keys OF((int c));
- local void init_keys OF((char *passwd));
-- int zencode OF((int c));
- local int zdecode OF((int c));
-
- local ulg keys[3]; /* keys defining the pseudo random sequence */