diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-06 09:42:08 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-09-06 09:42:08 +0800 |
| commit | 0dc239527e93887d6c67448c7bf8c350445523eb (patch) | |
| tree | 99855fe1ed35ebec04900faacf38b7c9f51e1988 /graphics | |
| parent | 2dff8d2e8d92074be0eec94f09b8fd54092927c8 (diff) | |
| download | marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar.gz marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar.bz2 marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar.lz marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar.xz marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.tar.zst marcuscom-ports-0dc239527e93887d6c67448c7bf8c350445523eb.zip | |
- Add djvulibre-nox11
Slave port to djvulibre with WITHOUT_X11 defined to not depend on Qt
- Update evince to auto-detect qt version of djvulibre, if not found
depend on djvulibre-nox11 when WITH_DJVU is defined.
Note: This is just to test, we can back out of this if people don't like this.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4734 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/djvulibre-nox11/Makefile | 13 | ||||
| -rw-r--r-- | graphics/evince/Makefile | 19 |
2 files changed, 21 insertions, 11 deletions
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile new file mode 100644 index 000000000..a462a4188 --- /dev/null +++ b/graphics/djvulibre-nox11/Makefile @@ -0,0 +1,13 @@ +# New ports collection makefile for: djvulibre-nox11 +# Date created: 2005-09-05 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom$ +# + +WITHOUT_X11= yes + +MASTERDIR= ${.CURDIR}/../../graphics/djvulibre + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 8b9106163..5960d05eb 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.31 2005/09/04 06:59:36 mezz Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.32 2005/09/05 06:31:17 ahze Exp $ # PORTNAME= evince @@ -67,8 +67,14 @@ CONFIGURE_ARGS+= --disable-nautilus PLIST_SUB+= NAUTILUS="@comment " .endif +.if exists(${X11BASE}/bin/djview) +DJVU_DIR?= # empty +.else +DJVU_DIR?= -nox11 +.endif + .if defined(WITH_DJVU) -LIB_DEPENDS+= djvulibre.14:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS+= djvulibre.14:${PORTSDIR}/graphics/djvulibre${DJVU_DIR} CONFIGURE_ARGS+= --enable-djvu GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .else @@ -79,15 +85,6 @@ CONFIGURE_ARGS+= --disable-djvu LIB_DEPENDS+= dbus-glib-1.1:${PORTSDIR}/devel/dbus .endif -pre-everything:: -.if !defined(WITH_DJVU) - @${ECHO_MSG} - @${ECHO_MSG} "NOTE: GNOME/Gtk+ users may want to avoid QT dependency required" - @${ECHO_MSG} "by defaut djvulibre installation. They need to use - @${ECHO_MSG} "\"make WITHOUT_X11=yes\" when build that library then." - @${ECHO_MSG} -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lt1lib|-lt1 -lm|' \ ${WRKSRC}/configure \ |