svn commit: r327223 - head/archivers/zip

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Sep 14 06:50:59 2013
New Revision: 327223
URL: http://svnweb.freebsd.org/changeset/ports/327223

Log:
  - Update MASTER_SITES
  - While I'm here:
    - Cleanup Makefile header
    - Add LICENSE
    - Convert to new options framework
    - Simplify PORTDOCS installation
  
  PR:		ports/182019
  Submitted by:	A. J. <freebsd at skysmurf.nl> (maintainer)

Modified:
  head/archivers/zip/Makefile

Modified: head/archivers/zip/Makefile
==============================================================================
--- head/archivers/zip/Makefile	Sat Sep 14 06:48:02 2013	(r327222)
+++ head/archivers/zip/Makefile	Sat Sep 14 06:50:59 2013	(r327223)
@@ -1,20 +1,22 @@
-# New ports collection makefile for:	Info-ZIP
-# Date created:				22 Dec 1994
-# Whom:					Andrey Chernov <ache at FreeBSD.org>
-#
+# Created by: Andrey Chernov <ache at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	zip
 PORTVERSION=	3.0
 CATEGORIES=	archivers
 MASTER_SITES=	SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} \
-		ftp://ftp.skysmurf.nl/FreeBSD/distfiles/
+		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	freebsd at skysmurf.nl
 COMMENT=	Create/update ZIP files compatible with PKZIP
 
+# License is BSD-based, but not identical, so intall with documentation
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+OPTIONS_DEFINE=	DOCS
+
 MAKEFILE=	unix/Makefile
 ALL_TARGET=	generic
 
@@ -22,18 +24,16 @@ PLIST_FILES=	bin/zip bin/zipcloak bin/zi
 MAN1=		zip.1 zipcloak.1 zipnote.1 zipsplit.1
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
 
 do-install:
 .for p in ${PLIST_FILES:T}
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${MANPREFIX}/man/man1
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-# License is BSD-based, but not identical, so intall with documentation
-. for d in CHANGES LICENSE README* TODO WHATSNEW WHERE
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
-. endfor
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README* TODO WHATSNEW WHERE ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>