Hi.
This diff updates evince to the latest available version.
* update to version 2.24.2
* use gnome MODULE
* add missing desktop-file-utils run_depends
* this is a SHARED_ONLY port, so add --disable-static
* remove dot.desktop patch, evince should be in graphics, not office
Note that it needs the just imported print/libspectre.
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/evince/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 29 Jun 2008 20:44:51 -0000 1.14
+++ Makefile 12 Dec 2008 15:55:51 -0000
@@ -6,13 +6,14 @@
COMMENT-djvu= evince document viewer backend for djvu documents
COMMENT-dvi= evince document viewer backend for dvi documents
-V= 2.22.1.1
-DISTNAME= evince-${V}
+GNOME_PROJECT= evince
+GNOME_VERSION= 2.24.2
+
CATEGORIES= graphics print
-PKGNAME-main= ${DISTNAME}p1
-PKGNAME-djvu= evince-djvu-${V}p0
-PKGNAME-dvi= evince-dvi-${V}p0
+PKGNAME-main= ${DISTNAME}
+PKGNAME-djvu= evince-djvu-${GNOME_VERSION}
+PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
SHARED_LIBS= evbackend 0.0 # .0.0
@@ -24,66 +25,67 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evince/${V:C,\.[0-9]\.[0-9]*$,,}/}
-
-MODULES= devel/gettext textproc/intltool
+MODULES= devel/gettext \
+ x11/gnome
BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils \
- :ghostscript-*:print/ghostscript/gnu \
::x11/gnome/icon-theme
MULTI_PACKAGES= -main -djvu -dvi
-WANTLIB= ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite \
- Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
- Xrender atk-1.0 audiofile bonobo-2 \
- bonobo-activation cairo crypto dbus-1 dbus-glib-1 \
- esd expat fontconfig freetype gconf-2 gdk-x11-2.0 \
- gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \
- gnome-2 gnomevfs-2 gobject-2.0 \
- gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pcre pixman-1 png popt ssl util xml2 z
-
-WANTLIB-main= ${WANTLIB} ICE SM art_lgpl_2 bonoboui-2 c gailutil \
- glade-2.0 gnome-keyring gnomecanvas-2 jpeg pthread \
- tiff
-LIB_DEPENDS-main= gnomeui-2.>=2000::x11/gnome/libgnomeui \
- poppler.>=3,poppler-glib.>=3::print/poppler \
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \
+ fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
+ glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 \
+ m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
+ pixman-1 png xml2 z
+
+WANTLIB-main= ${WANTLIB} ICE ORBit-2 SM c dbus-1 dbus-glib-1 \
+ gconf-2 glade-2.0 gnome-keyring gs gthread-2.0 \
+ jpeg pthread tiff
+LIB_DEPENDS-main= poppler.>=3,poppler-glib.>=3::print/poppler \
+ spectre::print/libspectre \
${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-main= :scrollkeeper-*:textproc/scrollkeeper \
:shared-mime-info-*:misc/shared-mime-info \
:ghostscript-*:print/ghostscript/gnu \
::x11/gnome/icon-theme \
- :yelp-*:x11/gnome/yelp
+ ${MODGNOME_RUN_DEPENDS}
WANTLIB-djvu= ${WANTLIB} jpeg
LIB_DEPENDS-djvu= evbackend::${BASE_PKGPATH} \
djvulibre::graphics/djvulibre \
${MODGETTEXT_LIB_DEPENDS}
+RUN_DEPENDS-djvu= # empty
-WANTLIB-dvi= ${WANTLIB}
+WANTLIB-dvi= ${WANTLIB} gs spectre
LIB_DEPENDS-dvi= evbackend::${BASE_PKGPATH} \
kpathsea::print/texlive/base \
${MODGETTEXT_LIB_DEPENDS}
+RUN_DEPENDS-dvi= # empty
+
+USE_X11= Yes
+MODGNOME_HELP_FILES= Yes
+DESKTOP_FILES= Yes
+
+LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --disable-comics \
+CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
+ --disable-static \
+ --disable-comics \
--disable-impress \
- --disable-nautilus \
+ --enable-nautilus=no \
--disable-schemas-install \
--disable-scrollkeeper \
--enable-djvu \
--enable-dvi \
--enable-pixbuf \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evince/
+
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
-
-USE_LIBTOOL= Yes
-USE_X11= Yes
-USE_GMAKE= 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.5
diff -u -r1.5 distinfo
--- distinfo 21 May 2008 22:13:35 -0000 1.5
+++ distinfo 12 Dec 2008 15:55:51 -0000
@@ -1,5 +1,5 @@
-MD5 (evince-2.22.1.1.tar.gz) = 0mOxyzloxlzLNlm86UkN1Q==
-RMD160 (evince-2.22.1.1.tar.gz) = jhalFIQihxH5zjR7QO+MRX9DmQA=
-SHA1 (evince-2.22.1.1.tar.gz) = ldspV+qyk0d1M4sXaFhmM/YXR9A=
-SHA256 (evince-2.22.1.1.tar.gz) = z0wkfRKAHMZPDKTHF6zehHgaVOzwAhwewffh/lx/VRg=
-SIZE (evince-2.22.1.1.tar.gz) = 2457208
+MD5 (evince-2.24.2.tar.bz2) = 8PngapNRayOO4krDjWi1fA==
+RMD160 (evince-2.24.2.tar.bz2) = 0DisQeLZVgEeKUNE5EIxdxkUn7M=
+SHA1 (evince-2.24.2.tar.bz2) = kY+OwHw5PK1P6hwzFc0m7ThNZes=
+SHA256 (evince-2.24.2.tar.bz2) = qm8pyTQT4gaw4w/CQbTlqo1nyUuv9QubkhR1Q1Fua84=
+SIZE (evince-2.24.2.tar.bz2) = 1717166
Index: patches/patch-data_evince_desktop_in_in
===================================================================
RCS file: patches/patch-data_evince_desktop_in_in
diff -N patches/patch-data_evince_desktop_in_in
--- patches/patch-data_evince_desktop_in_in 21 May 2008 22:13:35 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-data_evince_desktop_in_in,v 1.1 2008/05/21 22:13:35 bernd Exp $
-
-- We want to see the evince application in the menu.
-- The Office menu is more appropriate.
-
---- data/evince.desktop.in.in.orig Mon Apr 7 23:05:37 2008
-+++ data/evince.desktop.in.in Thu May 15 19:20:36 2008
-@@ -8,11 +8,11 @@ StartupNotify=true
- Terminal=false
- Type=Application
- Icon=evince
--NoDisplay=true
-+NoDisplay=false
- X-GNOME-DocPath=
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=evince
- X-GNOME-Bugzilla-Component=general
- x-gnome-bugzilla-versi...@version@
--Categories=GNOME;GTK;Graphics;VectorGraphics;Viewer;
-+Categories=GNOME;GTK;Office;VectorGraphics;Viewer;
- mimety...@evince_mime_types@
Index: pkg/PLIST-djvu
===================================================================
RCS file: /cvs/ports/graphics/evince/pkg/PLIST-djvu,v
retrieving revision 1.1
diff -u -r1.1 PLIST-djvu
--- pkg/PLIST-djvu 21 May 2008 22:13:35 -0000 1.1
+++ pkg/PLIST-djvu 12 Dec 2008 15:55:51 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST-djvu,v 1.1 2008/05/21 22:13:35 bernd Exp $
lib/evince/backends/djvudocument.evince-backend
-lib/evince/backends/libdjvudocument.a
lib/evince/backends/libdjvudocument.la
lib/evince/backends/libdjvudocument.so
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule
%D/share/schemas/evince/evince-thumbnailer-djvu.schemas > /dev/null
Index: pkg/PLIST-dvi
===================================================================
RCS file: /cvs/ports/graphics/evince/pkg/PLIST-dvi,v
retrieving revision 1.1
diff -u -r1.1 PLIST-dvi
--- pkg/PLIST-dvi 21 May 2008 22:13:35 -0000 1.1
+++ pkg/PLIST-dvi 12 Dec 2008 15:55:51 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST-dvi,v 1.1 2008/05/21 22:13:35 bernd Exp $
lib/evince/backends/dvidocument.evince-backend
-lib/evince/backends/libdvidocument.a
lib/evince/backends/libdvidocument.la
lib/evince/backends/libdvidocument.so
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule
%D/share/schemas/evince/evince-thumbnailer-dvi.schemas > /dev/null
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/evince/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- pkg/PLIST-main 21 May 2008 22:13:35 -0000 1.1
+++ pkg/PLIST-main 12 Dec 2008 15:55:51 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.1 2008/05/21 22:13:35 bernd Exp $
@pkgpath graphics/evince
-bin/evince
-bin/evince-thumbnailer
+...@bin bin/evince
+...@bin bin/evince-thumbnailer
include/evince-2.20/
include/evince-2.20/evince/
include/evince-2.20/evince/ev-async-renderer.h
@@ -24,28 +24,24 @@
include/evince-2.20/evince/ev-link-action.h
include/evince-2.20/evince/ev-link-dest.h
include/evince-2.20/evince/ev-link.h
+include/evince-2.20/evince/ev-page.h
include/evince-2.20/evince/ev-render-context.h
include/evince-2.20/evince/ev-selection.h
include/evince-2.20/evince/ev-transition-effect.h
lib/evince/
lib/evince/backends/
-lib/evince/backends/libpdfdocument.a
lib/evince/backends/libpdfdocument.la
lib/evince/backends/libpdfdocument.so
-lib/evince/backends/libpixbufdocument.a
lib/evince/backends/libpixbufdocument.la
lib/evince/backends/libpixbufdocument.so
-lib/evince/backends/libpsdocument.a
lib/evince/backends/libpsdocument.la
lib/evince/backends/libpsdocument.so
-lib/evince/backends/libtiffdocument.a
lib/evince/backends/libtiffdocument.la
lib/evince/backends/libtiffdocument.so
lib/evince/backends/pdfdocument.evince-backend
lib/evince/backends/pixbufdocument.evince-backend
lib/evince/backends/psdocument.evince-backend
lib/evince/backends/tiffdocument.evince-backend
-lib/libevbackend.a
lib/libevbackend.la
@lib lib/libevbackend.so.${LIBevbackend_VERSION}
@man man/man1/evince.1
@@ -101,6 +97,10 @@
share/gnome/help/evince/ca/evince.xml
share/gnome/help/evince/ca/figures/
share/gnome/help/evince/ca/figures/evince_start_window.png
+share/gnome/help/evince/de/
+share/gnome/help/evince/de/evince.xml
+share/gnome/help/evince/de/figures/
+share/gnome/help/evince/de/figures/evince_start_window.png
share/gnome/help/evince/el/
share/gnome/help/evince/el/evince.xml
share/gnome/help/evince/el/figures/
@@ -157,13 +157,16 @@
share/gnome/help/evince/uk/evince.xml
share/gnome/help/evince/uk/figures/
share/gnome/help/evince/uk/figures/evince_start_window.png
+share/gnome/help/evince/vi/
+share/gnome/help/evince/vi/evince.xml
+share/gnome/help/evince/vi/figures/
+share/gnome/help/evince/vi/figures/evince_start_window.png
share/gnome/help/evince/zh_CN/
share/gnome/help/evince/zh_CN/evince.xml
share/gnome/help/evince/zh_CN/figures/
share/gnome/help/evince/zh_CN/figures/evince_start_window.png
share/gtk-doc/html/evince/
share/gtk-doc/html/evince/EvAttachment.html
-share/gtk-doc/html/evince/EvJobPrint.html
share/gtk-doc/html/evince/EvNavigationAction.html
share/gtk-doc/html/evince/EvNavigationActionWidget.html
share/gtk-doc/html/evince/EvPageAction.html
@@ -171,6 +174,7 @@
share/gtk-doc/html/evince/EvWindow.html
share/gtk-doc/html/evince/evince-EvHistory.html
share/gtk-doc/html/evince/evince-EvImage.html
+share/gtk-doc/html/evince/evince-EvJobFind.html
share/gtk-doc/html/evince/evince-EvPasswordDialog.html
share/gtk-doc/html/evince/evince-EvPasswordView.html
share/gtk-doc/html/evince/evince-EvRenderContext.html
@@ -193,7 +197,6 @@
share/gtk-doc/html/evince/evince-ev-document.html
share/gtk-doc/html/evince/evince-ev-file-exporter.html
share/gtk-doc/html/evince/evince-ev-file-helpers.html
-share/gtk-doc/html/evince/evince-ev-job-queue.html
share/gtk-doc/html/evince/evince-ev-link-action.html
share/gtk-doc/html/evince/evince-ev-link-dest.html
share/gtk-doc/html/evince/evince-ev-link.html
@@ -263,6 +266,9 @@
share/locale/ka/LC_MESSAGES/evince.mo
share/locale/kn/LC_MESSAGES/evince.mo
share/locale/ko/LC_MESSAGES/evince.mo
+share/locale/ks/
+share/locale/ks/LC_MESSAGES/
+share/locale/ks/LC_MESSAGES/evince.mo
share/locale/ku/LC_MESSAGES/evince.mo
share/locale/lt/LC_MESSAGES/evince.mo
share/locale/lv/LC_MESSAGES/evince.mo
@@ -278,6 +284,7 @@
share/locale/or/LC_MESSAGES/evince.mo
share/locale/pa/LC_MESSAGES/evince.mo
share/locale/pl/LC_MESSAGES/evince.mo
+share/locale/ps/LC_MESSAGES/evince.mo
share/locale/pt/LC_MESSAGES/evince.mo
share/locale/pt_BR/LC_MESSAGES/evince.mo
share/locale/ro/LC_MESSAGES/evince.mo
@@ -288,7 +295,7 @@
share/locale/sl/LC_MESSAGES/evince.mo
share/locale/sq/LC_MESSAGES/evince.mo
share/locale/sr/LC_MESSAGES/evince.mo
-share/locale/s...@latn/LC_MESSAGES/evince.mo
+share/locale/s...@latin/LC_MESSAGES/evince.mo
share/locale/sv/LC_MESSAGES/evince.mo
share/locale/ta/LC_MESSAGES/evince.mo
share/locale/te/LC_MESSAGES/evince.mo
@@ -304,6 +311,7 @@
share/omf/evince/evince-C.omf
share/omf/evince/evince-bg.omf
share/omf/evince/evince-ca.omf
+share/omf/evince/evince-de.omf
share/omf/evince/evince-el.omf
share/omf/evince/evince-en_GB.omf
share/omf/evince/evince-es.omf
@@ -318,6 +326,7 @@
share/omf/evince/evince-sr.omf
share/omf/evince/evince-sv.omf
share/omf/evince/evince-uk.omf
+share/omf/evince/evince-vi.omf
share/omf/evince/evince-zh_CN.omf
@unexec 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/evince/
--
Antoine
