Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2012 22:51:03 +0000 (UTC)
From:      Eitan Adler <eadler@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305415 - head/deskutils/orage
Message-ID:  <201210062251.q96Mp3Ei057784@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eadler
Date: Sat Oct  6 22:51:03 2012
New Revision: 305415
URL: http://svn.freebsd.org/changeset/ports/305415

Log:
  Convert to OptionsNG

Modified:
  head/deskutils/orage/Makefile

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Sat Oct  6 22:37:54 2012	(r305414)
+++ head/deskutils/orage/Makefile	Sat Oct  6 22:51:03 2012	(r305415)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xfce4-calendar
-# Date created:		2003-01-14
-# Whom:			Matt Lancereau <matt@rimasec.net>
-#
+# Created by: Matt Lancereau <matt@rimasec.net>
 # $FreeBSD$
-#
 
 PORTNAME=	orage
 PORTVERSION=	4.8.3
@@ -28,17 +24,16 @@ USE_XFCE=	configenv libmenu panel
 USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 		xfixes
 LDFLAGS+=	-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	BDB ICAL DBUS NOTIFY
+OPTIONS_DEFAULT=	DBUS NOTIFY
 
-OPTIONS=	BDB	"Enable BDB support"		off \
-		ICAL	"Enable libical support"	off \
-		DBUS	"Enable D-BUS support"		on \
-		NOTIFY	"Enable notification support"	on
+ICAL_DESC=	libical support
 
 MAN1=		globaltime.1 orage.1 tz_convert.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-configure
 CONFIGURE_ARGS+=--with-bdb4=yes --with-bdb4_dir=${LOCALBASE}
 USE_BDB=	yes
@@ -48,7 +43,7 @@ INVALIDE_BDB_VER=	5
 CONFIGURE_ARGS+=--with-bdb4=no
 .endif
 
-.if defined(WITH_ICAL)
+.if ${PORT_OPTIONS:MICAL}
 CONFIGURE_ARGS+=--enable-libical
 LIB_DEPENDS+=	ical.44:${PORTSDIR}/devel/libical
 CFLAGS+=	-I${LOCALBASE}/include/libical
@@ -58,7 +53,7 @@ CONFIGURE_ARGS+=--disable-libical
 PLIST_SUB+=	WITH_ICAL=""
 .endif
 
-.if !defined(WITHOUT_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	DBUS=""
@@ -67,7 +62,7 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if !defined(WITHOUT_NOTIFY)
+.if ${PORT_OPTIONS:MNOTIFY}
 LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-libnotify
 .else
@@ -75,12 +70,12 @@ CONFIGURE_ARGS+=--disable-libnotify
 .endif
 
 post-patch:
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 	@${REINPLACE_CMD} -e 's|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g ; \
 		s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g ; \
 		s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g' ${WRKSRC}/configure
 .endif
-.if !defined(WITH_ICAL)
+.if ${PORT_OPTIONS:MICAL}
 	@${REINPLACE_CMD} -e 's|libical-|no-&|g' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure



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