Update evince to 0.9.0 (pointed out by Lawrence Teo a few days ago).

Disable scrollkeeper using an appropriate configure option instead
of the symlink hack.
Add NO_REGRESS = Yes.
RUN_DEPENDS += desktop-file-utils, and update the desktop database
and the icon cache during install/uninstall. (All from Mikolaj Kucharski)

Add a FLAVOR no_libgnome.

Please test and comment, especially if you're running that GNOME
desktop thing (I don't, so I may miss some problems).

Known (but not new) issues:

- The icons object-rotate-{left,right} aren't found.

- When using the File/Open (or CTRL-O) twice within the same instance
  of evince, the file filter is broken -- you've to set it to "All
  Files", else you won't see anything except directories.


Ciao,
        Kili



Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/evince/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile    13 May 2007 19:11:19 -0000      1.6
+++ Makefile    27 May 2007 16:07:37 -0000
@@ -2,19 +2,21 @@
 
 COMMENT=       "document viewer for multiple document formats"
 
-DISTNAME=      evince-0.8.1
-PKGNAME=       ${DISTNAME}
+DISTNAME=      evince-0.9.0
 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/0.9/}
 
 MODULES=       devel/gettext
 BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \
@@ -22,41 +24,52 @@ BUILD_DEPENDS=      :p5-XML-Parser-*:textproc
                :ghostscript-*:print/ghostscript/gnu \
                :teTeX_base-*:print/teTeX/base
 LIB_DEPENDS=   poppler.>=1,poppler-glib.>=1::print/poppler \
-               gnomeui-2::x11/gnome/libgnomeui \
-               gnomeprintui-2-2::x11/gnome/libgnomeprintui \
-               esd.>=2::audio/esound \
-               audiofile::devel/libaudiofile
+               gnomeprintui-2-2::x11/gnome/libgnomeprintui
 RUN_DEPENDS=   :scrollkeeper-*:textproc/scrollkeeper \
                :ghostscript-*:print/ghostscript/gnu \
                :teTeX_base-*:print/teTeX/base \
-               :shared-mime-info-*:misc/shared-mime-info
+               :shared-mime-info-*:misc/shared-mime-info \
+               :desktop-file-utils-*:devel/desktop-file-utils
 
-WANTLIB=       ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor \
+WANTLIB=       ORBit-2 X11 Xau Xcursor \
                Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
-               art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation bonoboui-2 \
+               art_lgpl_2 atk-1.0 \
                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 \
+               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 png popt pthread ssl tiff util xml2 z 
+               pangoft2-1.0 png pthread ssl tiff util xml2 z 
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=        
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evince/ \
+               --disable-scrollkeeper \
                --disable-schemas-install \
                --disable-nautilus \
-               --disable-gnome-print \
                --enable-pixbuf \
-               --enable-dvi
+               --enable-dvi \
+               --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
+LIB_DEPENDS+=          gnome-keyring.>=1::x11/gnome/keyring \
+                       gnomevfs-2.>=1800::x11/gnome/vfs2
+.else
+WANTLIB+=              ICE ORBitCosNaming-2 SM bonobo-2 \
+                       bonobo-activation bonoboui-2 \
+                       gnome-2 gnome-keyring gnomevfs-2 popt 
+LIB_DEPENDS+=          audiofile::devel/libaudiofile \
+                       esd.>=2::audio/esound \
+                       gnomeui-2::x11/gnome/libgnomeui
+.endif
+
 USE_LIBTOOL=   Yes
 USE_X11=       Yes
 USE_GMAKE=     Yes
 
-post-patch:
-       @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
+NO_REGRESS=    Yes
 
 .include <bsd.port.mk>
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    27 May 2007 16:07:37 -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-0.9.0.tar.gz) = QkJcEnxW1f68htJpiBmLsQ==
+RMD160 (evince-0.9.0.tar.gz) = JnTiJq4fDibkZ7T5AMMVmuRcxV8=
+SHA1 (evince-0.9.0.tar.gz) = TdsJ9QYQaHXlEuO5ZQKfP+zkyBo=
+SHA256 (evince-0.9.0.tar.gz) = Lsja0EQGl3Fe5oSRVC8o07pC1i8FK2FNDhMRaROEHxw=
+SIZE (evince-0.9.0.tar.gz) = 2175737
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   27 May 2007 16:07:37 -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   27 May 2007 16:07:37 -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
@@ -257,6 +256,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
@@ -311,6 +313,7 @@ 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-dvi.schemas
@@ -320,3 +323,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

Reply via email to