Update graphics/evince to 2.20.1. Depends on the (not yet commited)
poppler update submitted recently.
Based on work from Mikolaj Kucharski several months ago (for an
update to evince-0.9.something, IIRC).
Please test and comment, for both the default and the no_libgnome
flavor.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/evince/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 1 Oct 2007 11:42:30 -0000 1.8
+++ Makefile 22 Nov 2007 23:09:19 -0000
@@ -2,59 +2,74 @@
COMMENT= document viewer for multiple document formats
-DISTNAME= evince-0.8.1
-PKGNAME= ${DISTNAME}p0
+V= 2.20.1
+DISTNAME= evince-$V
CATEGORIES= graphics print
HOMEPAGE= http://www.gnome.org/projects/evince/
+FLAVORS= no_libgnome
+FLAVOR?=
+
# GPL
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/0.8/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/${V:C,\.[0-9]*$,,}/}
MODULES= devel/gettext
-BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \
+
+BUILD_DEPENDS= :ghostscript-*:print/ghostscript/gnu \
:gnome-doc-utils-*:x11/gnome/doc-utils \
- :ghostscript-*:print/ghostscript/gnu \
- ::print/texlive/base
-LIB_DEPENDS= poppler.>=1,poppler-glib.>=1::print/poppler \
- gnomeui-2::x11/gnome/libgnomeui \
+ :p5-XML-Parser-*:textproc/p5-XML-Parser
+LIB_DEPENDS= djvulibre::graphics/djvulibre \
+ gnome-keyring.>=2::x11/gnome/keyring \
gnomeprintui-2-2::x11/gnome/libgnomeprintui \
- esd.>=2::audio/esound \
- audiofile::devel/libaudiofile
-RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \
- :ghostscript-*:print/ghostscript/gnu \
- ::print/texlive/base \
+ gnomevfs-2.>=2000::x11/gnome/vfs2 \
+ kpathsea::print/texlive/base \
+ poppler.>=1,poppler-glib.>=1::print/poppler
+RUN_DEPENDS= :ghostscript-*:print/ghostscript/gnu \
+ :scrollkeeper-*:textproc/scrollkeeper \
:shared-mime-info-*:misc/shared-mime-info
-WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor \
- Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
- art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation bonoboui-2 \
- c cairo crypto dbus-1 dbus-glib-1 expat fontconfig \
- freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 \
- glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
- gnomecanvas-2 gnomeprint-2-2 gnomevfs-2 gobject-2.0 \
- gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 png popt pthread ssl tiff util xml2 z
+WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+ Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 c \
+ cairo crypto dbus-1 dbus-glib-1 expat fontconfig freetype \
+ gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 \
+ glib-2.0 glitz gmodule-2.0 gnomecanvas-2 gnomeprint-2-2 \
+ gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pcre png pthread ssl tiff util \
+ xml2 z
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evince/ \
+CONFIGURE_ARGS= --disable-nautilus \
--disable-schemas-install \
- --disable-nautilus \
- --disable-gnome-print \
+ --disable-scrollkeeper \
+ --enable-djvu \
+ --enable-dvi \
--enable-pixbuf \
- --enable-dvi
+ --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evince/
\
+ --with-print=gtk
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+.if ${FLAVOR:L:Mno_libgnome}
+CONFIGURE_ARGS+= --without-libgnome
+.else
+LIB_DEPENDS+= audiofile::devel/libaudiofile \
+ esd.>=2::audio/esound \
+ gnomeui-2.>=2000::x11/gnome/libgnomeui
+WANTLIB+= ICE ORBitCosNaming-2 SM bonobo-2 bonobo-activation \
+ bonoboui-2 gnome-2 popt
+.endif
+
USE_LIBTOOL= Yes
USE_X11= Yes
USE_GMAKE= Yes
+NO_REGRESS= Yes
post-patch:
@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/evince/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 13 May 2007 19:11:19 -0000 1.3
+++ distinfo 22 Nov 2007 23:09:19 -0000
@@ -1,5 +1,5 @@
-MD5 (evince-0.8.1.tar.gz) = GzP+lk6CqWgfyb8Itpa15g==
-RMD160 (evince-0.8.1.tar.gz) = yzx9XAl8A1miAQIFQfyZvEavyO0=
-SHA1 (evince-0.8.1.tar.gz) = TRtcy+J2YgxPFkW7kOQGPX7Si8M=
-SHA256 (evince-0.8.1.tar.gz) = DwcOCzHeRsTJp49i4qOZbLX1L1zTyqETvFuVdEWuGw4=
-SIZE (evince-0.8.1.tar.gz) = 2150808
+MD5 (evince-2.20.1.tar.gz) = uQnCvuMnLX4ACT/goJHhiQ==
+RMD160 (evince-2.20.1.tar.gz) = FK+349zYb3T6UKzerYSen0MdZPc=
+SHA1 (evince-2.20.1.tar.gz) = y53Fmsw7BfcbkjWXpgHfF1AeD6k=
+SHA256 (evince-2.20.1.tar.gz) = /+DvVEh7b8uvP6W1GheGtxptZOY4m/Je/Vhpd9APy6o=
+SIZE (evince-2.20.1.tar.gz) = 2339911
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/graphics/evince/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 18 Jun 2006 14:22:26 -0000 1.1.1.1
+++ pkg/DESCR 22 Nov 2007 23:09:19 -0000
@@ -1,3 +1,7 @@
Evince is a document viewer for multiple document formats.
The goal of evince is to replace the multiple document viewers that
exist on the GNOME Desktop with a single simple application.
+
+Flavors:
+
+- no_libgnome: don't use libgnome.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/evince/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 13 May 2007 19:11:20 -0000 1.2
+++ pkg/PLIST 22 Nov 2007 23:09:19 -0000
@@ -8,7 +8,6 @@ share/applications/
share/applications/evince.desktop
share/evince/
share/evince/evince-password.glade
-share/evince/evince-preview-toolbar.xml
share/evince/evince-properties.glade
share/evince/evince-toolbar.xml
share/evince/evince-ui.xml
@@ -21,18 +20,29 @@ share/evince/icons/hicolor/16x16/actions
share/evince/icons/hicolor/16x16/actions/view-page-facing.png
share/evince/icons/hicolor/16x16/actions/zoom-fit-page.png
share/evince/icons/hicolor/16x16/actions/zoom-fit-width.png
+share/evince/icons/hicolor/16x16/actions/zoom.png
share/evince/icons/hicolor/22x22/
share/evince/icons/hicolor/22x22/actions/
share/evince/icons/hicolor/22x22/actions/view-page-continuous.png
share/evince/icons/hicolor/22x22/actions/view-page-facing.png
share/evince/icons/hicolor/22x22/actions/zoom-fit-page.png
share/evince/icons/hicolor/22x22/actions/zoom-fit-width.png
+share/evince/icons/hicolor/22x22/actions/zoom.png
share/evince/icons/hicolor/24x24/
share/evince/icons/hicolor/24x24/actions/
share/evince/icons/hicolor/24x24/actions/view-page-continuous.png
share/evince/icons/hicolor/24x24/actions/view-page-facing.png
share/evince/icons/hicolor/24x24/actions/zoom-fit-page.png
share/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
+share/evince/icons/hicolor/24x24/actions/zoom.png
+share/evince/icons/hicolor/32x32/
+share/evince/icons/hicolor/32x32/actions/
+share/evince/icons/hicolor/32x32/actions/view-page-continuous.png
+share/evince/icons/hicolor/32x32/actions/view-page-facing.png
+share/evince/icons/hicolor/48x48/
+share/evince/icons/hicolor/48x48/actions/
+share/evince/icons/hicolor/48x48/actions/view-page-continuous.png
+share/evince/icons/hicolor/48x48/actions/view-page-facing.png
share/gnome/
share/gnome/help/
share/gnome/help/evince/
@@ -73,10 +83,22 @@ share/gnome/help/evince/it/
share/gnome/help/evince/it/evince.xml
share/gnome/help/evince/it/figures/
share/gnome/help/evince/it/figures/evince_start_window.png
+share/gnome/help/evince/ja/
+share/gnome/help/evince/ja/evince.xml
+share/gnome/help/evince/ja/figures/
+share/gnome/help/evince/ja/figures/evince_start_window.png
share/gnome/help/evince/nl/
share/gnome/help/evince/nl/evince.xml
share/gnome/help/evince/nl/figures/
share/gnome/help/evince/nl/figures/evince_start_window.png
+share/gnome/help/evince/oc/
+share/gnome/help/evince/oc/evince.xml
+share/gnome/help/evince/oc/figures/
+share/gnome/help/evince/oc/figures/evince_start_window.png
+share/gnome/help/evince/pt_BR/
+share/gnome/help/evince/pt_BR/evince.xml
+share/gnome/help/evince/pt_BR/figures/
+share/gnome/help/evince/pt_BR/figures/evince_start_window.png
share/gnome/help/evince/ru/
share/gnome/help/evince/ru/evince.xml
share/gnome/help/evince/ru/figures/
@@ -179,6 +201,9 @@ share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/evince.mo
share/locale/be/LC_MESSAGES/evince.mo
+share/locale/[EMAIL PROTECTED]/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/evince.mo
share/locale/bg/LC_MESSAGES/evince.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
@@ -191,8 +216,6 @@ share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/evince.mo
share/locale/ca/LC_MESSAGES/evince.mo
share/locale/cs/LC_MESSAGES/evince.mo
-share/locale/cy/
-share/locale/cy/LC_MESSAGES/
share/locale/cy/LC_MESSAGES/evince.mo
share/locale/da/LC_MESSAGES/evince.mo
share/locale/de/LC_MESSAGES/evince.mo
@@ -208,8 +231,6 @@ share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/evince.mo
share/locale/es/LC_MESSAGES/evince.mo
share/locale/et/LC_MESSAGES/evince.mo
-share/locale/eu/
-share/locale/eu/LC_MESSAGES/
share/locale/eu/LC_MESSAGES/evince.mo
share/locale/fa/
share/locale/fa/LC_MESSAGES/
@@ -235,8 +256,6 @@ share/locale/ko/LC_MESSAGES/evince.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/evince.mo
-share/locale/lt/
-share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/evince.mo
share/locale/lv/LC_MESSAGES/evince.mo
share/locale/mg/
@@ -257,6 +276,9 @@ share/locale/ne/LC_MESSAGES/
share/locale/ne/LC_MESSAGES/evince.mo
share/locale/nl/LC_MESSAGES/evince.mo
share/locale/nn/LC_MESSAGES/evince.mo
+share/locale/oc/
+share/locale/oc/LC_MESSAGES/
+share/locale/oc/LC_MESSAGES/evince.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/evince.mo
@@ -268,13 +290,9 @@ share/locale/pt/LC_MESSAGES/evince.mo
share/locale/pt_BR/LC_MESSAGES/evince.mo
share/locale/ro/LC_MESSAGES/evince.mo
share/locale/ru/LC_MESSAGES/evince.mo
-share/locale/rw/
-share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/evince.mo
share/locale/sk/LC_MESSAGES/evince.mo
share/locale/sl/LC_MESSAGES/evince.mo
-share/locale/sq/
-share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/evince.mo
share/locale/sr/LC_MESSAGES/evince.mo
share/locale/[EMAIL PROTECTED]/LC_MESSAGES/evince.mo
@@ -282,6 +300,9 @@ share/locale/sv/LC_MESSAGES/evince.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/evince.mo
+share/locale/te/
+share/locale/te/LC_MESSAGES/
+share/locale/te/LC_MESSAGES/evince.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/evince.mo
@@ -292,8 +313,6 @@ share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/evince.mo
share/locale/zh_CN/LC_MESSAGES/evince.mo
-share/locale/zh_HK/
-share/locale/zh_HK/LC_MESSAGES/
share/locale/zh_HK/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
share/omf/evince/
@@ -306,13 +325,18 @@ share/omf/evince/evince-es.omf
share/omf/evince/evince-fi.omf
share/omf/evince/evince-fr.omf
share/omf/evince/evince-it.omf
+share/omf/evince/evince-ja.omf
share/omf/evince/evince-nl.omf
+share/omf/evince/evince-oc.omf
+share/omf/evince/evince-pt_BR.omf
share/omf/evince/evince-ru.omf
share/omf/evince/evince-sr.omf
share/omf/evince/evince-sv.omf
share/omf/evince/evince-uk.omf
[EMAIL PROTECTED] GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/evince/*.schemas
> /dev/null
share/schemas/
share/schemas/evince/
+share/schemas/evince/evince-thumbnailer-djvu.schemas
share/schemas/evince/evince-thumbnailer-dvi.schemas
share/schemas/evince/evince-thumbnailer-ps.schemas
share/schemas/evince/evince-thumbnailer.schemas
@@ -320,3 +344,7 @@ share/schemas/evince/evince.schemas
@exec %D/bin/scrollkeeper-update -q
@unexec %D/bin/scrollkeeper-update -q
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/evince/*.schemas >
/dev/null
[EMAIL PROTECTED] %D/bin/update-desktop-database
[EMAIL PROTECTED] %D/bin/update-desktop-database
[EMAIL PROTECTED] %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
[EMAIL PROTECTED] %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
--
Options are good. As long as they are optional.
-- Artur Grabowski
