From nemysis@gmx.ch  Sun Mar 24 15:40:12 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 5056EBF0
	for <freebsd-gnats-submit@freebsd.org>; Sun, 24 Mar 2013 15:40:12 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.20])
	by mx1.freebsd.org (Postfix) with ESMTP id CF6AAD2
	for <freebsd-gnats-submit@freebsd.org>; Sun, 24 Mar 2013 15:40:11 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.12]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0MJqWY-1UIgZD0Gma-001Adg for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Mar 2013 16:40:11 +0100
Received: (qmail invoked by alias); 24 Mar 2013 15:40:09 -0000
Received: from 38-21.104-92.cust.bluewin.ch (EHLO something.email.com) [92.104.21.38]
  by mail.gmx.net (mp012) with SMTP; 24 Mar 2013 16:40:09 +0100
Received: by something.email.com (sSMTP sendmail emulation); Sun, 24 Mar 2013 16:40:08 +0100
Message-Id: <20130324154012.5056EBF0@hub.freebsd.org>
Date: Sun, 24 Mar 2013 16:40:08 +0100
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dhn@FreeBSD.org
Subject: [PATCH] graphics/gocr: update to 0.50, Convert to OptionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         177345
>Category:       ports
>Synopsis:       [PATCH] graphics/gocr: update to 0.50, Convert to OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dhn
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 24 15:50:00 UTC 2013
>Closed-Date:    Tue Dec 17 21:49:39 CET 2013
>Last-Modified:  Tue Dec 17 20:50:01 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

- Update to 0.50
- Shorten header
- Convert to OptionsNG
- Add license
- Fix docs

Port maintainer (dhn@FreeBSD.org) is cc'd.

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- gocr-0.50.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/gocr/Makefile ./Makefile
--- /usr/ports/graphics/gocr/Makefile	2013-01-14 17:57:03.000000000 +0100
+++ ./Makefile	2013-03-24 16:37:15.000000000 +0100
@@ -1,45 +1,58 @@
-# New ports collection makefile for:	gocr
-# Date created:				03 June 2002
-# Whom:					Kay Lehmann
-#
+# Created by: Kay Lehmann
 # $FreeBSD: head/graphics/gocr/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	gocr
-PORTVERSION=	0.49
-PORTREVISION=	1
+PORTVERSION=	0.50
 CATEGORIES=	graphics
 MASTER_SITES=	http://www-e.uni-magdeburg.de/jschulen/ocr/
 
 MAINTAINER=	dhn@FreeBSD.org
-COMMENT=	An OCR (Optical Character Recognition) program
+COMMENT=	OCR (Optical Character Recognition) program
+
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-netpbm=${LOCALBASE}
+USE_GMAKE=	yes
 MAKE_ARGS=	prefix=${PREFIX} exec_prefix=${PREFIX} DESTDIR=${DESTDIR}
 
-MAN1=		gocr.1
-PORTDOCS=	examples.txt gocr.html unicode.txt
 PLIST_FILES=	bin/gocr
 
-.if !defined(WITHOUT_X11)
+MAN1=		gocr.1
+
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	AUTHORS BUGS CREDITS HISTORY README READMEde.txt TODO
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	*.dtd *.xml *.html *.txt *.fig *.png
+
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=	X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 USE_TK_WRAPPER=	yes
 PLIST_FILES+=	bin/gocr.tcl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in
