More syncs with ports, updating for new USES, bit of reshuffling to reduce

diffs with ports.


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

26 files changed, 143 insertions, 160 deletions

diff --git a/accessibility/accerciser3/Makefile b/accessibility/accerciser3/Makefile
index d8abc7cea..e83a932db 100644
--- a/accessibility/accerciser3/Makefile
+++ b/accessibility/accerciser3/Makefile
@@ -26,8 +26,8 @@ USES=		gettext pkgconfig
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_DISPLAY=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.a11y.Accerciser.gschema.xml
 MAN1=		accerciser.1
diff --git a/accessibility/mousetweaks3/Makefile b/accessibility/mousetweaks3/Makefile
index a7d4357c7..f533c8d8f 100644
--- a/accessibility/mousetweaks3/Makefile
+++ b/accessibility/mousetweaks3/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USES=		gettext pathfix pkgconfig
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.mousetweaks.enums.xml \
 		org.gnome.mousetweaks.gschema.xml
diff --git a/audio/rhythmbox3/Makefile b/audio/rhythmbox3/Makefile
index 98b98512c..9ed0ab24e 100644
--- a/audio/rhythmbox3/Makefile
+++ b/audio/rhythmbox3/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS=	--disable-vala
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
@@ -50,8 +50,8 @@ OPTIONS_DEFAULT=NOTIFY PYTHON
 IPOD_DESC=	iPod support
 ITMS_PLUGIN_DESC=iTunes browser plugin
 WEBKIT_DESC=	HTML view support
-#OPTIONS=	DAAP "Enable iTunes music sharing" off \
-#		VISUAL "Enable clutter visualizer plugin" on \
+#DAAP "Enable iTunes music sharing" off \
+#VISUAL "Enable clutter visualizer plugin" on \
 
 MAN1=		rhythmbox-client.1 rhythmbox.1
 
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 12f813523..d250eaec6 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -18,11 +18,9 @@ LIBGDA5_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
 
-#BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
     		soup-2.4:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0:${PORTSDIR}/devel/json-glib
-#RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
 
 USE_AUTOTOOLS=	libtool
 USES=		gettext pathfix pkgconfig
@@ -35,8 +33,8 @@ CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
 		--disable-default-binary \
 		--disable-introspection
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 3010e987d..182617234 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -1,6 +1,6 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#  $MCom$
+#  $MCom: ports/trunk/deskutils/gnome-contacts/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	gnome-contacts
 PORTVERSION=	3.4.1
@@ -21,8 +21,8 @@ USE_GMAKE=	yes
 USES=		gettext pathfix pkgconfig
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.gnome.Contacts.gschema.xml
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index ce63c4605..12a562e87 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 USE_XZ=		yes
 USE_GMAKE=	yes
 USES=		gettext pathfix pkgconfig
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix glib20 libxml2 ltverhack intlhack
 USE_AUTOTOOLS=	libtool
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index 3e8037921..ed930b154 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -31,8 +31,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
 USE_GMAKE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=3.0
 DATADIR=	share/seed-gtk3
 
@@ -46,12 +46,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/libseed/Makefile.in
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
-#	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
-#		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
-#.if defined(NOPORTEXAMPLES)
-#	@${REINPLACE_CMD} -e 's|examples||g' \
-#		${WRKSRC}/Makefile.in
-#.endif
 .if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
 		${WRKSRC}/Makefile.in
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 65ba0c4ba..33f0ce499 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	eog
 PORTVERSION=	2.32.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -13,6 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The Eye Of Gnome image viewer
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	lcms:${PORTSDIR}/graphics/lcms
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 CONFLICTS=	eog-3.[0-9]*
@@ -20,7 +21,6 @@ CONFLICTS=	eog-3.[0-9]*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack librsvg2 gconf2 gnomedesktop
-WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USES=		gettext pathfix desktop-file-utils shared-mime-info pkgconfig
 INSTALLS_OMF=	yes
@@ -30,22 +30,30 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	eog.schemas
 
+OPTIONS_DEFINE= EXIF EXEMPI PYTHON
+OPTIONS_DEFAULT=EXIF EXEMPI PYTHON
+EXIF_DESC=	Digital camera file meta-data support
+EXEMPI_DESC=	XMP support
+
+.include <bsd.port.options.mk>
+
 _WITH_EXIF=	no
 _WITH_EXEMPI=	no
 
