Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Feb 2013 16:41:43 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r313111 - head/graphics/geeqie
Message-ID:  <201302281641.r1SGfhgD065797@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Feb 28 16:41:43 2013
New Revision: 313111
URL: http://svnweb.freebsd.org/changeset/ports/313111

Log:
  - OptionsNG
  - Trim header

Modified:
  head/graphics/geeqie/Makefile

Modified: head/graphics/geeqie/Makefile
==============================================================================
--- head/graphics/geeqie/Makefile	Thu Feb 28 16:38:18 2013	(r313110)
+++ head/graphics/geeqie/Makefile	Thu Feb 28 16:41:43 2013	(r313111)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	graphics/geeqie
-# Date created:				17 May 2008
-# Whom:					Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
-#
+# Created by: Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
 # $FreeBSD$
-#
 
 PORTNAME=	geeqie
 PORTVERSION=	1.1
@@ -32,28 +28,30 @@ PORTDOCS=	*
 MAN1=		geeqie.1
 USE_GETTEXT=	yes
 
-OPTIONS=	EXIV2 "Metadata editing" on \
-		LCMS "Color adjusting" on \
-		LIRC "Remote control" off \
-		GPS "GPS map support (libchamplain) EXPERIMENTAL" off
+OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS DOCS
+OPTIONS_DEFAULT=EXIV2 LCMS
+EXIV2_DESC=	Metadata editing
+LCMS_DESC=	Color adjusting
+LIRC_DESC=	Remote control
+GPS_DESC=	GPS map support (libchamplain) EXPERIMENTAL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_EXIV2)
+.if ${PORT_OPTIONS:MEXIV2}
 LIB_DEPENDS+=	exiv2.12:${PORTSDIR}/graphics/exiv2
 CONFIGURE_ARGS+=--enable-exiv2
 .else
 CONFIGURE_ARGS+=--disable-exiv2
 .endif
 
-.if defined(WITH_LCMS)
+.if ${PORT_OPTIONS:MLCMS}
 LIB_DEPENDS+=	lcms.1:${PORTSDIR}/graphics/lcms
 CONFIGURE_ARGS+=--enable-lcms
 .else
 CONFIGURE_ARGS+=--disable-lcms
 .endif
 
-.if defined(WITH_LIRC)
+.if ${PORT_OPTIONS:MLIRC}
 LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=--enable-lirc
 .else
@@ -61,7 +59,7 @@ CONFIGURE_ARGS+=--disable-lirc
 .endif
 
 # Support for libchamplain is marked as experimental!
-.if defined(WITH_GPS)
+.if ${PORT_OPTIONS:MGPS}
 LIB_DEPENDS+=	champlain-0.8.1:${PORTSDIR}/graphics/libchamplain
 CONFIGURE_ARGS+=--enable-gps
 .else
@@ -74,11 +72,11 @@ post-patch:
 # I cannot get gnome-doc-tool working properly: Outputs gibberish
 	@${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \
 		${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-helpDATA||' \
 		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e '/^install-data-am:/,/^[a-z]/ s|install-readmeDATA||' \
 		${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



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