Merge -djvu into -main ; it is a small dependency and renders packaging

less complex.

ok jasper@
This commit is contained in:
ajacoutot 2013-09-27 06:30:43 +00:00
parent 88a7996d5a
commit 5772dc54f2
5 changed files with 17 additions and 22 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.98 2013/09/26 16:06:47 jasper Exp $
# $OpenBSD: Makefile,v 1.99 2013/09/27 06:30:43 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT-main= viewer for multiple document formats
COMMENT-djvu= evince document viewer backend for djvu documents
COMMENT-dvi= evince document viewer backend for dvi documents
COMMENT-nautilus= evince plugin for nautilus
@ -16,10 +15,12 @@ SUBST_VARS= MAJ_V
CATEGORIES= graphics print
PKGNAME-main= ${DISTNAME}
PKGNAME-djvu= evince-djvu-${GNOME_VERSION}
PKGNAME-dvi= evince-dvi-${GNOME_VERSION}
PKGNAME-nautilus= nautilus-evince-${GNOME_VERSION}
REVISION-main= 0
REVISION-nautilus= 0
SHARED_LIBS += evdocument3 0.2 # 4.0
SHARED_LIBS += evview3 0.0 # 3.0
@ -54,9 +55,11 @@ LIB_DEPENDS= x11/gtk+3
WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gailutil-3 \
gs gcrypt gpg-error stdc++ secret-1 \
jpeg pthread tiff xml2 lcms2 openjpeg \
poppler poppler-glib spectre avahi-common
poppler poppler-glib spectre avahi-common \
djvulibre
LIB_DEPENDS-main= print/poppler \
print/libspectre \
graphics/djvulibre \
${LIB_DEPENDS}
RUN_DEPENDS-main= ${RUN_DEPENDS} \
archivers/unrar \
@ -66,12 +69,6 @@ RUN_DEPENDS-main= ${RUN_DEPENDS} \
print/ghostscript/gnu \
${MODGNOME_RUN_DEPENDS_yelp}
WANTLIB-djvu= ${WANTLIB} jpeg evdocument3 djvulibre ICE SM \
dbus-1 pthread
LIB_DEPENDS-djvu= ${LIB_DEPENDS} \
${BASE_PKGPATH} \
graphics/djvulibre
WANTLIB-dvi= ${WANTLIB} gs evdocument3 kpathsea spectre ICE SM \
jpeg avahi-common dbus-1 pthread
LIB_DEPENDS-dvi= ${LIB_DEPENDS} \
@ -97,16 +94,16 @@ CONFIGURE_ARGS+= --disable-static
MODGNOME_CPPFLAGS=${CFLAGS}
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
MULTI_PACKAGES= -main -djvu -dvi -nautilus
PSEUDO_FLAVORS= no_djvu no_dvi no_nautilus light
MULTI_PACKAGES= -main -dvi -nautilus
PSEUDO_FLAVORS= no_dvi no_nautilus light
FLAVOR?=
.if ${FLAVOR:Mlight}
FLAVOR += no_djvu no_dvi no_nautilus
FLAVOR += no_dvi no_nautilus
.endif
.include <bsd.port.arch.mk>
.for s in -nautilus -djvu -dvi
.for s in -nautilus -dvi
. if ${BUILD_PACKAGES:M$s}
CONFIGURE_ARGS+= --enable$s
. else

View File

@ -1 +0,0 @@
Evince document viewer backend for djvu documents.

View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PLIST-djvu,v 1.9 2012/09/29 13:14:04 ajacoutot Exp $
lib/evince/4/backends/djvudocument.evince-backend
lib/evince/4/backends/libdjvudocument.so

View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.28 2013/09/26 16:06:48 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.29 2013/09/27 06:30:43 ajacoutot Exp $
@conflict evince-djvu-*
@pkgpath graphics/evince
@pkgpath graphics/evince,-djvu
@bin bin/evince
@bin bin/evince-previewer
@bin bin/evince-thumbnailer
@ -58,7 +60,9 @@ lib/evince/
lib/evince/4/
lib/evince/4/backends/
lib/evince/4/backends/comicsdocument.evince-backend
lib/evince/4/backends/djvudocument.evince-backend
lib/evince/4/backends/libcomicsdocument.so
lib/evince/4/backends/libdjvudocument.so
lib/evince/4/backends/libpdfdocument.so
lib/evince/4/backends/libpsdocument.so
lib/evince/4/backends/libtiffdocument.so

View File

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