aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/dmtx-utils/Makefile14
-rw-r--r--graphics/dmtx-utils/pkg-descr2
-rw-r--r--graphics/libdmtx/Makefile12
-rw-r--r--graphics/libdmtx/files/patch-Makefile.in11
-rw-r--r--graphics/libdmtx/pkg-descr2
5 files changed, 27 insertions, 14 deletions
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index 6025863d31be..9de1b5f3b202 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -3,19 +3,21 @@
PORTNAME= dmtx-utils
PORTVERSION= 0.7.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= SF/libdmtx/libdmtx/${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= Software for reading and writing Data Matrix barcodes
-LIB_DEPENDS= libdmtx.so:graphics/libdmtx
+LICENSE= LGPL21+
-USES= tar:bzip2 pkgconfig
-GNU_CONFIGURE= yes
-CFLAGS+= -I${LOCALBASE}/include
+LIB_DEPENDS= libdmtx.so:graphics/libdmtx \
+ libMagickWand-6.so:graphics/ImageMagick \
+ libMagickCore-6.so:graphics/ImageMagick
+USES= localbase tar:bzip2 pkgconfig
+GNU_CONFIGURE= yes
PLIST_FILES= bin/dmtxread bin/dmtxwrite bin/dmtxquery \
man/man1/dmtxread.1.gz man/man1/dmtxwrite.1.gz \
man/man1/dmtxquery.1.gz
diff --git a/graphics/dmtx-utils/pkg-descr b/graphics/dmtx-utils/pkg-descr
index 4ed21b516219..56d0754c286a 100644
--- a/graphics/dmtx-utils/pkg-descr
+++ b/graphics/dmtx-utils/pkg-descr
@@ -12,4 +12,4 @@ pattern of data with built-in error correction. The Data Matrix
symbology (sometimes casually referred to as "DataMatrix") was invented
and released into the public domain by RVSI Acuity CiMatrix.
-WWW: http://www.libdmtx.org/
+WWW: http://libdmtx.sourceforge.net
diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile
index 4cbda67b3eba..0c1c72145049 100644
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@@ -3,21 +3,21 @@
PORTNAME= libdmtx
PORTVERSION= 0.7.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics
MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= Library for reading and writing Data Matrix barcodes
+LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
USES= tar:bzip2 libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-
-post-patch:
- @${REINPLACE_CMD} -e '/^pkgconfigdir /s:(libdir):{prefix}/libdata:' \
- ${WRKSRC}/Makefile.in
+INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/graphics/libdmtx/files/patch-Makefile.in b/graphics/libdmtx/files/patch-Makefile.in
new file mode 100644
index 000000000000..39515d503d7c
--- /dev/null
+++ b/graphics/libdmtx/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2011-06-02 07:10:47 UTC
++++ Makefile.in
+@@ -306,7 +306,7 @@ EXTRA_DIST = KNOWNBUG \
+ script/check_todo.sh \
+ script/check_whitespace.sh
+
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = ${prefix}/libdata/pkgconfig
+ pkgconfig_DATA = libdmtx.pc
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/graphics/libdmtx/pkg-descr b/graphics/libdmtx/pkg-descr
index 261d66549590..959190dbce6a 100644
--- a/graphics/libdmtx/pkg-descr
+++ b/graphics/libdmtx/pkg-descr
@@ -10,4 +10,4 @@ pattern of data with built-in error correction. The Data Matrix
symbology (sometimes casually referred to as "DataMatrix") was invented
and released into the public domain by RVSI Acuity CiMatrix.
-WWW: http://www.libdmtx.org/
+WWW: http://libdmtx.sourceforge.net/