Complete move of gocr from textproc to graphics.

9 files changed, 5 insertions, 68 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 4e07e9b9026..245fd2b648e 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.391 2005/10/16 20:18:21 wiz Exp $
+# $NetBSD: Makefile,v 1.392 2005/10/16 20:23:14 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -111,6 +111,7 @@ SUBDIR+=	gnome-backgrounds
 SUBDIR+=	gnome-icon-theme
 SUBDIR+=	gnuplot
 SUBDIR+=	gnuplot-nox11
+SUBDIR+=	gocr
 SUBDIR+=	gpaint
 SUBDIR+=	gphoto
 SUBDIR+=	gphoto2
diff --git a/textproc/Makefile b/textproc/Makefile
index 756f82deab0..a53d366f444 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.297 2005/10/14 21:55:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.298 2005/10/16 20:23:14 wiz Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -75,7 +75,6 @@ SUBDIR+=	gdome2
 SUBDIR+=	glimpse
 SUBDIR+=	gnome-doc-utils
 SUBDIR+=	gnome-spell
-SUBDIR+=	gocr
 SUBDIR+=	grep
 SUBDIR+=	groff
 SUBDIR+=	gsed
diff --git a/textproc/gocr/DESCR b/textproc/gocr/DESCR
deleted file mode 100644
index cea5f69adb9..00000000000
--- a/textproc/gocr/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-GOCR is an optical character recognition program, released under the GNU
-General Public License. It reads images in many formats (pnm, pbm, pgm, ppm,
-some pcx and tga image files (or PNM from stdin); if PNM-tools installed and
-running linux-like system you can also use pnm.gz, pnm.bz2, png, jpg, tiff,
-gif, bmp and others) and outputs a text file. You do not have to train the
-program or store large font bases. Simply call gocr from the command line
-and get your results.
diff --git a/textproc/gocr/Makefile b/textproc/gocr/Makefile
deleted file mode 100644
index a1619778745..00000000000
--- a/textproc/gocr/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:34 jlam Exp $
-
-DISTNAME=	gocr-0.37
-CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jocr/}
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/jocr
-COMMENT=	GOCR is a set of OCR tools
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gocr/PLIST b/textproc/gocr/PLIST
deleted file mode 100644
index 27f473038f3..00000000000
--- a/textproc/gocr/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 07:19:38 mrg Exp $
-bin/gocr
-include/gocr.h
-lib/libPgm2asc.a
-man/man1/gocr.1
diff --git a/textproc/gocr/distinfo b/textproc/gocr/distinfo
deleted file mode 100644
index 69871e2b8a6..00000000000
--- a/textproc/gocr/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:42 agc Exp $
-
-SHA1 (gocr-0.37.tar.gz) = 41fa2e3f1fc17d27f1f1610441cec4d5f4a6201e
-RMD160 (gocr-0.37.tar.gz) = 99227ad91d497c7c88f8ca86a4fedc766bdaef0b
-Size (gocr-0.37.tar.gz) = 672962 bytes
-SHA1 (patch-aa) = 106daf9fb2bf37f9a11972244b3c4e292178dbe2
-SHA1 (patch-ab) = 56833576531ee62dc96ab6d65e029448eacb88ea
diff --git a/textproc/gocr/patches/patch-aa b/textproc/gocr/patches/patch-aa
deleted file mode 100644
index 4ed197226c6..00000000000
--- a/textproc/gocr/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/24 17:47:26 wiz Exp $
-
---- configure.orig	2002-08-12 17:18:53.000000000 +0200
-+++ configure
-@@ -946,9 +946,11 @@ else
- fi
- 
- 
--CPPFLAGS=-I/usr/X11R6/include
-+#CPPFLAGS=-I/usr/X11R6/include
-+CPPFLAGS=
- #LDFLAGS="-L/usr/X11R6/lib -lpbm -lpgm -lppm -lpnm"
--LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib"
-+#LDFLAGS="-L/usr/X11R6/lib -L/usr/local/netpbm/lib"
-+LDFLAGS=
- 
- ## pnm can only be found, if LDFLAGS contains -lpgm -lpnm ... etc. 
- ## is there a better solution ?
diff --git a/textproc/gocr/patches/patch-ab b/textproc/gocr/patches/patch-ab
deleted file mode 100644
index 969f309fdbd..00000000000
--- a/textproc/gocr/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/12/09 13:53:38 sketch Exp $
-
---- src/Makefile.in.orig	2003-12-09 13:41:53.060784000 +0000
-+++ src/Makefile.in	2003-12-09 13:42:15.130080000 +0000
-@@ -66,7 +66,6 @@
- # PHONY = don't look at file clean, -rm = start rm and ignore errors
- .PHONY : clean proper install
- install: all
--	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
- 	$(INSTALL) ../bin/$(PROGRAM) $(DESTDIR)$(bindir)
- 	$(INSTALL) $(LIBPGMASCLIB) $(DESTDIR)$(libdir)
- 	$(INSTALL) $(INCLUDEFILES) $(DESTDIR)$(includedir)
diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index 73eca692082..34139d01d12 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/16 20:23:14 wiz Exp $
 #
 
 DISTNAME=	subtitleripper-0.3-1
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/subtitleripper/
 COMMENT=	Sub title ripping program
 
-DEPENDS+=	gocr-[0-9]*:../../textproc/gocr
+DEPENDS+=	gocr-[0-9]*:../../graphics/gocr
 
 USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}/subtitleripper