nb1: Turn on encryption by default for same reasons as was done to

archivers/zip way back in 2000.  Add modern termios support to make the
encryption code build on more platforms.

5 files changed, 40 insertions, 33 deletions

diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index eebdee7a5c9..29fd07b6712 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2004/11/22 21:01:37 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/23 02:42:10 tv Exp $
 #
 
 DISTNAME=	zip1-1.1
+PKGREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/
-DISTFILES=	zip11.zip
+MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
+		http://ftp.uni-koeln.de/util/arc/
+DISTFILES=	zip11.zip zcrypt10.zip
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.info-zip.org/pub/infozip/
@@ -18,38 +20,26 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
-ALL_TARGET=	zip
+ALL_TARGET=	zip zipcloak
 
 USE_BUILDLINK3=	yes
-PLIST_SRC=	${WRKSRC}/PLIST
-
-BUILD_DEFS+=	ZIP_ENCRYPTION
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(ZIP_ENCRYPTION)
-DISTFILES+=	zcrypt10.zip
-ALL_TARGET+=	zipcloak
-CRYPTO=		yes
-.endif
-
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 .if ${OPSYS} == "Linux" || ${OPSYS} == "Interix"
-MAKE_FLAGS=	CFLAGS="${CFLAGS} -DSYSV"
+CFLAGS+=	-DSYSV -DMODERN -DTERMIOS
 .else
-MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
+CFLAGS+=	-DDIRENT
+MAKE_FLAGS+=	LFLAGS2=-lcompat
 .endif
 
 INSTALLATION_DIRS=	bin man/man1
 
 do-install:
-	@${CP} ${PKGDIR}/PLIST.pre ${PLIST_SRC}
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} zip ${PREFIX}/bin/zip1
 	cd ${WRKSRC} && ${INSTALL_MAN} zip.1 ${PREFIX}/man/man1/zip1.1
-.if defined(ZIP_ENCRYPTION)
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} zipcloak ${PREFIX}/bin/zipcloak1
 	${LN} -fs zip1.1 ${PREFIX}/man/man1/zipcloak1.1
-	@${ECHO} >>${PLIST_SRC} "bin/zipcloak1"
-	@${ECHO} >>${PLIST_SRC} "man/man1/zipcloak1.1"
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zip1/PLIST b/archivers/zip1/PLIST
new file mode 100644
index 00000000000..e05038d6756
--- /dev/null
+++ b/archivers/zip1/PLIST
@@ -0,0 +1,5 @@
+@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/PLIST.pre b/archivers/zip1/PLIST.pre
deleted file mode 100644
index 929ac922d77..00000000000
--- a/archivers/zip1/PLIST.pre
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/10/31 20:26:52 zuntum Exp $
-bin/zip1
-man/man1/zip1.1
diff --git a/archivers/zip1/distinfo b/archivers/zip1/distinfo
index cba71c8d1f0..235d619a416 100644
--- a/archivers/zip1/distinfo
+++ b/archivers/zip1/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/06/11 22:21:30 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/11/23 02:42:10 tv Exp $
 
 SHA1 (zip11.zip) = 71c84e82593d8ee3dd9189bf712524ceb93cc1bb
 Size (zip11.zip) = 158736 bytes
-SHA1 (zcrypt10.zip) = 80ec7a4bee0b8a7034bdb71070f84b7e66526646
-Size (zcrypt10.zip) = 14917 bytes
-SHA1 (patch-aa) = a30a47f79f916f71db8eae400ead8f28b70cd3ce
+SHA1 (zcrypt10.zip) = e1638d3c5af1081789948518177c173df9f6e50f
+Size (zcrypt10.zip) = 14674 bytes
+SHA1 (patch-aa) = 6ea300fb79167d3d1f32cde9407ff967aac35894
 SHA1 (patch-ab) = d81a0b000e96bd0c09b7817e7572390aa173ef2c
 SHA1 (patch-ac) = 0d0301ee6aafb271e97c45eac44164c7430ab084
 SHA1 (patch-ad) = 63882bc4380af7b6f5277ba15a94b95f2dc68447
diff --git a/archivers/zip1/patches/patch-aa b/archivers/zip1/patches/patch-aa
index 80876a7c7af..953bcfc0304 100644
--- a/archivers/zip1/patches/patch-aa
+++ b/archivers/zip1/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:35:52 agc Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/23 02:42:10 tv Exp $
 
 --- fileio.c.orig	Sat Aug 29 21:51:00 1992
-+++ fileio.c	Sat Jun 20 17:26:18 1998
++++ fileio.c
 @@ -59,16 +59,6 @@
  #endif /* ?VMS */
  
@@ -19,7 +19,22 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:52 agc Exp $
  #ifndef EXPORT
  #  ifdef MSVMS
  #    ifdef MSDOS
-@@ -99,11 +89,16 @@
+@@ -77,7 +67,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 +95,16 @@
  #      define GTTY gtty
  #      define STTY stty
  #    endif /* ?TERMIO */
@@ -36,7 +51,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:52 agc Exp $
  #  endif /* ?MSVMS */
  #endif /* !EXPORT */
  
-@@ -197,6 +192,9 @@
+@@ -197,6 +198,9 @@
  #endif /* !UTIL */
  
  
@@ -46,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:52 agc Exp $
  /* Library functions not in (most) header files */
  char *mktemp OF((char *));
  int link OF((char *, char *));
-@@ -207,6 +205,7 @@
+@@ -207,6 +211,7 @@ int unlink OF((char *));
      * parameter is an unsigned long.
      */
  #endif /* !CONVEX */
@@ -54,7 +69,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:35:52 agc Exp $
  
  
  #ifndef UTIL    /* the companion #endif is a bit of ways down ... */
-@@ -215,11 +214,15 @@
+@@ -215,11 +220,15 @@ int unlink OF((char *));
     int utime OF((char *, time_t *));
  #endif /* !__TURBOC__ */
  #ifndef MSDOS