Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Mar 2014 12:40:59 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348981 - head/graphics/zphoto
Message-ID:  <201403241240.s2OCexDG082494@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403241240.s2OCexDG082494>