Attachment 120357 Details for Bug 163153 – file.diff

[patch] file.diff

file.diff (text/plain), 9.32 KB, created by Brendan Fabeny on 2011-12-09 19:30:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Fabeny

Created: 2011-12-09 19:30:12 UTC

Size: 9.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/graphics/leptonica/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- Makefile	23 Sep 2011 22:23:17 -0000	1.11
>+++ Makefile	9 Dec 2011 18:52:37 -0000
>@@ -5,36 +5,37 @@
> # $FreeBSD: ports/graphics/leptonica/Makefile,v 1.11 2011/09/23 22:23:17 amdmi3 Exp $
> #
> 
>-PORTNAME=	leptonlib
>-PORTVERSION=	1.60
>-PORTREVISION=	4
>+PORTNAME=	leptonica
>+PORTVERSION=	1.68
> CATEGORIES=	graphics
> MASTER_SITES=	GOOGLE_CODE
> 
> MAINTAINER=	hiroto.kagotani@gmail.com
> COMMENT=	C library for efficient image processing and image analysis operations
> 
>-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
>+LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
> 		jpeg.11:${PORTSDIR}/graphics/jpeg \
>-		tiff.4:${PORTSDIR}/graphics/tiff
>+		png.6:${PORTSDIR}/graphics/png \
>+		tiff.4:${PORTSDIR}/graphics/tiff \
>+		webp.2:${PORTSDIR}/graphics/webp
> 
>-PROJECTHOST=	leptonica
>+CONFLICTS=	leptonlib-[0-9]*
> 
>+GNU_CONFIGURE=	yes
> MAKE_JOBS_SAFE=	yes
>-USE_AUTOTOOLS=	libtool aclocal automake autoconf
>-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-post-patch:
>-	@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/makefile.linux
>-	@${RM} ${WRKSRC}/src/jpeglib.h ${WRKSRC}/src/jmorecfg.h
>-
>-pre-configure:
>-	@(cd ${CONFIGURE_WRKSRC} \
>-		&& ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake)
>-
>-run-autotools:: run-autotools-aclocal run-autotools-automake run-autotools-autoconf
>+.if defined(MAINTAINER_MODE) && !defined(BATCH)
>+check regression-test test: build
>+#"display" requires the installation of graphics/xzgv
>+.for c in generate compare display
>+	@${SETENV} \
>+	LD_LIBRARY_PATH="${WRKSRC}/src/.libs:${LOCALBASE}/lib" \
>+	PATH="${PATH}:${WRKSRC}/prog" \
>+	${WRKSRC}/prog/alltests_reg ${c}
>+.endfor
> 
>+.endif
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/graphics/leptonica/distinfo,v
>retrieving revision 1.3
>diff -u -r1.3 distinfo
>--- distinfo	5 Aug 2011 09:57:46 -0000	1.3
>+++ distinfo	26 Oct 2011 04:36:18 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (leptonlib-1.60.tar.gz) = 9c9b7710418a33aad35dcd7b76b6b69affdc90b2b62cce56b6c6dc93f5e7a072
>-SIZE (leptonlib-1.60.tar.gz) = 4115391
>+SHA256 (leptonica-1.68.tar.gz) = acefb6c50db2913f117afdbb19a549f7409cf8fa5d9a435692cb10ff89a81f8f
>+SIZE (leptonica-1.68.tar.gz) = 6695020
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/graphics/leptonica/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	5 Aug 2011 09:57:46 -0000	1.2
>+++ pkg-plist	9 Dec 2011 17:34:56 -0000
>@@ -1,26 +1,237 @@
>-include/liblept/allheaders.h
>-include/liblept/alltypes.h
>-include/liblept/arrayaccess.h
>-include/liblept/array.h
>-include/liblept/bbuffer.h
>-include/liblept/bmf.h
>-include/liblept/bmp.h
>-include/liblept/ccbord.h
>-include/liblept/environ.h
>-include/liblept/gplot.h
>-include/liblept/imageio.h
>-include/liblept/jbclass.h
>-include/liblept/leptprotos.h
>-include/liblept/list.h
>-include/liblept/morph.h
>-include/liblept/pheap.h
>-include/liblept/pix.h
>-include/liblept/pqueue.h
>-include/liblept/readbarcode.h
>-include/liblept/stack.h
>-include/liblept/watershed.h
>+bin/adaptmaptest
>+bin/adaptnorm_reg
>+bin/affine_reg
>+bin/alltests_reg
>+bin/alphaclean_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/colormask_reg
>+bin/colormorphtest
>+bin/colorquant_reg
>+bin/colorseg_reg
>+bin/colorsegtest
>+bin/colorspacetest
>+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/converttops
>+bin/convolve_reg
>+bin/convolvetest
>+bin/cornertest
>+bin/croptext
>+bin/dewarp_reg
>+bin/dewarptest
>+bin/digitprep1
>+bin/distance_reg
>+bin/dithertest
>+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/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/rotatetest2
>+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/bbuffer.h
>+include/leptonica/bmf.h
>+include/leptonica/bmp.h
>+include/leptonica/ccbord.h
>+include/leptonica/dewarp.h
>+include/leptonica/endianness.h
>+include/leptonica/environ.h
>+include/leptonica/gplot.h
>+include/leptonica/heap.h
>+include/leptonica/imageio.h
>+include/leptonica/jbclass.h
>+include/leptonica/leptprotos.h
>+include/leptonica/leptwin.h
>+include/leptonica/list.h
>+include/leptonica/morph.h
>+include/leptonica/pix.h
>+include/leptonica/ptra.h
>+include/leptonica/queue.h
>+include/leptonica/readbarcode.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.0
>-@dirrm include/liblept
>+lib/liblept.so.2
>+@dirrm include/leptonica
>Index: files/patch-configure.ac
>===================================================================
>RCS file: files/patch-configure.ac
>diff -N files/patch-configure.ac
>--- files/patch-configure.ac	5 Aug 2011 09:57:46 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- ./configure.ac.orig	2009-01-19 14:30:19.000000000 +0900
>-+++ ./configure.ac	2009-05-21 00:15:20.000000000 +0900
>-@@ -114,7 +114,7 @@
>- 
>- # Check where all the following programs are and set
>- # variables accordingly:
>--AC_PROG_RANLIB
>-+AM_PROG_LIBTOOL
>- # AC_PROG_LN_S
>- # AC_PATH_PROG(MV, mv)
>- # AC_PATH_PROG(CP, cp)
>Index: files/patch-src__Makefile.am
>===================================================================
>RCS file: files/patch-src__Makefile.am
>diff -N files/patch-src__Makefile.am
>--- files/patch-src__Makefile.am	5 Aug 2011 09:57:46 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,24 +0,0 @@
>---- src/Makefile.am.orig	2009-01-19 08:30:19.000000000 +0300
>-+++ src/Makefile.am	2009-05-21 21:55:01.000000000 +0400
>-@@ -6,10 +6,9 @@
>- MAKE = make -f Makefile
>- AM_CFLAGS = -D_BSD_SOURCE -DANSI -fPIC
>- AM_CPPFLAGS = $(ENDIANNESS)
>--CFLAGS = -O2
>- 
>--lib_LIBRARIES = liblept.a
>--liblept_a_SOURCES = adaptmap.c \
>-+lib_LTLIBRARIES = liblept.la
>-+liblept_la_SOURCES = adaptmap.c \
>-  affine.c affinecompose.c \
>-  arithlow.c arrayaccess.c \
>-  bardecode.c \
>-@@ -73,7 +72,7 @@
>- 
>- include_HEADERS = allheaders.h alltypes.h arrayaccess.h \
>-  array.h bbuffer.h bmf.h bmp.h ccbord.h environ.h \
>-- gplot.h imageio.h jbclass.h jmorecfg.h jpeglib.h leptprotos.h list.h \
>-+ gplot.h imageio.h jbclass.h leptprotos.h list.h \
>-  morph.h pheap.h pix.h pqueue.h readbarcode.h stack.h watershed.h
>- 
>- EXTRA_DIST = Makefile.mingw arrayaccess.h.vc arrayaccess.h.vc60 \

Actions: View | Diff

Attachments on bug 163153: 120357 | 120358