-.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
-	defined(WITH_EXIF))
+.if ${PORT_OPTIONS:MEXIF}
 LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
 PLIST_SUB+=	EXIF=""
 _WITH_EXIF=	yes
 .else
+CONFIGURE_ARGS+=--without-libexif
 PLIST_SUB+=	EXIF="@comment "
 .endif
 
-.if !defined(WITHOUT_EXEMPI) || (exists(${LOCALBASE}/lib/libexempi.so)) || \
-    	defined(WITH_EXEMPI)
+.if ${PORT_OPTIONS:MEXEMPI}
 LIB_DEPENDS+=	exempi:${PORTSDIR}/textproc/exempi
 _WITH_EXEMPI=	yes
+.else
+CONFIGURE_ARGS+=--without-xmp
 .endif
 
 .if ${_WITH_EXIF}=="yes" || ${_WITH_EXEMPI}=="yes"
@@ -54,7 +62,7 @@ PLIST_SUB+=	EXIFEXEMPI=""
 PLIST_SUB+=	EXIFEXEMPI="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mpygtk2}!=""
+.if ${PORT_OPTIONS:MPYTHON}
 USE_GNOME+=	pygtk2
 CONFIGURE_ARGS+=--enable-python
 .else
diff --git a/graphics/eog3/Makefile b/graphics/eog3/Makefile
index c8743e4c4..e8bad525f 100644
--- a/graphics/eog3/Makefile
+++ b/graphics/eog3/Makefile
@@ -37,17 +37,19 @@ GLIB_SCHEMAS=	org.gnome.eog.enums.xml \
 
 PLIST_SUB+=	VERSION=3.0
 
-OPTIONS=	EXIF "Enable digital camera file meta-data support" on \
-		EXEMPI "Enable XMP support" on
+OPTIONS_DEFINE=	EXIF EXEMPI
+OPTIONS_DEFAULT=EXIF EXEMPI
+EXIF_DESC= 	Digital camera file meta-data support
+EXEMPI_DESC=	XMP support
 
 .include <bsd.port.options.mk>
 
 _WITH_EXIF=	no
 _WITH_EXEMPI=	no
 
-.if defined(WITH_EXIF)
+.if ${PORT_OPTIONS:MEXIF}
 CONFIGURE_ARGS+=--with-libexif
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=	exif:${PORTSDIR}/graphics/libexif
 PLIST_SUB+=	EXIF=""
 _WITH_EXIF=	yes
 .else
@@ -55,9 +57,9 @@ CONFIGURE_ARGS+=--without-libexif
 PLIST_SUB+=	EXIF="@comment "
 .endif
 
-.if defined(WITH_EXEMPI)
+.if ${PORT_OPTIONS:MEXEMPI}
 CONFIGURE_ARGS+=--with-xmp
-LIB_DEPENDS+=	exempi.3:${PORTSDIR}/textproc/exempi
+LIB_DEPENDS+=	exempi:${PORTSDIR}/textproc/exempi
 _WITH_EXEMPI=	yes
 .else
 CONFIGURE_ARGS+=--without-xmp
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index da3dcbe4f..64ccac475 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -14,6 +14,7 @@ COMMENT=	GNOME 2 multi-format document viewer
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		spectre:${PORTSDIR}/print/libspectre
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		yelp:${PORTSDIR}/x11/yelp
@@ -24,9 +25,9 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix desktop-file-utils
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
+USES=		pathfix gettext desktop-file-utils
 USE_GNOME=	intlhack gnomeprefix gnomedocutils ltasneededhack gconf2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -40,46 +41,46 @@ PLIST_SUB+=	VERSION=2.32
 
 MAN1=		evince.1
 
