[Midnightbsd-cvs] mports [19737] trunk/Mk/extensions/zip.mk: change handling of infozip extension and fix typo in include check so we dont do it twice.

[laffer1 at midnightbsd.org]

Revision: 19737
          http://svnweb.midnightbsd.org/mports/?rev=19737
Author:   laffer1
Date:     2015-08-12 22:41:03 -0400 (Wed, 12 Aug 2015)
Log Message:
-----------
change handling of infozip extension and fix typo in include check so we dont do it twice.

Modified Paths:
--------------
    trunk/Mk/extensions/zip.mk

Modified: trunk/Mk/extensions/zip.mk
===================================================================
--- trunk/Mk/extensions/zip.mk	2015-08-13 02:35:13 UTC (rev 19736)
+++ trunk/Mk/extensions/zip.mk	2015-08-13 02:41:03 UTC (rev 19737)
@@ -5,22 +5,21 @@
 # Feature:	zip
 # Usage:	USES=zip[:infozip]
 
-.if !defined(_INCLUDE_USES_ZIP_Mk)
+.if !defined(_INCLUDE_USES_ZIP_MK)
 _INCLUDE_USES_ZIP_MK=	yes
 
-zip_ARGS?=	none
-
 EXTRACT_SUFX?=	.zip
 
 EXTRACT_BEFORE_ARGS?=	-qo
 EXTRACT_AFTER_ARGS?=	-d ${WRKDIR}
 
-.if !defined(zip_ARGS) || ${zip_ARGS} == none || ${zip_ARGS}x == x
+.if empty(zip_ARGS)
 EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
-.elif ${zip_ARGS} == 'infozip'
+.elif ${zip_ARGS} == "infozip"
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
 .else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
 .endif
+
 .endif