From owner-freebsd-ports Tue Feb 15 13:38:20 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by builder.freebsd.org (Postfix) with ESMTP id 91ACC597B for ; Tue, 15 Feb 2000 11:59:36 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA03535; Tue, 15 Feb 2000 12:00:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from mailgw3.prontomail.com (mailgw3.prontomail.com [209.185.149.199]) by builder.freebsd.org (Postfix) with ESMTP id E921A5003 for ; Tue, 15 Feb 2000 11:14:48 -0800 (PST) Received: from mail46.prontomail.com (209.185.149.146) by mailgw3.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Tue, 15 Feb 2000 11:09:48 -0800 Received: from web39 (209.185.149.239) by mail46.prontomail.com (NPlex 2.0.123) for FreeBSD-gnats-submit@freebsd.org; Tue, 15 Feb 2000 11:14:56 -0800 Message-Id: Date: Wed, 16 Feb 2000 04:15:12 +0900 From: "KATO Tsuguru" To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16733: Update port: archivers/zip.with_encryption to 2.3 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16733 >Category: ports >Synopsis: Update port: archivers/zip.with_encryption to 2.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 15 12:00:03 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.3 New file: patches/patch-ad Remove file: patches/patch-ab patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/archivers/zip.with_encryption/Makefile archivers/zip.with_encryption/Makefile --- /usr/ports/archivers/zip.with_encryption/Makefile Tue Aug 31 19:12:37 1999 +++ archivers/zip.with_encryption/Makefile Tue Feb 15 23:41:58 2000 @@ -1,40 +1,39 @@ -# New ports collection makefile for: zip.with_encryption -# http://infozip.cdrom.com/pub/infozip/ -# -# Version required: 2.2 -# Date created: 22 Dec 1994 -# Whom: ache +# New ports collection makefile for: zip.with_encryption +# Version required: 2.3 +# Date created: 22 Dec 1994 +# Whom: ache # # $FreeBSD: ports/archivers/zip.with_encryption/Makefile,v 1.36 1999/08/31 06:40:22 mharo Exp $ # -DISTNAME= zip22 -PKGNAME= zip+crypt-2.2 +DISTNAME= zip23 +PKGNAME= zip+crypt-2.3 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.icce.rug.nl/infozip/src/ \ +MASTER_SITES= ftp://ftp.icce.rug.nl/infozip/src/ \ ftp://ftp.cdrom.com/pub/infozip/src/ -DISTFILES= zip22.tar.gz zcrypt28.zip +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ZCRYPT_SRC} + +MAINTAINER= ache@FreeBSD.org -MAINTAINER= ache@FreeBSD.org +BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip.with_encryption -BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip.with_encryption +RESTRICTED= "import/re-export restrictions for USA" -RESTRICTED= "import/re-export restrictions for USA" +WRKSRC= ${WRKDIR}/zip-2.3 +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MAKEFILE= unix/Makefile +ALL_TARGET= generic +MAN1= zip.1 -WRKSRC= ${WRKDIR}/zip-2.2 -EXTRACT_ONLY= zip22.tar.gz -MAKEFILE= unix/Makefile -MAKE_FLAGS= LOCAL_ZIP="${CFLAGS}" -f -ALL_TARGET= generic -MAN1= zip.1 +ZCRYPT_SRC= zcrypt28.zip post-extract: - cd ${WRKSRC} && unzip -q -aa -o ${DISTDIR}/zcrypt28.zip + @unzip -q -aa -o ${_DISTDIR}/${ZCRYPT_SRC} -d ${WRKSRC} -x WHERE do-install: - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin - cd ${WRKSRC}/man && \ - ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1 +.for file in zip zipcloak zipnote zipsplit + ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin +.endfor + ${INSTALL_MAN} ${WRKSRC}/man/zip.1 ${PREFIX}/man/man1 .include diff -urN /usr/ports/archivers/zip.with_encryption/files/md5 archivers/zip.with_encryption/files/md5 --- /usr/ports/archivers/zip.with_encryption/files/md5 Mon Dec 28 20:12:58 1998 +++ archivers/zip.with_encryption/files/md5 Tue Feb 15 22:35:50 2000 @@ -1,2 +1,2 @@ -MD5 (zip22.tar.gz) = abfa0cfa13a4813aea02b0414a99ad37 +MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f MD5 (zcrypt28.zip) = 87ece6fe69c8cb71eec0e1a945542f37 diff -urN /usr/ports/archivers/zip.with_encryption/patches/patch-ab archivers/zip.with_encryption/patches/patch-ab --- /usr/ports/archivers/zip.with_encryption/patches/patch-ab Mon Dec 28 10:03:12 1998 +++ archivers/zip.with_encryption/patches/patch-ab Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- zip.c.bak Sun Oct 26 18:04:23 1997 -+++ zip.c Mon Dec 28 03:47:18 1998 -@@ -70,7 +70,7 @@ - - #if CRYPT - /* Pointer to crc_table, needed in crypt.c */ --ulg near *crc_32_tab; -+ZCONST ulg near *crc_32_tab; - #endif - - /* Local functions */ diff -urN /usr/ports/archivers/zip.with_encryption/patches/patch-ac archivers/zip.with_encryption/patches/patch-ac --- /usr/ports/archivers/zip.with_encryption/patches/patch-ac Mon Dec 28 10:03:12 1998 +++ archivers/zip.with_encryption/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- zipcloak.c.bak Wed Oct 15 22:09:33 1997 -+++ zipcloak.c Mon Dec 28 03:49:16 1998 -@@ -33,7 +33,7 @@ - local FILE *tempzf; - - /* Pointer to CRC-32 table (used for decryption/encryption) */ --ulg near *crc_32_tab; -+ZCONST ulg near *crc_32_tab; - - /*********************************************************************** - * Issue a message for the error, clean up files and memory, and exit. diff -urN /usr/ports/archivers/zip.with_encryption/patches/patch-ad archivers/zip.with_encryption/patches/patch-ad --- /usr/ports/archivers/zip.with_encryption/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ archivers/zip.with_encryption/patches/patch-ad Tue Feb 15 22:24:22 2000 @@ -0,0 +1,20 @@ +--- unix/Makefile.orig Mon Nov 29 14:22:42 1999 ++++ unix/Makefile Tue Feb 15 21:41:55 2000 +@@ -17,7 +17,7 @@ + LN = ln -s + + # (to use the Gnu compiler, change cc to gcc in CC) +-CC = cc ++CC ?= cc + BIND = $(CC) + AS = $(CC) -c + E = +@@ -45,7 +45,7 @@ + # CFLAGS flags for C compile + # LFLAGS1 flags after output file spec, before obj file list + # LFLAGS2 flags after obj file list (libraries, etc) +-CFLAGS = -O2 -I. -DUNIX $(LOCAL_ZIP) ++CFLAGS += -I. -DUNIX $(LOCAL_ZIP) + LFLAGS1 = + LFLAGS2 = -s + diff -urN /usr/ports/archivers/zip.with_encryption/pkg/DESCR archivers/zip.with_encryption/pkg/DESCR --- /usr/ports/archivers/zip.with_encryption/pkg/DESCR Sat May 4 20:47:13 1996 +++ archivers/zip.with_encryption/pkg/DESCR Tue Feb 15 22:44:24 2000 @@ -2,3 +2,5 @@ PKZIP 2.04g (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. + +http://www.cdrom.com/pub/infozip/Zip.html diff -urN /usr/ports/archivers/zip.with_encryption/pkg/PLIST archivers/zip.with_encryption/pkg/PLIST --- /usr/ports/archivers/zip.with_encryption/pkg/PLIST Mon Aug 17 19:14:11 1998 +++ archivers/zip.with_encryption/pkg/PLIST Tue Feb 15 22:35:12 2000 @@ -1,4 +1,4 @@ bin/zip +bin/zipcloak bin/zipnote bin/zipsplit -bin/zipcloak Sent by Japanese ProntoMail >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message