-OPTIONS=	DVI		"Enable DVI viewer support"		off \
-		T1LIB		"Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)"	off \
-		NAUTILUS	"Enable Nautilus plugin"		on  \
-		KEYRING		"Enable Gnome-Keyring without Nautilus" on \
-		DBUS		"Enable D-BUS support"			on \
-		COMICS		"Enable comic book archives support"	on \
-		IMPRESS		"Enable Impress presentations support"	off \
-		DJVU		"Enable DJVU support"			off
+OPTIONS_DEFINE=	DVI T1LIB NAUTILUS KEYRING COMICS IMPRESS DJVU
+OPTIONS_DEFAULT=NAUTILUS KEYRING COMICS
+DVI_DESC=	DVI viewer support
+T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
+NAUTILUS_DESC=	Nautilus plugin
+KEYRING_DESC=	Gnome-Keyring without Nautilus
+COMICS_DESC=	Comic book archives support
+IMPRESS_DESC=	Impress presentations support
+DJVU_DESC=	DJVU support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(PACKAGE_BUILDING) || exists(${LOCALBASE}/lib/libdbus-glib-1.so)
-WITH_DBUS=	yes
-.endif
-
-.if defined(WITH_DVI) || defined(WITH_T1LIB) || exists(${LOCALBASE}/lib/libkpathsea.a)
+.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
 BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS+=	tex:${PORTSDIR}/print/teTeX-base
 
 CONFIGURE_ARGS+=	--enable-dvi
 GCONF_SCHEMAS+=	evince-thumbnailer-dvi.schemas
 PLIST_SUB+=		DVI=""
-. if defined(WITH_T1LIB)
-LIB_DEPENDS+=	t1.5:${PORTSDIR}/devel/t1lib
+. if ${PORT_OPTIONS:MT1LIB}
+LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
 
 CONFIGURE_ARGS+=	--enable-t1lib
+. else
+CONFIGURE_ARGS+=	--disable-t1lib
 . endif
 .else
+CONFIGURE_ARGS+=	--disable-dvi
 PLIST_SUB+=		DVI="@comment "
 .endif
 
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=		nautilus2
 CONFIGURE_ARGS+=	--enable-nautilus
 PLIST_SUB+=		NAUTILUS=""
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-.if !defined(WITHOUT_KEYRING)
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+.if ${PORT_OPTIONS:MKEYRING}
+LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 .else
 CONFIGURE_ARGS+=	--without-keyring
 .endif
@@ -87,7 +88,7 @@ CONFIGURE_ARGS+=	--disable-nautilus
 PLIST_SUB+=		NAUTILUS="@comment "
 .endif
 
-.if defined(WITH_IMPRESS)
+.if ${PORT_OPTIONS:MIMPRESS}
 CONFIGURE_ARGS+=	--enable-impress
 PLIST_SUB+=		IMPRESS=""
 .else
@@ -95,7 +96,7 @@ CONFIGURE_ARGS+=	--disable-impress
 PLIST_SUB+=		IMPRESS="@comment "
 .endif
 
-.if defined(WITH_DJVU)
+.if ${PORT_OPTIONS:MDJVU}
 LIB_DEPENDS+=		djvulibre:${PORTSDIR}/graphics/djvulibre
 CONFIGURE_ARGS+=	--enable-djvu
 GCONF_SCHEMAS+=		evince-thumbnailer-djvu.schemas
@@ -105,11 +106,7 @@ CONFIGURE_ARGS+=	--disable-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
-.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-.endif
-
-.if !defined(WITHOUT_COMICS)
+.if ${PORT_OPTIONS:MCOMICS}
 RUN_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
 CONFIGURE_ARGS+=	--enable-comics
 GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
diff --git a/graphics/evince3/Makefile b/graphics/evince3/Makefile
index 450a72c72..c7638a10d 100644
--- a/graphics/evince3/Makefile
+++ b/graphics/evince3/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,6 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		spectre:${PORTSDIR}/print/libspectre
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
@@ -28,12 +29,13 @@ USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_XORG=	ice
 INSTALLS_ICONS=	yes
-USES=		gettext pathfix pkgconfig desktop-file-utils
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
+USES=		pathfix gettext pkgconfig desktop-file-utils
 USE_GNOME=	intlhack gnomeprefix gnomedocutils ltasneededhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-xps
 
 GLIB_SCHEMAS=	org.gnome.Evince.gschema.xml
 
@@ -41,40 +43,44 @@ PLIST_SUB=	VERSION=3.0
 
 MAN1=		evince.1
 
