Sync w/ FreeBSD ports. x11 and x11-* left to go.

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

5 files changed, 66 insertions, 15 deletions

diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index d17998ba4..b1408ed59 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog-plugins/Makefile,v 1.19 2011/08/24 16:05:56 kwm Exp $
+#   $MCom: ports/graphics/eog-plugins/Makefile,v 1.20 2012/08/17 19:06:44 kwm Exp $
 #
 
 PORTNAME=	eog-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index d5de8992e..5042d78ba 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.127 2011/06/03 21:27:50 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.128 2012/08/17 19:06:44 kwm Exp $
 #
 
 PORTNAME=	eog
 PORTVERSION=	2.32.1
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 71cee1542..d77e221f2 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/evince/Makefile,v 1.157 2012/06/13 12:31:10 kwm Exp $
+#    $MCom: ports/graphics/evince/Makefile,v 1.158 2012/08/17 19:06:44 kwm Exp $
 #
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,7 +19,8 @@ COMMENT=	GNOME 2 multi-format document viewer
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		spectre.1:${PORTSDIR}/print/libspectre
-RUN_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 \
+		yelp:${PORTSDIR}/x11/yelp
 
 CONFLICTS=	evince-3.[0-9]*
 
diff --git a/graphics/evince/files/patch-backend_pdf_ev-poppler.cc b/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
new file mode 100644
index 000000000..144950986
--- /dev/null
+++ b/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
@@ -0,0 +1,28 @@
+--- ./backend/pdf/ev-poppler.cc.orig	2010-09-28 01:54:34.000000000 +0900
++++ ./backend/pdf/ev-poppler.cc	2011-11-22 20:11:28.000000000 +0900
+@@ -640,6 +640,7 @@
+ 	PopplerPermissions permissions;
+ 	EvPage *page;
+ 	char *metadata;
++	gboolean linearized;
+ 
+ 	info = g_new0 (EvDocumentInfo, 1);
+ 
+@@ -676,7 +677,7 @@
+ 		      "producer", &(info->producer),
+ 		      "creation-date", &(info->creation_date),
+ 		      "mod-date", &(info->modified_date),
+-		      "linearized", &(info->linearized),
++		      "linearized", &linearized,
+ 		      "metadata", &metadata,
+ 		      NULL);
+ 
+@@ -782,6 +783,8 @@
+ 		info->security = g_strdup (_("No"));
+ 	}
+ 
++	info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
++
+ 	return info;
+ }
+ 
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index d786d8ff2..f279c90a4 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.2/
 
@@ -20,7 +21,9 @@ LIB_DEPENDS=	babl-0:${PORTSDIR}/x11/babl \
 OPTIONS=	CAIRO		"Enable Cairo" on \
 		ENSCRIPT	"Enable Enscript" on \
 		FFMPEG		"Enable videos through ffmpeg (BROKEN)" off \
+		GDK		"Enable gdk-pixbuf2 formats support" on \
 		GRAPHVIZ	"Enable Graphviz" on \
+		JP2		"Enable JPEG2000 format support" on \
 		JPEG		"Enable JPEG format support" on \
 		LUA		"Enable LUA" on \
 		OPENEXR		"Enable High Dynamic Range (HDR) format support" on \
@@ -36,7 +39,7 @@ OPTIONS=	CAIRO		"Enable Cairo" on \
 # Disable docs until I fix the problem with graphviz's dot
 NOPORTDOCS=	yes
 
-USE_GNOME=	gtk20 glib20 pkgconfig gnomehack
+USE_GNOME=	glib20 pkgconfig gnomehack
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
@@ -56,6 +59,14 @@ EXAMPLES=	2geglbuffer csugar float-lookup \
 
 .include <bsd.port.options.mk>
 
+.if !defined(WITHOUT_GDK)
+USE_GNOME+=	gdkpixbuf2
+PLIST_SUB+=	GDK=""
+.else
+CONFIGURE_ARGS+=--without-gdk-pixbuf
+PLIST_SUB+=	GDK="@comment "
+.endif
+
 .if !defined(WITHOUT_CAIRO)
 LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 PLIST_SUB+=	CAIRO=""
@@ -84,7 +95,6 @@ BUILD_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-a4
 .endif
 
 .if !defined(WITHOUT_FFMPEG)
-#BROKEN=	ffmpeg support is currently broken
 LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
@@ -98,6 +108,14 @@ LIB_DEPENDS+=	graph:${PORTSDIR}/graphics/graphviz
 CONFIGURE_ARGS+=--without-graphviz
 .endif
 
+.if !defined(WITHOUT_JP2)
+LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
+PLIST_SUB+=	JP2=""
+.else
+CONFIGURE_ARGS+=--without-jasper
+PLIST_SUB+=	JP2="@comment "
+.endif
+
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	JPEG=""
@@ -174,16 +192,20 @@ PLIST_SUB+=	V4L="@comment "
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	a2x:${PORTSDIR}/textproc/asciidoc
 .else
-CONFIGURE_ARGS+=	--disable-docs
+CONFIGURE_ARGS+=--disable-docs
 .endif
 
 post-patch:
 .if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e '10s|\\||; 11,13d' ${WRKSRC}/Makefile.am
-.endif
-	${REINPLACE_CMD} -e 's|-T||' ${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in
-	${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|/usr/bin/ruby|/usr/bin/env ruby|' ${WRKSRC}/tools/gobj2dot.rb
+	${REINPLACE_CMD} -e '10s|\\||; 11,13d' \
+		${WRKSRC}/Makefile.am
+.endif
+	${REINPLACE_CMD} -e 's|-T||' ${WRKSRC}/docs/Makefile.am \
+		${WRKSRC}/docs/Makefile.in
+	${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|/usr/bin/ruby|/usr/bin/env ruby|' \
+		${WRKSRC}/tools/gobj2dot.rb
 
 post-build:
 .if !defined(NOPORTDOCS)