Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jan 2014 09:51:43 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340162 - head/graphics/tesseract
Message-ID:  <201401180951.s0I9phEZ085472@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Jan 18 09:51:42 2014
New Revision: 340162
URL: http://svnweb.freebsd.org/changeset/ports/340162
QAT: https://qat.redports.org/buildarchive/r340162/

Log:
  Support stage
  Use options helpers
  Remove reference to NOPORTDATA

Modified:
  head/graphics/tesseract/Makefile
  head/graphics/tesseract/pkg-plist

Modified: head/graphics/tesseract/Makefile
==============================================================================
--- head/graphics/tesseract/Makefile	Sat Jan 18 09:43:41 2014	(r340161)
+++ head/graphics/tesseract/Makefile	Sat Jan 18 09:51:42 2014	(r340162)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tesseract
 PORTVERSION=	3.02.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
@@ -11,9 +11,11 @@ DISTFILES=	tesseract-ocr-${PORTVERSION}$
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	lept:${PORTSDIR}/graphics/leptonica
+LIB_DEPENDS=	liblept.so:${PORTSDIR}/graphics/leptonica
 
 DIST_SUBDIR=	${PORTNAME}
 PROJECTHOST=	tesseract-ocr
@@ -26,52 +28,24 @@ CONFIGURE_ENV=	LIBLEPT_HEADERSDIR="${LOC
 		LIBS="${PTHREAD_LIBS}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.ifndef NOPORTDATA
-DATADIR=        ${PREFIX}/share/tessdata
-MAN1=		ambiguous_words.1 cntraining.1 combine_tessdata.1 dawg2wordlist.1 \
-		mftraining.1 shapeclustering.1 tesseract.1 unicharset_extractor.1 \
-		wordlist2dawg.1
-MAN5=		unicharambigs.5 unicharset.5
+DATADIR=	${PREFIX}/share/tessdata
 PORTDATA=	*
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	AUTHORS ChangeLog README ReleaseNotes html
-.endif
-
-.if ${PORT_OPTIONS:MDOCS} || make(makesum)
-DISTFILES+=	tesseract-ocr-${PORTVERSION}-doc-html${EXTRACT_SUFX}
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	eurotext.tif phototest.tif
-.endif
+
+DOCS_DISTFILES=	tesseract-ocr-${PORTVERSION}-doc-html${EXTRACT_SUFX}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 	's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 	${WRKSRC}/Makefile.in
-.ifdef NOPORTDATA
-	@${FIND} ${WRKSRC} -type f -name 'Makefile.in' -print0 | ${XARGS} -0 \
-	${REINPLACE_CMD} -e '\|^install-am:|,+1s|install-data-am||'
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS:Nhtml} ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
-.endif
-	@${ECHO_MSG} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} ""
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS:Nhtml} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/tesseract/pkg-plist
==============================================================================
--- head/graphics/tesseract/pkg-plist	Sat Jan 18 09:43:41 2014	(r340161)
+++ head/graphics/tesseract/pkg-plist	Sat Jan 18 09:51:42 2014	(r340162)
@@ -36,5 +36,16 @@ lib/libtesseract.a
 lib/libtesseract.la
 lib/libtesseract.so
 lib/libtesseract.so.3
+man/man1/ambiguous_words.1.gz
+man/man1/cntraining.1.gz
+man/man1/combine_tessdata.1.gz
+man/man1/dawg2wordlist.1.gz
+man/man1/mftraining.1.gz
+man/man1/shapeclustering.1.gz
+man/man1/tesseract.1.gz
+man/man1/unicharset_extractor.1.gz
+man/man1/wordlist2dawg.1.gz
+man/man5/unicharambigs.5.gz
+man/man5/unicharset.5.gz
 %%PORTDATA%%libdata/pkgconfig/tesseract.pc
 %%PORTDATA%%@dirrm include/tesseract



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