-OPTIONS=	DVI		"Enable DVI viewer support"		off \
-		T1LIB		"Enable T1LIB for TYPE1 fonts to DVI (Enables DVI)"	off \
-		NAUTILUS	"Enable Nautilus plugin"		on  \
-		KEYRING		"Enable Gnome-Keyring without Nautilus" on \
-		COMICS		"Enable comic book archives support"	on \
-		DJVU		"Enable DJVU support"			off
-#		XPS		"Enable XPS backend support"		off \
+OPTIONS_DEFINE=	DVI T1LIB NAUTILUS KEYRING COMICS IMPRESS DJVU
+OPTIONS_DEFAULT=NAUTILUS KEYRING COMICS
+DVI_DESC=	DVI viewer support
+T1LIB_DESC=	T1LIB for TYPE1 fonts to DVI (Enables DVI)
+NAUTILUS_DESC=	Nautilus plugin
+KEYRING_DESC=	Gnome-Keyring without Nautilus
+COMICS_DESC=	Comic book archives support
+IMPRESS_DESC=	Impress presentations support
+DJVU_DESC=	DJVU support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DVI) || defined(WITH_T1LIB) || exists(${LOCALBASE}/lib/libkpathsea.a)
+.if ${PORT_OPTIONS:MDVI} || ${PORT_OPTIONS:MT1LIB}
 BUILD_DEPENDS+=	tex:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS+=	tex:${PORTSDIR}/print/teTeX-base
 
 CONFIGURE_ARGS+=	--enable-dvi
 PLIST_SUB+=		DVI=""
-. if defined(WITH_T1LIB)
-LIB_DEPENDS+=	t1.5:${PORTSDIR}/devel/t1lib
-
+. if ${PORT_OPTIONS:MT1LIB}
+LIB_DEPENDS+=	t1:${PORTSDIR}/devel/t1lib
 CONFIGURE_ARGS+=	--enable-t1lib
+. else
+CONFIGURE_ARGS+=	--disable-t1lib
 . endif
 .else
+CONFIGURE_ARGS+=	--disable-dvi
 PLIST_SUB+=		DVI="@comment "
 .endif
 
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=		nautilus3
 CONFIGURE_ARGS+=	--enable-nautilus
 PLIST_SUB+=		NAUTILUS=""
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-.if !defined(WITHOUT_KEYRING)
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+.if ${PORT_OPTIONS:MKEYRING}
+LIB_DEPENDS+=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 .else
 CONFIGURE_ARGS+=	--without-keyring
 .endif
@@ -82,16 +88,8 @@ CONFIGURE_ARGS+=	--disable-nautilus
 PLIST_SUB+=		NAUTILUS="@comment "
 .endif
 
-#.if defined(WITH_XPS)
-#CONFIGURE_ARGS+=	--enable-xps
-#LIB_DEPENDS+=		
-#PLIST_SUB+=		XPS=""
-#.else
-CONFIGURE_ARGS+=	--disable-xps
-#PLIST_SUB+=		XPS="@comment "
-#.endif
 
-.if defined(WITH_DJVU)
+.if ${PORT_OPTIONS:MDJVU}
 LIB_DEPENDS+=		djvulibre:${PORTSDIR}/graphics/djvulibre
 CONFIGURE_ARGS+=	--enable-djvu
 PLIST_SUB+=		DJVU=""
@@ -100,7 +98,7 @@ CONFIGURE_ARGS+=	--disable-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
-.if !defined(WITHOUT_COMICS)
+.if ${PORT_OPTIONS:MCOMICS}
 RUN_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
 CONFIGURE_ARGS+=	--enable-comics
 PLIST_SUB+=		COMICS=""
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 49a9b406d..2a259ce4d 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -17,8 +17,7 @@ LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_XZ=		yes
 USE_GMAKE=	yes
@@ -27,7 +26,7 @@ MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	atk pango gdkpixbuf2 ltverhack
-USES=		gettext pathfix pkgconfig
+USES=		gettext pathfix pkgconfig shared-mime-info
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 PATCHDIR=	${.CURDIR}/../../x11-toolkits/gtk20/files
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 98ced0aa9..52de4f561 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -20,9 +20,8 @@ LIB_DEPENDS=	goffice-0.10:${PORTSDIR}/devel/goffice \
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix desktop-file-utils shared-mime-info
 USE_GMAKE=	yes
