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

5 files changed, 74 insertions, 70 deletions

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