Sync with ports, mostly OptionsNG conversion and some diff reductions.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18518 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 25 insertions, 19 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index c563df531..2770c8234 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -22,11 +22,11 @@ RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 
 CONFLICTS=	brasero-3.[0-9]*
 
-USES=		gettext pathfix pkgconfig shared-mime-info desktop-file-utils
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	sm
+USES=		desktop-file-utils gettext pathfix pkgconfig shared-mime-info
 USE_GNOME=	intlhack gnomeprefix gnomedocutils
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	gconf core
@@ -40,14 +40,17 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		brasero.1
 GLIB_SCHEMAS=	org.gnome.brasero.gschema.xml
 
-OPTIONS=	NAUTILUS "Enable Nautilus extension" on \
-		LIBBURNIA "Enable libburnia plug-ins" off
+
+OPTIONS_DEFINE=	NAUTILUS LIBBURNIA
+OPTIONS_DEFAULT=NAUTILUS
+NAUTILUS_DESC=	Nautilus extension
+LIBBURNIA_DESC=	libburnia plug-ins
 
 PLIST_SUB=	FULL_VERSION=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus2
 CONFIGURE_ARGS+=--enable-nautilus
 PLIST_SUB+=	NAUTILUS=""
@@ -56,7 +59,7 @@ PLIST_SUB+=	NAUTILUS="@comment "
 CONFIGURE_ARGS+=--enable-nautilus=no
 .endif
 
-.if defined(WITH_LIBBURNIA)
+.if ${PORT_OPTIONS:MLIBBURNIA}
 LIB_DEPENDS+=	burn:${PORTSDIR}/devel/libburn \
     		isofs:${PORTSDIR}/devel/libisofs
 CONFIGURE_ARGS+=--enable-libburnia
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile
index d42878b8d..9c47ecdfd 100644
--- a/sysutils/gnome-control-center3/Makefile
+++ b/sysutils/gnome-control-center3/Makefile
@@ -35,7 +35,7 @@ CONFLICTS=	gnome-control-center-2.[0-9]* gnome-media-2.[0-9]*
 
 LATEST_LINK=	gnome-control-center3
 USE_XZ=		yes
-USES=		gettext pathfix pkgconfig desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gettext pathfix pkgconfig shared-mime-info
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \
@@ -53,20 +53,27 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 WITH_GNOME=	yes
 .endif
 
-OPTIONS=	CUPS "Enable cups (printing) support" On \
-		CHEESE "Enable cheese webcam support" Off
+OPTIONS_DEFINE=	CUPS
+OPTIONS_DEFAULT=CUPS
+CUPS_DESC=	Cups (printing) support
+CHEESE_DESC=	Cheese webcam support" Off
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE_i386=	CHEESE
+OPTIONS_DEFAULT_i386=	CHEESE
+OPTIONS_DEFINE_amd64=	CHEESE
+OPTIONS_DEFAULT_amd64=	CHEESE
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
 .else
 PLIST_SUB+=	CUPS="@comment "
 CONFIGURE_ARGS+=--disable-cups
 .endif
 
-.if ${OSVERSION}>=800000 && (defined(WITH_CHEESE) && (${ARCH}=="i386" || ${ARCH}=="amd64"))
+.if ${PORT_OPTIONS:MCHEESE}
 CONFIGURE_ARGS+=--with-cheese
 BUILD_DEPENDS+=	cheese>=3.0.1:${PORTSDIR}/multimedia/cheese3
 LIB_DEPENDS+=	cheese.5:${PORTSDIR}/multimedia/cheese3
diff --git a/sysutils/gnome-power-manager3/Makefile b/sysutils/gnome-power-manager3/Makefile
index 17d79a401..321ae019b 100644
--- a/sysutils/gnome-power-manager3/Makefile
+++ b/sysutils/gnome-power-manager3/Makefile
@@ -30,22 +30,18 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.power-manager.gschema.xml
 
-OPTIONS=	MANPAGES "build man pages (pulls in docbook-utils)" off
+OPTIONS_DEFINE=	MANPAGES
 
 .include <bsd.port.options.mk>
 
-.if defined(PACKAGE_BUILDING)
-WITH_MANPAGES=yes
-.endif
-
-.if defined(WITH_MANPAGES)
+.if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
 		${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410
 MAN1=		gnome-power-statistics.1
 .endif
 
 post-patch:
-.if !defined(WITH_MANPAGES)
+.if ! ${PORT_OPTIONS:MMANPAGES}
 	@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
 		s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
 .endif