-USES=		pathfix desktop-file-utils shared-mime-info
 USE_GNOME=	gnomeprefix intlhack gnomehier libgsf pygobject3
 USE_PYTHON=	2.7-
 INSTALLS_OMF=	yes
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index fe171b7ea..ae5797e20 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -18,8 +18,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 
 USE_XZ=		yes
 USE_GMAKE=	yes
+USES=		pathfix gettext
 USE_GNOME=	gnomeprefix glib20 libxml2 intlhack ltverhack gnomehier
-USES=		gettext pathfix
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-libarchive
@@ -28,12 +28,14 @@ CONFIGURE_ENV=	ARCHIVE_CFLAGS="-I/usr/include" \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	QUVI "Enable flash media stream URL support"  off
+OPTIONS_DEFINE=	QUVI
+OPTIONS_DEFAULT=QUVI
+QUVI_DESC=	Flash media stream URL support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_QUVI)
-LIB_DEPENDS+=	quvi.7:${PORTSDIR}/multimedia/libquvi
+.if ${PORT_OPTIONS:MQUVI}
+LIB_DEPENDS+=	quvi:${PORTSDIR}/multimedia/libquvi
 CONFIGURE_ARGS+=--enable-quvi
 .else
 CONFIGURE_ARGS+=--enable-quvi=no
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index acbf5ba13..6228c8822 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -21,8 +21,8 @@ USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USES=		pathfix gettext
 USE_GNOME=	gnomehier intlhack ltverhack evolutiondataserver3
-USES=		gettext pathfix
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile
index 6051289d5..0c40d7ff7 100644
--- a/net-im/folks04/Makefile
+++ b/net-im/folks04/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	folks
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
 
@@ -20,11 +21,11 @@ CONFLICTS=	folks-0.[6-9].[0-9]*
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USES=		pathfix gettext
 USE_GNOME=	intlhack gnomehier
-USES=		gettext pathfix
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=22
 
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index b34f61a46..6fbc9ef2e 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD$
-#   $MCom: ports/trunk/net/avahi/Makefile 17268 2013-04-01 05:13:11Z marcus $
+# $FreeBSD: head/net/avahi/Makefile 314632 2013-03-19 10:40:22Z kwm $
+#   $MCom$
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
@@ -14,48 +14,47 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" for the Avahi service discovery suite
 
 RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app \
-		avahi-app>=0.6.20_2:${PORTSDIR}/net/avahi-app
+		avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
 
-OPTIONS=	AUTOIPD "IPv4LL network address configuration daemon" off \
-		GTK "Gtk+ tools and bindings" off \
-		LIBDNS "Apple's mDNSResponder compatibility library" off \
-		MONO "Mono bindings" off \
-		QT3 "Qt 3 bindings" off \
-		QT4 "Qt 4 bindings" off \
-		PYTHON "Python bindings and tools" off
+OPTIONS_DEFINE=	AUTOIPD GTK LIBDNS MONO QT3 QT4 PYTHON
+OPTIONS_DEFAULT=AUTOIPD GTK LIBDNS
+AUTOIPD_DESC=	IPv4LL network address configuration daemon
+GTK_DESC=	Gtk+ tools and bindings
+LIBDNS_DESC=	Apple's mDNSResponder compatibility library
+QT3_DESC=	Qt 3 toolkit
 
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_AUTOIPD)
+.if ${PORT_OPTIONS:MAUTOIPD}
 RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/net/avahi-autoipd
 .endif
 
-.if defined(WITH_GTK)
+.if ${PORT_OPTIONS:MGTK}
 RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
 .endif
 
-.if defined(WITH_LIBDNS)
+.if ${PORT_OPTIONS:MLIBDNS}
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
 .endif
 
-.if defined(WITH_MONO)
+.if ${PORT_OPTIONS:MMONO}
 RUN_DEPENDS+=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp
 .endif
 
