Stop trying to pretend we can still make a small package out of this:

- merge -nautilus into -main
- add XPS support
- add missing dependency on gnome-desktop
- fixup DEPS/WANTLIB

There are many alternatives in-tree for those of want a small PDF viewer.
discussed with and ok jasper@
This commit is contained in:
ajacoutot 2014-10-15 13:48:21 +00:00
parent f7a41b9397
commit 4f3d0b0c45
4 changed files with 28 additions and 80 deletions

View File

@ -1,21 +1,18 @@
# $OpenBSD: Makefile,v 1.117 2014/10/15 13:12:46 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.118 2014/10/15 13:48:21 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= viewer for multiple document formats
COMMENT-dvi= evince document viewer backend for dvi documents
COMMENT-nautilus= evince plugin for nautilus
COMMENT-main= GNOME document viewer
COMMENT-dvi= evince dvi backend
GNOME_PROJECT= evince
GNOME_VERSION= 3.14.1
PKGNAME-main= ${DISTNAME}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
REVISION-main= 0
REVISION-dvi= 0
REVISION-nautilus= 0
REVISION-main= 1
REVISION-dvi= 1
MAJ_V= 3.0
SUBST_VARS= MAJ_V
@ -36,28 +33,30 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs
WANTLIB += xcb-shm xcb xcb-render z gthread-2.0 cairo-gobject m ffi
WANTLIB += atk-bridge-2.0 atspi harfbuzz
WANTLIB += gmodule-2.0 graphite2
WANTLIB += atk-bridge-2.0 atspi harfbuzz ICE SM gs gmodule-2.0 jpeg
WANTLIB += graphite2 avahi-common dbus-1 pthread spectre
MODULES= devel/dconf \
devel/gettext \
x11/gnome
MODGNOME_TOOLS += desktop-file-utils gobject-introspection yelp
MODGNOME_TOOLS += gtk-update-icon-cache shared-mime-info
MODGNOME_TOOLS += desktop-file-utils gobject-introspection yelp
MODGNOME_TOOLS += gtk-update-icon-cache shared-mime-info
BUILD_DEPENDS= devel/gsettings-desktop-schemas
LIB_DEPENDS= x11/gtk+3
LIB_DEPENDS= print/libspectre \
x11/gtk+3
WANTLIB-main += ${WANTLIB} ICE SM c dbus-1 gs gcrypt gpg-error stdc++
WANTLIB-main += secret-1 jpeg pthread tiff xml2 lcms2 openjpeg poppler
WANTLIB-main += poppler-glib spectre avahi-common djvulibre
WANTLIB-main += ${WANTLIB} c gnome-desktop-3 gcrypt gpg-error stdc++
WANTLIB-main += secret-1 tiff xml2 lcms2 openjpeg poppler poppler-glib
WANTLIB-main += djvulibre archive bz2 gxps lzma nautilus-extension
LIB_DEPENDS-main= print/poppler \
print/libspectre \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
print/poppler \
graphics/djvulibre \
${LIB_DEPENDS}
graphics/libgxps \
x11/gnome/nautilus
RUN_DEPENDS-main= ${RUN_DEPENDS} \
archivers/unrar \
@ -65,56 +64,25 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
devel/gsettings-desktop-schemas \
print/ghostscript/gnu
WANTLIB-dvi += ${WANTLIB} gs evdocument3 kpathsea spectre ICE SM jpeg
WANTLIB-dvi += avahi-common dbus-1 pthread
WANTLIB-dvi += ${WANTLIB} evdocument3 kpathsea
LIB_DEPENDS-dvi= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
print/texlive/base \
print/libspectre
print/texlive/base
RUN_DEPENDS-dvi= ${MODGETTEXT_RUN_DEPENDS}
WANTLIB-nautilus += ${WANTLIB} gthread-2.0 nautilus-extension evdocument3
WANTLIB-nautilus += ICE SM dbus-1 pthread
LIB_DEPENDS-nautilus= ${BASE_PKGPATH} \
${LIB_DEPENDS} \
x11/gnome/nautilus
RUN_DEPENDS-nautilus= ${MODGETTEXT_RUN_DEPENDS}
CONFIGURE_STYLE= gnu
# modern browsers can already display PDF
CONFIGURE_ARGS += --disable-browser-plugin
MODGNOME_CPPFLAGS=${CFLAGS}
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
MULTI_PACKAGES= -main -dvi -nautilus
PSEUDO_FLAVORS= no_dvi no_nautilus light
FLAVOR?=
.if ${FLAVOR:Mlight}
FLAVOR += no_dvi no_nautilus
.endif
.include <bsd.port.arch.mk>
.for s in -nautilus -dvi
. if ${BUILD_PACKAGES:M$s}
CONFIGURE_ARGS+= --enable$s
. else
CONFIGURE_ARGS+= --disable$s
. endif
.endfor
MULTI_PACKAGES= -main -dvi
post-install:
# This will fail if no_nautilus is found in FLAVOR, so make sure we don't
# do it if it is.
.if ${BUILD_PACKAGES:M-nautilus}
rm ${PREFIX}/lib/nautilus/extensions-${MAJ_V}/*.{a,la}
.endif
rm ${PREFIX}/lib/evince/4/backends/*.{a,la}
.include <bsd.port.mk>

View File

@ -1 +0,0 @@
Evince document viewer plugin for nautilus.

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-main,v 1.34 2014/10/15 08:50:23 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.35 2014/10/15 13:48:21 ajacoutot Exp $
@conflict evince-djvu-*
@conflict evince-nautilus-*
@pkgpath graphics/evince
@pkgpath graphics/evince,-djvu
@pkgpath graphics/evince,-nautilus
@bin bin/evince
@bin bin/evince-previewer
@bin bin/evince-thumbnailer
@ -66,9 +68,11 @@ lib/evince/4/backends/libdjvudocument.so
lib/evince/4/backends/libpdfdocument.so
lib/evince/4/backends/libpsdocument.so
lib/evince/4/backends/libtiffdocument.so
lib/evince/4/backends/libxpsdocument.so
lib/evince/4/backends/pdfdocument.evince-backend
lib/evince/4/backends/psdocument.evince-backend
lib/evince/4/backends/tiffdocument.evince-backend
lib/evince/4/backends/xpsdocument.evince-backend
lib/girepository-1.0/EvinceDocument-${MAJ_V}.typelib
lib/girepository-1.0/EvinceView-${MAJ_V}.typelib
lib/libevdocument3.a
@ -77,18 +81,19 @@ lib/libevdocument3.la
lib/libevview3.a
lib/libevview3.la
@lib lib/libevview3.so.${LIBevview3_VERSION}
lib/nautilus/extensions-${MAJ_V}/libevince-properties-page.so
lib/pkgconfig/evince-document-${MAJ_V}.pc
lib/pkgconfig/evince-view-${MAJ_V}.pc
@bin libexec/evinced
@man man/man1/evince.1
share/GConf/gsettings/evince.convert
share/appdata/
share/appdata/evince-comicsdocument.metainfo.xml
share/appdata/evince-djvudocument.metainfo.xml
share/appdata/evince-dvidocument.metainfo.xml
share/appdata/evince-pdfdocument.metainfo.xml
share/appdata/evince-psdocument.metainfo.xml
share/appdata/evince-tiffdocument.metainfo.xml
share/appdata/evince-xpsdocument.metainfo.xml
share/appdata/evince.appdata.xml
share/applications/evince-previewer.desktop
share/applications/evince.desktop
@ -286,8 +291,6 @@ share/gtk-doc/html/libevview-${MAJ_V}/style.css
share/gtk-doc/html/libevview-${MAJ_V}/up-insensitive.png
share/gtk-doc/html/libevview-${MAJ_V}/up.png
share/gtk-doc/html/libevview-${MAJ_V}/view-view.html
share/help/
share/help/C/
share/help/C/evince/
share/help/C/evince/annotation-properties.page
share/help/C/evince/annotations-delete.page
@ -455,7 +458,6 @@ share/help/bg/evince/synctex.page
share/help/bg/evince/textselection.page
share/help/bg/evince/toolbar.page
share/help/bg/evince/translate.page
share/help/ca/
share/help/ca/evince/
share/help/ca/evince/annotation-properties.page
share/help/ca/evince/annotations-delete.page
@ -539,7 +541,6 @@ share/help/ca/evince/synctex.page
share/help/ca/evince/textselection.page
share/help/ca/evince/toolbar.page
share/help/ca/evince/translate.page
share/help/cs/
share/help/cs/evince/
share/help/cs/evince/annotation-properties.page
share/help/cs/evince/annotations-delete.page
@ -707,7 +708,6 @@ share/help/da/evince/synctex.page
share/help/da/evince/textselection.page
share/help/da/evince/toolbar.page
share/help/da/evince/translate.page
share/help/de/
share/help/de/evince/
share/help/de/evince/annotation-properties.page
share/help/de/evince/annotations-delete.page
@ -791,7 +791,6 @@ share/help/de/evince/synctex.page
share/help/de/evince/textselection.page
share/help/de/evince/toolbar.page
share/help/de/evince/translate.page
share/help/el/
share/help/el/evince/
share/help/el/evince/annotation-properties.page
share/help/el/evince/annotations-delete.page
@ -959,7 +958,6 @@ share/help/en_GB/evince/synctex.page
share/help/en_GB/evince/textselection.page
share/help/en_GB/evince/toolbar.page
share/help/en_GB/evince/translate.page
share/help/es/
share/help/es/evince/
share/help/es/evince/annotation-properties.page
share/help/es/evince/annotations-delete.page
@ -1043,7 +1041,6 @@ share/help/es/evince/synctex.page
share/help/es/evince/textselection.page
share/help/es/evince/toolbar.page
share/help/es/evince/translate.page
share/help/eu/
share/help/eu/evince/
share/help/eu/evince/annotation-properties.page
share/help/eu/evince/annotations-delete.page
@ -1127,7 +1124,6 @@ share/help/eu/evince/synctex.page
share/help/eu/evince/textselection.page
share/help/eu/evince/toolbar.page
share/help/eu/evince/translate.page
share/help/fi/
share/help/fi/evince/
share/help/fi/evince/annotation-properties.page
share/help/fi/evince/annotations-delete.page
@ -1211,7 +1207,6 @@ share/help/fi/evince/synctex.page
share/help/fi/evince/textselection.page
share/help/fi/evince/toolbar.page
share/help/fi/evince/translate.page
share/help/fr/
share/help/fr/evince/
share/help/fr/evince/annotation-properties.page
share/help/fr/evince/annotations-delete.page
@ -1295,7 +1290,6 @@ share/help/fr/evince/synctex.page
share/help/fr/evince/textselection.page
share/help/fr/evince/toolbar.page
share/help/fr/evince/translate.page
share/help/gl/
share/help/gl/evince/
share/help/gl/evince/annotation-properties.page
share/help/gl/evince/annotations-delete.page
@ -1379,7 +1373,6 @@ share/help/gl/evince/synctex.page
share/help/gl/evince/textselection.page
share/help/gl/evince/toolbar.page
share/help/gl/evince/translate.page
share/help/hu/
share/help/hu/evince/
share/help/hu/evince/annotation-properties.page
share/help/hu/evince/annotations-delete.page
@ -1715,7 +1708,6 @@ share/help/ja/evince/synctex.page
share/help/ja/evince/textselection.page
share/help/ja/evince/toolbar.page
share/help/ja/evince/translate.page
share/help/ko/
share/help/ko/evince/
share/help/ko/evince/annotation-properties.page
share/help/ko/evince/annotations-delete.page
@ -1967,7 +1959,6 @@ share/help/nl/evince/synctex.page
share/help/nl/evince/textselection.page
share/help/nl/evince/toolbar.page
share/help/nl/evince/translate.page
share/help/oc/
share/help/oc/evince/
share/help/oc/evince/annotation-properties.page
share/help/oc/evince/annotations-delete.page
@ -2051,7 +2042,6 @@ share/help/oc/evince/synctex.page
share/help/oc/evince/textselection.page
share/help/oc/evince/toolbar.page
share/help/oc/evince/translate.page
share/help/pt_BR/
share/help/pt_BR/evince/
share/help/pt_BR/evince/annotation-properties.page
share/help/pt_BR/evince/annotations-delete.page
@ -2219,7 +2209,6 @@ share/help/ru/evince/synctex.page
share/help/ru/evince/textselection.page
share/help/ru/evince/toolbar.page
share/help/ru/evince/translate.page
share/help/sl/
share/help/sl/evince/
share/help/sl/evince/annotation-properties.page
share/help/sl/evince/annotations-delete.page
@ -2303,7 +2292,6 @@ share/help/sl/evince/synctex.page
share/help/sl/evince/textselection.page
share/help/sl/evince/toolbar.page
share/help/sl/evince/translate.page
share/help/sr/
share/help/sr/evince/
share/help/sr/evince/annotation-properties.page
share/help/sr/evince/annotations-delete.page
@ -2387,7 +2375,6 @@ share/help/sr/evince/synctex.page
share/help/sr/evince/textselection.page
share/help/sr/evince/toolbar.page
share/help/sr/evince/translate.page
share/help/sv/
share/help/sv/evince/
share/help/sv/evince/annotation-properties.page
share/help/sv/evince/annotations-delete.page
@ -2555,7 +2542,6 @@ share/help/te/evince/synctex.page
share/help/te/evince/textselection.page
share/help/te/evince/toolbar.page
share/help/te/evince/translate.page
share/help/uk/
share/help/uk/evince/
share/help/uk/evince/annotation-properties.page
share/help/uk/evince/annotations-delete.page
@ -2639,7 +2625,6 @@ share/help/uk/evince/synctex.page
share/help/uk/evince/textselection.page
share/help/uk/evince/toolbar.page
share/help/uk/evince/translate.page
share/help/vi/
share/help/vi/evince/
share/help/vi/evince/annotation-properties.page
share/help/vi/evince/annotations-delete.page
@ -2723,7 +2708,6 @@ share/help/vi/evince/synctex.page
share/help/vi/evince/textselection.page
share/help/vi/evince/toolbar.page
share/help/vi/evince/translate.page
share/help/zh_CN/
share/help/zh_CN/evince/
share/help/zh_CN/evince/annotation-properties.page
share/help/zh_CN/evince/annotations-delete.page
@ -3072,7 +3056,6 @@ share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_HK/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
share/locale/zu/LC_MESSAGES/evince.mo
share/thumbnailers/
share/thumbnailers/evince.thumbnailer
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

View File

@ -1,2 +0,0 @@
@comment $OpenBSD: PLIST-nautilus,v 1.6 2013/09/27 06:30:43 ajacoutot Exp $
lib/nautilus/extensions-${MAJ_V}/libevince-properties-page.so