Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2001 11:07:44 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/32618: Update port: graphics/claraocr
Message-ID:  <200112081907.fB8J7i299238@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         32618
>Category:       ports
>Synopsis:       Update port: graphics/claraocr
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 08 11:10:03 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Add missing USE_XLIB
- Support X11BASE properly
- Support install macros

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/claraocr/Makefile graphics/claraocr/Makefile
--- /usr/ports/graphics/claraocr/Makefile	Tue Nov  6 16:45:31 2001
+++ graphics/claraocr/Makefile	Sat Dec  8 11:10:38 2001
@@ -17,12 +17,13 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_XLIB=	yes
 USE_PERL5=	yes
+MAKE_ENV=	MKDIR="${MKDIR}"
 
 MAN1=	clara-adv.1 clara-dev.1 clara.1
 
 post-patch:
-	@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Makefile
 	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},g' ${WRKSRC}/clara.pl \
 		${WRKSRC}/mkdoc.pl ${WRKSRC}/selthresh.pl
 
diff -urN /usr/ports/graphics/claraocr/files/patch-Makefile graphics/claraocr/files/patch-Makefile
--- /usr/ports/graphics/claraocr/files/patch-Makefile	Tue Nov  6 16:45:38 2001
+++ graphics/claraocr/files/patch-Makefile	Sat Dec  8 10:42:15 2001
@@ -1,49 +1,71 @@
-$FreeBSD: ports/graphics/claraocr/files/patch-Makefile,v 1.1 2001/11/06 07:45:38 petef Exp $
-
---- Makefile.orig	Mon Nov  5 09:46:33 2001
-+++ Makefile	Mon Nov  5 09:48:41 2001
+--- Makefile.orig	Sun Oct 21 07:16:38 2001
++++ Makefile	Sat Dec  8 10:42:09 2001
 @@ -28,13 +28,13 @@
  #
  # Configure the destination directories:
  #
 -BINDIR=/usr/local/bin
-+BINDIR=%%PREFIX%%/bin
++BINDIR=${PREFIX}/bin
  #BINDIR=/usr/bin
  
 -MANDIR=/usr/local/man/man1
-+MANDIR=%%PREFIX%%/man/man1
++MANDIR=${PREFIX}/man/man1
  #MANDIR=/usr/man/man1
  
 -DOCDIR=/usr/local/doc/clara
-+DOCDIR=%%PREFIX%%/share/doc/clara
++DOCDIR=${PREFIX}/share/doc/clara
  #DOCDIR=/usr/doc/clara
  #DOCDIR=/usr/doc/clara-$(VERSION)
  #DOCDIR=/usr/share/doc/clara
-@@ -44,7 +44,7 @@
+@@ -42,9 +42,9 @@
  #
- INCLUDE = -I/usr/X11R6/include
- LIBPATH = -L/usr/X11R6/lib
+ # Configure these variables accordingly to your system:
+ #
+-INCLUDE = -I/usr/X11R6/include
+-LIBPATH = -L/usr/X11R6/lib
 -CC = gcc
++INCLUDE = -I${X11BASE}/include
++LIBPATH = -L${X11BASE}/lib
 +CC ?= gcc
  
  #
  # Now choose the Clara OCR compilation options:
-@@ -83,7 +83,7 @@
+@@ -83,14 +83,14 @@
  #
  # Add or remove flags if necessary:
  #
 -CFLAGS = $(INCLUDE) -g -O2 -Wall $(COPTS)
-+CFLAGS += $(INCLUDE) -g -Wall $(COPTS)
++CFLAGS += $(INCLUDE) $(COPTS)
  #CFLAGS = $(INCLUDE) -g -O2 -pedantic $(COPTS)
  #CFLAGS = $(INCLUDE) -g -O2 $(COPTS)
  
-@@ -158,8 +158,10 @@
- 	install selthresh.pl $(BINDIR)
- 	install -d $(MANDIR)
- 	install doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
+ #
+ # Add or remove flags if necessary:
+ #
+-LDFLAGS = -g
++LDFLAGS =
+ 
+ #
+ # If your system requires additional libs, please add them:
+@@ -153,13 +153,15 @@
+ 	./clara -p 2
+ 
+ install: all
+-	install -d $(BINDIR)
+-	install clara $(BINDIR)
+-	install selthresh.pl $(BINDIR)
+-	install -d $(MANDIR)
+-	install doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
+-	install -d $(DOCDIR)
+-	install ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
++	${MKDIR} $(BINDIR)
++	${BSD_INSTALL_PROGRAM} clara $(BINDIR)
++	${BSD_INSTALL_SCRIPT} selthresh.pl $(BINDIR)
++	${MKDIR} $(MANDIR)
++	${BSD_INSTALL_MAN} doc/clara.1 doc/clara-dev.1 doc/clara-adv.1 $(MANDIR)
 +.ifndef NOPORTDOCS
- 	install -d $(DOCDIR)
- 	install ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
++	${MKDIR} $(DOCDIR)
++	${BSD_INSTALL_DATA} ANNOUNCE CHANGELOG doc/FAQ doc/*.html $(DOCDIR)
 +.endif
  
  clean:

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112081907.fB8J7i299238>