From owner-svn-ports-all@FreeBSD.ORG  Mon Mar 24 12:40:59 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EEA0CF05;
 Mon, 24 Mar 2014 12:40:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5F86EE30;
 Mon, 24 Mar 2014 12:40:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2OCextO082495;
 Mon, 24 Mar 2014 12:40:59 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2OCexDG082494;
 Mon, 24 Mar 2014 12:40:59 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201403241240.s2OCexDG082494@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 24 Mar 2014 12:40:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r348981 - head/graphics/zphoto
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Mar 2014 12:41:00 -0000

Author: bapt
Date: Mon Mar 24 12:40:58 2014
New Revision: 348981
URL: http://svnweb.freebsd.org/changeset/ports/348981
QAT: https://qat.redports.org/buildarchive/r348981/

Log:
  Convert to new options framework
  Remove wxgtk option which is broken with all support version of wxgtk

Modified:
  head/graphics/zphoto/Makefile

Modified: head/graphics/zphoto/Makefile
==============================================================================
--- head/graphics/zphoto/Makefile	Mon Mar 24 12:35:11 2014	(r348980)
+++ head/graphics/zphoto/Makefile	Mon Mar 24 12:40:58 2014	(r348981)
@@ -11,11 +11,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Zooming photo album generator
 
-LIB_DEPENDS=	ming.5:${PORTSDIR}/graphics/ming \
-		popt.0:${PORTSDIR}/devel/popt
-.if !defined (WITHOUT_ZIP)
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-.endif
+OPTIONS_DEFINE=	ZIP
+OPTIONS_DEFAULT=	ZIP
+ZIP_DESC=	Enable zip support
+
+LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming \
+		libpopt.so:${PORTSDIR}/devel/popt
+
+ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+ZIP_CONFIGURE_OFF=	--disable-zip
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-avifile
@@ -23,18 +27,8 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib 
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
 USE_EFL=	imlib2
-.if defined (WITH_WXGTK2)
-USE_WX=		2.4
-WX_CONF_ARGS=	absolute
 PLIST_FILES+=	bin/wxzphoto
-.else
-CONFIGURE_ARGS+=	--disable-wx
-.endif
-.if defined (WITHOUT_ZIP)
-CONFIGURE_ARGS+=	--disable-zip
-.endif
-USE_GMAKE=	yes
-USES=		perl5
+USES=		perl5 gmake
 USE_PERL5=	build
 
 NO_STAGE=	yes