3 files changed, 40 insertions, 33 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index cdd9b26fe62d..3510f0787ddb 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,42 +1,47 @@
-# New ports collection makefile for:    unzip
-# ftp://ftp.info-zip.org/pub/infozip/Info-ZIP.html
-# Date created:         17 October 1994
-# Whom:                 jmz
+# New ports collection makefile for:	unzip
+# Date created:		17 October 1994
+# Whom:			jmz
 #
 # $FreeBSD$
 #
 
 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
 
-.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 <bsd.port.post.mk>
diff --git a/archivers/unzip/files/patch-aa b/archivers/unzip/files/patch-aa
index 297d25954672..4c97f1e8aee3 100644
--- a/archivers/unzip/files/patch-aa
+++ b/archivers/unzip/files/patch-aa
@@ -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;
diff --git a/archivers/unzip/pkg-descr b/archivers/unzip/pkg-descr
index aac285057a3c..d0ff11038ec2 100644
--- a/archivers/unzip/pkg-descr
+++ b/archivers/unzip/pkg-descr
@@ -18,4 +18,4 @@ from the specified file instead of from stdin.
 Unzipsfx may be used to create self-extracting ZIP archives from previously
 created ZIP archives.
 
-WWW: ftp://ftp.info-zip.org/pub/infozip/Info-ZIP.html
+WWW: http://www.info-zip.org/pub/infozip/Info-ZIP.html