svn commit: r314631 - head/deskutils/deskbar-applet

[Koop Mast]

Author: kwm
Date: Tue Mar 19 10:34:09 2013
New Revision: 314631
URL: http://svnweb.freebsd.org/changeset/ports/314631

Log:
  Convert to optionsNG, switch to USES=pathfix. Remove RUN_DEPEND for
  python < 2.6, and leftover from old py-simplejson detection.

Modified:
  head/deskutils/deskbar-applet/Makefile

Modified: head/deskutils/deskbar-applet/Makefile
==============================================================================
--- head/deskutils/deskbar-applet/Makefile	Tue Mar 19 10:26:51 2013	(r314630)
+++ head/deskutils/deskbar-applet/Makefile	Tue Mar 19 10:34:09 2013	(r314631)
@@ -17,7 +17,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/_
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack pygnomedesktop intlhack
+USES=		pathfix
+USE_GNOME=	gnomeprefix pygnomedesktop intlhack
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_DISPLAY=	yes
@@ -29,17 +30,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	deskbar-applet.schemas
 
-OPTIONS=	EVO "Enable evolution support" on
+OPTIONS_DEFINE=	EVO
+OPTIONS_DEFAULT=EVO
+EVO_DESC=	Enable evolution support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${PYTHON_REL} < 260
-RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson
-.endif
-
-_OSRELEASE!=	${UNAME} -r
-
-.if !defined(WITHOUT_EVO)
+.if ${PORT_OPTIONS:MEVO}
 USE_GNOME+=	evolutiondataserver
 PLIST_SUB+=	EVO=""
 .else