From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 16 15:23:30 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C7AE106566C;
	Sun, 16 Sep 2012 15:23:30 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87B738FC08;
	Sun, 16 Sep 2012 15:23:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8GFNUHl016931;
	Sun, 16 Sep 2012 15:23:30 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8GFNU0F016929;
	Sun, 16 Sep 2012 15:23:30 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201209161523.q8GFNU0F016929@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 16 Sep 2012 15:23:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304358 - head/graphics/png
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Sep 2012 15:23:30 -0000

Author: dinoex
Date: Sun Sep 16 15:23:30 2012
New Revision: 304358
URL: http://svn.freebsd.org/changeset/ports/304358

Log:
  - use OPTIONS_DEFINE

Modified:
  head/graphics/png/Makefile

Modified: head/graphics/png/Makefile
==============================================================================
--- head/graphics/png/Makefile	Sun Sep 16 15:20:12 2012	(r304357)
+++ head/graphics/png/Makefile	Sun Sep 16 15:23:30 2012	(r304358)
@@ -28,7 +28,9 @@ SOSUFFIX=	.${PORTVERSION:E}
 MAN3=		libpng.3 libpngpf.3
 MAN5=		png.5
 
-OPTIONS=	APNG "Animated PNG support" On
+OPTIONS_DEFINE=APNG
+OPTIONS_DEFAULT=APNG
+APNG_DESC=Enable Animated PNG support
 
 .include <bsd.port.pre.mk>
 
@@ -36,17 +38,17 @@ OPTIONS=	APNG "Animated PNG support" On
 BROKEN=		Please remove WITH_DEBUG for this port
 .endif
 
-.if !defined(WITHOUT_APNG) || make(makesum) || defined(FETCH_ALL)
+.if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL)
 MASTER_SITES+=	SF/apng/libpng/libpng15/:apng
 DISTFILES+=	${DISTNAME}-apng.patch.gz:apng
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
-.if !defined(WITHOUT_APNG)
+.if ${PORT_OPTIONS:MAPNG}
 EXTRA_PATCHES=	${WRKSRC}/${DISTNAME}-apng.patch
 .endif
 
 post-extract:
-.if !defined(WITHOUT_APNG)
+.if ${PORT_OPTIONS:MAPNG}
 	@${LN} -sf ${WRKSRC} ${WRKSRC}/
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}-apng.patch.gz ${WRKSRC}/
 	${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz