[Midnightbsd-cvs] mports [16041] trunk/x11/gnome-panel/Makefile: update to new opts

[laffer1 at midnightbsd.org]

Revision: 16041
          http://svnweb.midnightbsd.org/mports/?rev=16041
Author:   laffer1
Date:     2014-03-08 18:26:12 -0500 (Sat, 08 Mar 2014)
Log Message:
-----------
update to new opts

Modified Paths:
--------------
    trunk/x11/gnome-panel/Makefile

Modified: trunk/x11/gnome-panel/Makefile
===================================================================
--- trunk/x11/gnome-panel/Makefile	2014-03-08 23:25:51 UTC (rev 16040)
+++ trunk/x11/gnome-panel/Makefile	2014-03-08 23:26:12 UTC (rev 16041)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,16 +20,14 @@
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 
-USE_GETTEXT=	yes
 USE_XORG=	ice sm x11 xau xrandr
-USE_PYTHON=	yes
+USE_PYTHON=	2
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
+USES=		pathfix gettext gmake pkgconfig
+USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils ltverhack referencehack librsvg2
-WANT_GNOME=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -42,17 +40,15 @@
 		panel-toplevel.schemas window-list.schemas \
 		workspace-switcher.schemas
 
-OPTIONS=	EVOLUTION "use the Evolution calendar if installed" on \
-		BONOBO "Support for bonobo applets aka Gnome 2 applets" on
+OPTIONS_DEFINE=	EVOLUTION BONOBO
+OPTIONS_DEFAULT=EVOLUTION BONOBO
+EVOLUTION_DESC=	Use the Evolution calendar
+BONOBO_DESC=	Support for bonobo applets aka Gnome 2 applets
 
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!=""
+.if ${PORT_OPTIONS:MEVOLUTION}
 USE_GNOME+=	evolutiondataserver
 #CONFIGURE_ARGS+=--enable-eds
 .else
@@ -59,7 +55,7 @@
 CONFIGURE_ARGS+=--disable-eds
 .endif
 
-.if defined(WITH_BONOBO)
+.if ${PORT_OPTIONS:MBONOBO}
 USE_GNOME+=	libbonoboui
 CONFIGURE_ARGS+=--enable-bonobo
 PLIST_SUB+=	BONOBO=""
@@ -81,6 +77,6 @@
 post-install:
 	@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif