From owner-freebsd-ports Tue May 30 12:40:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id B46D037B552 for ; Tue, 30 May 2000 12:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA19358; Tue, 30 May 2000 12:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 38D2F37BE9D; Tue, 30 May 2000 12:31:13 -0700 (PDT) Message-Id: <20000530193113.38D2F37BE9D@hub.freebsd.org> Date: Tue, 30 May 2000 12:31:13 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/18904: Update port: archivers/unzip Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18904 >Category: ports >Synopsis: Update port: archivers/unzip >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 May 30 12:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Support CFLAGS/ARCH properly - Support NOPORTDOCS >How-To-Repeat: >Fix: diff -urN /usr/ports/archivers/unzip/Makefile archivers/unzip/Makefile --- /usr/ports/archivers/unzip/Makefile Sat Apr 22 01:32:47 2000 +++ archivers/unzip/Makefile Wed May 31 03:57:17 2000 @@ -1,42 +1,48 @@ -# New ports collection makefile for: unzip +# New ports collection makefile for: unzip # ftp://ftp.info-zip.org/pub/infozip/Info-ZIP.html -# Date created: 17 October 1994 -# Whom: jmz +# Date created: 17 October 1994 +# Whom: jmz # # $FreeBSD: ports/archivers/unzip/Makefile,v 1.30 2000/04/21 14:28:02 ache Exp $ # PORTNAME= unzip -PORTVERSION= 5.41 +PORTVERSION= 5.41 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.freesoftware.com/pub/infozip/src/ -DISTNAME= unzip541 +MASTER_SITES= ftp://ftp.freesoftware.com/pub/infozip/src/ +DISTNAME= ${PORTNAME}541 MAINTAINER= ache@FreeBSD.org -Y2K= ftp://ftp.info-zip.org/pub/infozip/FAQ.html#Y2K +Y2K= ftp://ftp.info-zip.org/pub/infozip/FAQ.html#Y2K -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKEFILE= unix/Makefile -MAKE_FLAGS= LOCAL_UNZIP="${CFLAGS} -DUSE_SMITH_CODE -DUSE_UNSHRINK" -f -MAN1= funzip.1 unzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +MAKEFILE= unix/Makefile +MAKE_FLAGS= LOCAL_UNZIP="${CFLAGS} -DUSE_SMITH_CODE -DUSE_UNSHRINK" -f +MAN1= funzip.1 unzip.1 unzipsfx.1 zipgrep.1 zipinfo.1 -do-install: - cd ${WRKSRC} && \ - ${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin - ${LN} -sf unzip ${PREFIX}/bin/zipinfo - cd ${WRKSRC}/unix && \ - ${INSTALL_SCRIPT} zipgrep ${PREFIX}/bin - cd ${WRKSRC}/man && \ - ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1 - ${INSTALL} -d -m 555 -o ${SHAREOWN} -g ${SHAREGRP} ${PREFIX}/share/doc/unzip - cd ${WRKSRC} && \ - ${INSTALL_DATA} README COPYING WHERE ${PREFIX}/share/doc/unzip - -.include +.include -.if ${ARCH} == "alpha" -ALL_TARGET= bsd +.if ${ARCH} == "i386" +ALL_TARGET= freebsd .else -ALL_TARGET= freebsd +ALL_TARGET= bsd .endif + +do-install: +.for file in funzip unzip unzipsfx + ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin +.endfor + ${LN} -sf unzip ${PREFIX}/bin/zipinfo + ${INSTALL_SCRIPT} ${WRKSRC}/unix/zipgrep ${PREFIX}/bin +.for file in ${MAN1} + ${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man1 +.endfor +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/unzip +.for file in README COPYING WHERE + ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/unzip +.endfor +.endif + +.include diff -urN /usr/ports/archivers/unzip/patches/patch-aa archivers/unzip/patches/patch-aa --- /usr/ports/archivers/unzip/patches/patch-aa Sun Jan 23 11:40:23 2000 +++ archivers/unzip/patches/patch-aa Wed May 31 03:30:32 2000 @@ -1,5 +1,5 @@ ---- unix/Makefile.orig Thu Nov 19 13:59:08 1998 -+++ unix/Makefile Sat Jan 22 17:23:42 2000 +--- unix/Makefile.orig Sun Apr 16 12:27:18 2000 ++++ unix/Makefile Wed May 31 03:30:22 2000 @@ -42,7 +42,7 @@ # such as -DDOSWILD). @@ -9,12 +9,14 @@ LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) AS = as LOC = $(LOCAL_UNZIP) -@@ -680,7 +680,7 @@ +@@ -679,8 +679,8 @@ # FreeBSD on Intel: freebsd: unix_make @echo 'NOTE: use bsd target for non-Intel FreeBSD compiles (if any).' - $(MAKE) unzips CC=gcc LD=gcc AS=gcc\ +- CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\ + $(MAKE) unzips CC=$(CC) LD=$(CC) AS=$(CC)\ - CF="-O3 -Wall -I. -DASM_CRC -DBSD $(LOC)"\ ++ CF="-I. -DASM_CRC -DBSD $(LOC)"\ AF="-Di386 $(AF)" CRC32=crc_gcc + # Generic BSDish Unix gcc. ``The -O3 only works with later versions of gcc; >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message