[Midnightbsd-cvs] CVS Commit: Makefile: Part two of three.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Part two of three.

Fix option handling.

Modified Files:
--------------
    mports/java/diablo-jre15:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre15/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ljava/diablo-jre15/Makefile -Ljava/diablo-jre15/Makefile -u -r1.4 -r1.5
--- java/diablo-jre15/Makefile
+++ java/diablo-jre15/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -50,7 +50,7 @@
 
 JRE_OSREL=freebsd6
 
-.if defined(WITH_TZUPDATE)
+.if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 TZUPDATE_VERSION=	1.1.0
 TZUPDATE_TZVERSION=	2007c
@@ -72,7 +72,7 @@
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
+.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (!defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the distribution\n\
@@ -86,7 +86,7 @@
 \"Latte Diablo ${JRE_VERSION}\".  Please place the downloaded\n\
 ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
 .endif
-.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
+.if !defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
 IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
 in a web browser and follow the \"Download\" link for\n\
 \"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
@@ -94,7 +94,7 @@
 .endif
 .endif
 
-.if defined(WITH_TZUPDATE)
+.if !defined(WITHOUT_TZUPDATE)
 post-extract:
 	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
 	@# Update time zones