-.if defined(WITH_QT3)
+.if ${PORT_OPTIONS:MQT3}
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt3.pc:${PORTSDIR}/net/avahi-qt3
 .endif
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-qt4.pc:${PORTSDIR}/net/avahi-qt4
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 RUN_DEPENDS+=	avahi-bookmarks:${PORTSDIR}/net/py-avahi
 .endif
 
 do-install:
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/gtk-vnc3/Makefile b/net/gtk-vnc3/Makefile
index 12c11461a..69ab9f9fa 100644
--- a/net/gtk-vnc3/Makefile
+++ b/net/gtk-vnc3/Makefile
@@ -14,19 +14,20 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.LIB
+
 CONFLICTS=	gtk-vnc-0.3.[0-9]*
 
-USE_XZ=		yes
 LATEST_LINK=	gtk-vnc3
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING.LIB
-USE_GNOME=	gnomehack gtk30
+USE_XZ=		yes
+USE_GNOME=	gtk30
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
+USES=		gettext pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gtk=3.0 --disable-introspection \
 		--disable-plugin --without-python
 MAN1=		gvnccapture.1
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 559a2aa26..025fff57e 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -35,11 +35,13 @@ GCONF_SCHEMAS=	vinagre.schemas
 
 MAN1=		vinagre.1
 
-OPTIONS=	TELEPATHY "Enable telepathy integration" on
+OPTIONS_DEFINE=	TELEPATHY
+OPTIONS_DEFAULT=TELEPATHY
+TELEPATHY_DESC=	Telepathy integration
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_TELEPATHY)
+.if ${PORT_OPTIONS:MTELEPATHY}
 CONFIGURE_ARGS+=--enable-telepathy
 LIB_DEPENDS+=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 PLIST_SUB+=	TELEPATHY=""
@@ -49,7 +51,7 @@ PLIST_SUB+=	TELEPATHY="@comment "
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog MAINTAINERS NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 1a443f614..fc16bfc82 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -18,8 +18,7 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
 		ck-connector:${PORTSDIR}/sysutils/consolekit
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof \
-		${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+		${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
 
 USE_GMAKE=	yes
 USE_XZ=		yes
diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile
index 6d40d1ba5..369deaa46 100644
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@@ -25,8 +25,8 @@ USES=		gettext pathfix pkgconfig
 USE_GMAKE=	yes
 USE_GNOME=	intlhack gnomeprefix gnomedocutils gtk30
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=no
 
 GLIB_SCHEMAS=	org.gnome.seahorse.recipients.gschema.xml
diff --git a/security/seahorse-sharing/Makefile b/security/seahorse-sharing/Makefile
index d46d9d6f8..fa2616a32 100644
--- a/security/seahorse-sharing/Makefile
+++ b/security/seahorse-sharing/Makefile
@@ -1,6 +1,6 @@
 # Created by: Dave McKay <dave@mu.org>
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/trunk/security/seahorse-sharing/Makefile 18393 2013-04-26 21:23:07Z kwm $
 
 PORTNAME=	seahorse-sharing
 PORTVERSION=	3.2.1
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 USE_GNOME=	intlhack gnomeprefix
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		seahorse-sharing.1
 
diff --git a/sysutils/gconf-editor3/Makefile b/sysutils/gconf-editor3/Makefile
index ec5144d8d..d4949729d 100644
--- a/sysutils/gconf-editor3/Makefile
+++ b/sysutils/gconf-editor3/Makefile
@@ -21,8 +21,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gtk30 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gconf-editor.1
 GCONF_SCHEMAS=	gconf-editor.schemas
diff --git a/sysutils/gstreamer1-plugins-cdio/Makefile b/sysutils/gstreamer1-plugins-cdio/Makefile
deleted file mode 100644
index e75f0104c..000000000
--- a/sysutils/gstreamer1-plugins-cdio/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION=	0
-CATEGORIES=	sysutils
-
-COMMENT=	Gstreamer compact disc input and control library
-
-GST_PLUGIN=	cdio
-DIST=		ugly
-
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 4a7b38fed..8f3ad264d 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 USE_XZ=		yes
 USE_GMAKE=	yes
 USES=		gettext pathfix
-USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index b16baf0fc..2f74830b8 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -23,8 +23,7 @@ LATEST_LINK=	gtk30
 
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
-RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
 USE_GMAKE=	yes
@@ -33,7 +32,7 @@ MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
-USES=		gettext pathfix pkgconfig
+USES=		gettext pathfix pkgconfig shared-mime-info
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-gtk2-dependency --disable-packagekit