From 12d90ef1f90dd859ca1edbb8833b10c9b1f738f3 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Wed, 21 May 2014 08:09:18 +0000 Subject: [PATCH] - Update to 1.70 PR: 189455 Submitted by: maintainer --- graphics/leptonica/Makefile | 7 +- graphics/leptonica/distinfo | 4 +- graphics/leptonica/files/patch-Makefile.in | 11 ++ graphics/leptonica/files/patch-pngio.c | 10 - graphics/leptonica/pkg-plist | 208 +-------------------- 5 files changed, 24 insertions(+), 216 deletions(-) create mode 100644 graphics/leptonica/files/patch-Makefile.in delete mode 100644 graphics/leptonica/files/patch-pngio.c diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 9b2ebf96acb0..e4f783fb9063 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= leptonica -PORTVERSION= 1.69 -PORTREVISION= 2 +PORTVERSION= 1.70 CATEGORIES= graphics -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= http://www.leptonica.com/source/ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= C library for efficient image processing and image analysis operations @@ -18,10 +17,12 @@ LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \ CONFLICTS= leptonlib-[0-9]* +USES= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip TESTS?= generate compare .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING) diff --git a/graphics/leptonica/distinfo b/graphics/leptonica/distinfo index 8cbb0506e599..1a9577b654d4 100644 --- a/graphics/leptonica/distinfo +++ b/graphics/leptonica/distinfo @@ -1,2 +1,2 @@ -SHA256 (leptonica-1.69.tar.gz) = 178021f2bff504cc0e30bd91a0347a82bf726eca2778b68db4b44aaee3020b11 -SIZE (leptonica-1.69.tar.gz) = 7618131 +SHA256 (leptonica-1.70.tar.gz) = d3d209a1f6d1f7a80119486b5011bc8c6627e582c927ab44ba33c37edb2cfba2 +SIZE (leptonica-1.70.tar.gz) = 9890585 diff --git a/graphics/leptonica/files/patch-Makefile.in b/graphics/leptonica/files/patch-Makefile.in new file mode 100644 index 000000000000..3f6a9e5a2973 --- /dev/null +++ b/graphics/leptonica/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- ./Makefile.in.orig 2014-02-06 00:12:32.000000000 +0900 ++++ ./Makefile.in 2014-05-07 20:05:51.000000000 +0900 +@@ -269,7 +269,7 @@ + ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = config README.html leptonica-license.txt moller52.jpg version-notes.html make-for-auto make-for-local autobuild +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = lept.pc + SUBDIRS = src prog + all: config_auto.h diff --git a/graphics/leptonica/files/patch-pngio.c b/graphics/leptonica/files/patch-pngio.c deleted file mode 100644 index 70c02ed57047..000000000000 --- a/graphics/leptonica/files/patch-pngio.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pngio.c.orig 2011-02-01 06:41:12.000000000 +0100 -+++ src/pngio.c 2012-05-04 12:33:51.000000000 +0200 -@@ -107,6 +107,7 @@ - /* --------------------------------------------*/ - - #include "png.h" -+#include "zlib.h" - - /* ----------------Set defaults for read/write options ----------------- */ - /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */ diff --git a/graphics/leptonica/pkg-plist b/graphics/leptonica/pkg-plist index e5ed48613ba0..e78f74ac8a7a 100644 --- a/graphics/leptonica/pkg-plist +++ b/graphics/leptonica/pkg-plist @@ -1,218 +1,22 @@ -bin/adaptmaptest -bin/adaptnorm_reg -bin/affine_reg -bin/alltests_reg -bin/alphaops_reg -bin/alphaxform_reg -bin/arithtest -bin/barcodetest -bin/baselinetest -bin/bilinear_reg -bin/binarize_reg -bin/bincompare -bin/binmorph1_reg -bin/binmorph2_reg -bin/binmorph3_reg -bin/binmorph4_reg -bin/binmorph5_reg -bin/blend2_reg -bin/blend_reg -bin/blendcmaptest -bin/blendtest1 -bin/buffertest -bin/byteatest -bin/ccbordtest -bin/cctest1 -bin/ccthin1_reg -bin/ccthin2_reg -bin/cmapquant_reg -bin/coloring_reg -bin/colormask_reg -bin/colormorphtest -bin/colorquant_reg -bin/colorseg_reg -bin/colorsegtest -bin/colorspacetest -bin/compare_reg -bin/comparepages -bin/comparetest -bin/compfilter_reg -bin/conncomp_reg -bin/contrasttest -bin/conversion_reg bin/convertfilestopdf bin/convertfilestops bin/convertformat bin/convertsegfilestopdf bin/convertsegfilestops -bin/converttogray +bin/converttopdf bin/converttops -bin/convolve_reg -bin/convolvetest -bin/cornertest -bin/croptext -bin/dewarp_reg -bin/dewarptest1 -bin/dewarptest2 -bin/dewarptest3 -bin/digitprep1 -bin/distance_reg -bin/dithertest -bin/dna_reg -bin/dwalineargen -bin/dwamorph1_reg -bin/dwamorph2_reg -bin/edgetest -bin/enhance_reg -bin/equal_reg -bin/expand_reg -bin/extrema_reg -bin/falsecolortest -bin/fcombautogen -bin/fhmtauto_reg -bin/fhmtautogen bin/fileinfo -bin/findpattern1 -bin/findpattern2 -bin/findpattern3 -bin/findpattern_reg -bin/flipdetect_reg -bin/flipselgen -bin/fmorphauto_reg -bin/fmorphautogen -bin/fpix_reg -bin/fpixcontours -bin/gammatest -bin/genfonts -bin/gifio_reg -bin/graphicstest -bin/grayfill_reg -bin/graymorph1_reg -bin/graymorph2_reg -bin/graymorphtest -bin/grayquant_reg -bin/hardlight_reg -bin/heap_reg -bin/histotest -bin/inserttest -bin/ioformats_reg -bin/iotest -bin/jbcorrelation -bin/jbrankhaus -bin/jbwords -bin/kernel_reg -bin/lineremoval -bin/listtest -bin/livre_adapt -bin/livre_hmt -bin/livre_makefigs -bin/livre_orient -bin/livre_pageseg -bin/livre_seedgen -bin/livre_tophat -bin/locminmax_reg -bin/logicops_reg -bin/lowaccess_reg -bin/maketile -bin/maze_reg -bin/misctest1 -bin/modifyhuesat -bin/morphseq_reg -bin/morphtest1 -bin/mtifftest -bin/numa_reg -bin/numaranktest -bin/otsutest1 -bin/otsutest2 -bin/overlap_reg -bin/pagesegtest1 -bin/pagesegtest2 -bin/paint_reg -bin/paintmask_reg -bin/partitiontest -bin/pdfiotest -bin/pdfseg_reg -bin/pixa1_reg -bin/pixa2_reg -bin/pixaatest -bin/pixadisp_reg -bin/pixalloc_reg -bin/pixcomp_reg -bin/pixmem_reg -bin/pixserial_reg -bin/pixtile_reg -bin/plottest -bin/pngio_reg bin/printimage bin/printsplitimage bin/printtiff -bin/projection_reg -bin/projective_reg -bin/psio_reg -bin/psioseg_reg -bin/pta_reg -bin/ptra1_reg -bin/ptra2_reg -bin/quadtreetest -bin/rank_reg -bin/rankbin_reg -bin/rankhisto_reg -bin/ranktest -bin/rasterop_reg -bin/rasteropip_reg -bin/reducetest -bin/removecmap -bin/renderfonts -bin/rotate1_reg -bin/rotate2_reg -bin/rotatefastalt -bin/rotateorth_reg -bin/rotateorthtest1 -bin/rotatetest1 -bin/runlengthtest -bin/scale_reg -bin/scaleandtile -bin/scaletest1 -bin/scaletest2 -bin/seedfilltest -bin/seedspread_reg -bin/selio_reg -bin/sharptest -bin/shear2_reg -bin/shear_reg -bin/sheartest -bin/showedges -bin/skew_reg -bin/skewtest -bin/smallpix_reg -bin/smoothedge_reg -bin/snapcolortest -bin/sorttest -bin/splitcomp_reg bin/splitimage2pdf -bin/string_reg -bin/subpixel_reg -bin/sudokutest -bin/textlinemask -bin/threshnorm_reg -bin/translate_reg -bin/trctest -bin/viewertest -bin/warper_reg -bin/warpertest -bin/watershedtest -bin/wordsinorder -bin/writemtiff -bin/writetext_reg -bin/xformbox_reg bin/xtractprotos -bin/xvdisp -bin/yuvtest include/leptonica/allheaders.h include/leptonica/alltypes.h -include/leptonica/arrayaccess.h include/leptonica/array.h +include/leptonica/arrayaccess.h include/leptonica/bbuffer.h +include/leptonica/bilateral.h include/leptonica/bmf.h include/leptonica/bmp.h include/leptonica/ccbord.h @@ -230,12 +34,14 @@ include/leptonica/pix.h include/leptonica/ptra.h include/leptonica/queue.h include/leptonica/readbarcode.h +include/leptonica/recog.h include/leptonica/regutils.h include/leptonica/stack.h include/leptonica/sudoku.h include/leptonica/watershed.h lib/liblept.a -lib/liblept.la lib/liblept.so -lib/liblept.so.3 +lib/liblept.so.4 +lib/liblept.so.4.0.1 +libdata/pkgconfig/lept.pc @dirrm include/leptonica