cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dmtx-utils requires ImageMagick-*-!no_x11; mark in LIB_DEPENDS, but this

Browse Source 
conflicts in bulk, so disable in graphics/Makefile for now (nothing depends
on it).  ok sebastia@
This commit is contained in:
sthen 2012-01-26 17:19:23 +00:00
parent e529295453
commit b4ec42cb45
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.314 2012/01/20 19:28:17 sthen Exp $
# $OpenBSD: Makefile,v 1.315 2012/01/26 17:19:23 sthen Exp $
# $FreeBSD: Makefile,v 1.55 1997/11/03 12:12:27 tg Exp $
#
@ -44,7 +44,8 @@
SUBDIR += djview4
SUBDIR += djvulibre
SUBDIR += djvulibre,no_x11
SUBDIR += dmtx-utils
# XXX requires ImageMagick-*-!no_x11 which conflicts in bulk
# SUBDIR += dmtx-utils
SUBDIR += dpic
SUBDIR += dumpmpeg
SUBDIR += dvdrip

8
graphics/dmtx-utils/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2012/01/15 12:16:17 nigel Exp $
# $OpenBSD: Makefile,v 1.3 2012/01/26 17:19:23 sthen Exp $
COMMENT = tools for handling data matrix barcodes
DISTNAME = dmtx-utils-0.7.4
REVISION = 0
REVISION = 1
CATEGORIES = graphics
HOMEPAGE = http://www.libdmtx.org/
@ -20,7 +20,9 @@ WANTLIB += ICE MagickCore MagickWand SM X11 Xext Xt bz2 c djvulibre
WANTLIB += dmtx expat fftw3 fontconfig freetype iconv jasper jbig jpeg
WANTLIB += lcms2 ltdl lzma png pthread tiff wmf wmflite xcb xml2
WANTLIB += m z
LIB_DEPENDS += graphics/ImageMagick \
# XXX ImageMagick-*-!no_x11 conflicts in bulk; disabled in ../Makefile for now
LIB_DEPENDS += ImageMagick-*-!no_x11:graphics/ImageMagick \
graphics/libdmtx
SEPARATE_BUILD = simple