-.if defined(WITHOUT_X11)
+.if !  ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/gocr/distinfo ./distinfo
--- /usr/ports/graphics/gocr/distinfo	2013-01-14 17:57:03.000000000 +0100
+++ ./distinfo	2013-03-24 13:49:22.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (gocr-0.49.tar.gz) = cc29931d50b3be11608dc79d1c7d8a20919dbe6313b1ba5dc88ecf99cffd171a
-SIZE (gocr-0.49.tar.gz) = 392386
+SHA256 (gocr-0.50.tar.gz) = bc261244f887419cba6d962ec1ad58eefd77176885093c4a43061e7fd565f5b5
+SIZE (gocr-0.50.tar.gz) = 419209
--- gocr-0.50.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dhn 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 24 15:50:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177345 
State-Changed-From-To: open->closed 
State-Changed-By: dhn 
State-Changed-When: Tue Dec 17 21:49:38 CET 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177345 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177345: commit references a PR
Date: Tue, 17 Dec 2013 20:49:23 +0000 (UTC)

 Author: dhn
 Date: Tue Dec 17 20:49:16 2013
 New Revision: 336766
 URL: http://svnweb.freebsd.org/changeset/ports/336766
 
 Log:
   - Update to 0.50
   - Shorten header
   - Convert to OptionsNG
   - Add license
   - Fix docs
   
   PR:		ports/177345
   Submitted by:	nemysis <nemysis@gmx.ch>
 
 Modified:
   head/graphics/gocr/Makefile
   head/graphics/gocr/distinfo
 
 Modified: head/graphics/gocr/Makefile
 ==============================================================================
 --- head/graphics/gocr/Makefile	Tue Dec 17 20:42:26 2013	(r336765)
 +++ head/graphics/gocr/Makefile	Tue Dec 17 20:49:16 2013	(r336766)
 @@ -2,26 +2,40 @@
  # $FreeBSD$
  
  PORTNAME=	gocr
 -PORTVERSION=	0.49
 -PORTREVISION=	1
 +PORTVERSION=	0.50
  CATEGORIES=	graphics
  MASTER_SITES=	http://www-e.uni-magdeburg.de/jschulen/ocr/
  
  MAINTAINER=	dhn@FreeBSD.org
 -COMMENT=	An OCR (Optical Character Recognition) program
 +COMMENT=	OCR (Optical Character Recognition) program
 +
 +LICENSE=	GPLv2
  
  LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
  
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--with-netpbm=${LOCALBASE}
 +USE_GMAKE=	yes
  MAKE_ARGS=	prefix=${PREFIX} exec_prefix=${PREFIX} DESTDIR=${DESTDIR}
  
 -MAN1=		gocr.1
 -PORTDOCS=	examples.txt gocr.html unicode.txt
  PLIST_FILES=	bin/gocr
  
 -.if !defined(WITHOUT_X11)
 +MAN1=	gocr.1
 +PORTDOCS=	*
 +
 +DOCSRCDIR1=	${WRKSRC}
 +DOC_FILES1=	AUTHORS BUGS CREDITS HISTORY README READMEde.txt TODO
 +
 +DOCSRCDIR2=	${WRKSRC}/doc
 +DOCSDIR2=	${DOCSDIR}/doc
 +DOC_FILES2=	*.dtd *.xml *.html *.txt *.fig *.png
 +
 +OPTIONS_DEFINE=	X11
 +OPTIONS_DEFAULT=	X11
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MX11}
  USE_TK_WRAPPER=	yes
  PLIST_FILES+=	bin/gocr.tcl
  .endif
 @@ -29,14 +43,16 @@ PLIST_FILES+=	bin/gocr.tcl
  NO_STAGE=	yes
  post-patch:
  	@${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in
 -.if defined(WITHOUT_X11)
 +.if !  ${PORT_OPTIONS:MX11}
  	@${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in
  .endif
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
 -	@(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 +	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
 +	@${MKDIR} ${DOCSDIR2}
 +	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
  .endif
  
  .include <bsd.port.mk>
 
 Modified: head/graphics/gocr/distinfo
 ==============================================================================
 --- head/graphics/gocr/distinfo	Tue Dec 17 20:42:26 2013	(r336765)
 +++ head/graphics/gocr/distinfo	Tue Dec 17 20:49:16 2013	(r336766)
 @@ -1,2 +1,2 @@
 -SHA256 (gocr-0.49.tar.gz) = cc29931d50b3be11608dc79d1c7d8a20919dbe6313b1ba5dc88ecf99cffd171a
 -SIZE (gocr-0.49.tar.gz) = 392386
 +SHA256 (gocr-0.50.tar.gz) = bc261244f887419cba6d962ec1ad58eefd77176885093c4a43061e7fd565f5b5
 +SIZE (gocr-0.50.tar.gz) = 419209
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
