Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Mar 2013 04:09:34 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        lippe@FreeBSD.org
Subject:   ports/177130: [PATCH] graphics/ocrad: Convert to OptionsNG
Message-ID:  <20130320030945.BD6A8AC3@hub.freebsd.org>
Resent-Message-ID: <201303200310.r2K3A1FU083375@freefall.freebsd.org>

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

>Number:         177130
>Category:       ports
>Synopsis:       [PATCH] graphics/ocrad: Convert to OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 20 03:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>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:

Removed file(s):
- pkg-plist

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

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

--- ocrad-0.21_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/ocrad/Makefile ./Makefile
--- /usr/ports/graphics/ocrad/Makefile	2013-01-14 17:57:09.000000000 +0100
+++ ./Makefile	2013-03-20 04:04:58.000000000 +0100
@@ -1,39 +1,43 @@
-# New ports collection makefile for:	graphics/ocrad
-# Date created:				12.11.2003
-# Whom:					Ulrich Spoerlein <q@uni.de>
-#
+# Created by: Ulrich Spoerlein <q@uni.de>
 # $FreeBSD: head/graphics/ocrad/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	ocrad
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	GNU
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	OCR program implemented as filter
 
-HAS_CONFIGURE=	yes
+LICENSE=	GPLv3
 
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
 CXXFLAGS+=	-Wall -W
 MAKE_ARGS=	-j`${SYSCTL} -n hw.ncpu`
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS README TODO INSTALL
-EXAMPLES=	test.pbm test.txt check.sh
+PLIST_FILES=	bin/${PORTNAME}
+
 MAN1=		ocrad.1
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+PORTEXAMPLES=	*
+
+.include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ocrad ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/ocrad.1 ${MAN1PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/testsuite/,} ${EXAMPLESDIR}/
+	@(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/ocrad/pkg-plist ./pkg-plist
--- /usr/ports/graphics/ocrad/pkg-plist	2013-01-14 17:57:09.000000000 +0100
+++ ./pkg-plist	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-bin/ocrad
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.pbm
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/check.sh
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- ocrad-0.21_1.patch ends here ---

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



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