On Thu, Nov 06, 2014 at 09:53:27AM -0500, James Turner wrote:
> On Thu, Nov 06, 2014 at 08:47:53AM +0100, Antoine Jacoutot wrote:
> > On Thu, Nov 06, 2014 at 01:08:53AM -0500, Ted Unangst wrote:
> > > On Sun, Feb 02, 2014 at 15:51, James Turner wrote:
> > > > Attached is an update to libqrencode that brings it all the way up to
> > > > 3.4.3. I needed an updated version that included the -t option.
> > > >
> > > > It looks like graphics/prison and productivity/glabels are the only
> > > > consumers. Any users of either of those willing to test?
> > > >
> > > > I've tested libqrencode on amd64. Thanks.
> > > >
> > >
> > > Good grief, I find myself in the sad position of asking for an update
> > > to libqrencode. I note that one more dot release is out and the
> > > current version is 3.4.4 now.
> >
> > James, can you update it and send me the new diff?
> > I will look at it.
> >
> > --
> > Antoine
>
> Can do, expect something later today.
>
> --
> James Turner
>
Updated diff below.
--
James Turner
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libqrencode/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 16 Jun 2014 20:25:59 -0000 1.4
+++ Makefile 6 Nov 2014 16:07:12 -0000
@@ -4,20 +4,22 @@ SHARED_ONLY= Yes
COMMENT= library for encoding data in a QR Code symbol
-DISTNAME= qrencode-3.1.1
+DISTNAME= qrencode-3.4.4
PKGNAME= lib${DISTNAME}
-SHARED_LIBS += qrencode 0.0 # 3.1
+SHARED_LIBS += qrencode 1.0 # 3.4
CATEGORIES= graphics
-HOMEPAGE= http://fukuchi.org/works/qrencode/index.en.html
+HOMEPAGE= http://fukuchi.org/works/qrencode/
-# LGPLv2.1
+# LGPLv2.1+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE:=/../}
+MASTER_SITES= http://fukuchi.org/works/qrencode/
-WANTLIB += c m png z
+MODULES = devel/gettext
+
+WANTLIB += c m png pthread z
LIB_DEPENDS= graphics/png
@@ -27,16 +29,11 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-tools \
--with-tests \
--with-sdl-prefix=/no
-CONFIGURE_ENV+= png_CFLAGS="`pkg-config --cflags libpng`" \
+CONFIGURE_ENV+= LIBS=-pthread \
+ png_CFLAGS="`pkg-config --cflags libpng`" \
png_LIBS="`pkg-config --libs libpng`"
-TEST_TARGETS= test_qrinput test_bitstream test_estimatebit \
- test_qrspec test_rs test_qrencode prof_qrencode \
- test_split test_monkey
-
do-test:
-.for r in ${TEST_TARGETS}
- cd ${WRKSRC}/tests/ && ./$r
-.endfor
+ cd ${WRKSRC}/tests/ && ./test_all.sh
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/libqrencode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 27 Jul 2011 15:30:49 -0000 1.1.1.1
+++ distinfo 6 Nov 2014 16:07:12 -0000
@@ -1,5 +1,2 @@
-MD5 (qrencode-3.1.1.tar.gz) = 2X9ny++vV35sFZI/PMV7ag==
-RMD160 (qrencode-3.1.1.tar.gz) = Isgyw2Pz7TjTpER5q4WZx5pmX3I=
-SHA1 (qrencode-3.1.1.tar.gz) = w+tsRFU9qmEqm89BPTyrfEYkE3M=
-SHA256 (qrencode-3.1.1.tar.gz) = FDryo0bA9jJA4EbLNJgAcDFLSXsh9FJrRghiZP1rs28=
-SIZE (qrencode-3.1.1.tar.gz) = 377838
+SHA256 (qrencode-3.4.4.tar.gz) = 55TiapYBkBPA42ZcsGsYmSZo81LFVT0KVT9dFE9/KnI=
+SIZE (qrencode-3.4.4.tar.gz) = 468788
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libqrencode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 27 Jul 2011 15:30:49 -0000 1.1.1.1
+++ pkg/PLIST 6 Nov 2014 16:07:12 -0000
@@ -4,6 +4,5 @@ include/qrencode.h
lib/libqrencode.a
lib/libqrencode.la
@lib lib/libqrencode.so.${LIBqrencode_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libqrencode.pc
@man man/man1/qrencode.1
