remove graphics/leptonlib; connect graphics/leptonica to build;

add a MOVED entry; adjust a dependent port

PR:		158572

8 files changed, 2 insertions, 108 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 17835d63fc96..fbb0f9c1e5f2 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -419,7 +419,7 @@
     SUBDIR += lcms2
     SUBDIR += leafpak
     SUBDIR += lensfun
-    SUBDIR += leptonlib
+    SUBDIR += leptonica
     SUBDIR += lfview
     SUBDIR += lib3ds
     SUBDIR += libGL
diff --git a/graphics/leptonlib/Makefile b/graphics/leptonlib/Makefile
deleted file mode 100644
index 7a91cf3adff7..000000000000
--- a/graphics/leptonlib/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# New ports collection makefile for:	leptonlib
-# Date created:		2009-05-20
-# Whom:			Hiroto Kagotani <hiroto.kagotani@gmail.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	leptonlib
-PORTVERSION=	1.60
-PORTREVISION=	4
-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 \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-PROJECTHOST=	leptonica
-
-MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	libtool aclocal automake autoconf
-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
-USE_LDCONFIG=	yes
-CONFIGURE_ENV=	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
-
-.include <bsd.port.mk>
diff --git a/graphics/leptonlib/distinfo b/graphics/leptonlib/distinfo
deleted file mode 100644
index 1a4d4b4a472c..000000000000
--- a/graphics/leptonlib/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (leptonlib-1.60.tar.gz) = 9c9b7710418a33aad35dcd7b76b6b69affdc90b2b62cce56b6c6dc93f5e7a072
-SIZE (leptonlib-1.60.tar.gz) = 4115391
diff --git a/graphics/leptonlib/files/patch-configure.ac b/graphics/leptonlib/files/patch-configure.ac
deleted file mode 100644
index ab80d8f6791e..000000000000
--- a/graphics/leptonlib/files/patch-configure.ac
+++ /dev/null
@@ -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)
diff --git a/graphics/leptonlib/files/patch-src__Makefile.am b/graphics/leptonlib/files/patch-src__Makefile.am
deleted file mode 100644
index 74f0cb78f4eb..000000000000
--- a/graphics/leptonlib/files/patch-src__Makefile.am
+++ /dev/null
@@ -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 \
diff --git a/graphics/leptonlib/pkg-descr b/graphics/leptonlib/pkg-descr
deleted file mode 100644
index 852653951312..000000000000
--- a/graphics/leptonlib/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-An open source C library for efficient image processing and
-image analysis operations.
-
-WWW: http://code.google.com/p/leptonica/
diff --git a/graphics/leptonlib/pkg-plist b/graphics/leptonlib/pkg-plist
deleted file mode 100644
index cda07166e1cf..000000000000
--- a/graphics/leptonlib/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-lib/liblept.a
-lib/liblept.la
-lib/liblept.so
-lib/liblept.so.0
-@dirrm include/liblept
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 38f6e6ce7615..45715a17597d 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -44,7 +44,7 @@ USE_SDL=	sdl
 .if !defined(WITH_LEPTONICA)
 CONFIGURE_ARGS+=--without-leptonica
 .else
-LIB_DEPENDS+=	lept.0:${PORTSDIR}/graphics/leptonlib
+LIB_DEPENDS+=	lept.0:${PORTSDIR}/graphics/leptonica
 .endif
 
 pre-configure: