From owner-svn-ports-head@freebsd.org  Tue May 22 15:32:54 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B50FCEF9FEA;
 Tue, 22 May 2018 15:32:54 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AEA77B45A;
 Tue, 22 May 2018 15:32:54 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BC2915EDD;
 Tue, 22 May 2018 15:32:54 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4MFWs3Y072297;
 Tue, 22 May 2018 15:32:54 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MFWsi7072296;
 Tue, 22 May 2018 15:32:54 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201805221532.w4MFWsi7072296@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Tue, 22 May 2018 15:32:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r470621 - head/graphics/gocr
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: head/graphics/gocr
X-SVN-Commit-Revision: 470621
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 May 2018 15:32:54 -0000

Author: yuri
Date: Tue May 22 15:32:53 2018
New Revision: 470621
URL: https://svnweb.freebsd.org/changeset/ports/470621

Log:
  graphics/gocr: Modernize port: use helpers instead of .include/.if/.endif
  
  Approved by:	portmgr blanket

Modified:
  head/graphics/gocr/Makefile

Modified: head/graphics/gocr/Makefile
==============================================================================
--- head/graphics/gocr/Makefile	Tue May 22 15:09:38 2018	(r470620)
+++ head/graphics/gocr/Makefile	Tue May 22 15:32:53 2018	(r470621)
@@ -34,28 +34,25 @@ DOC_FILES2=	*.dtd *.xml *.html *.txt *.fig *.png
 OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=	X11
 
-.include <bsd.port.options.mk>
+X11_USES=		tk
+X11_PLIST_FILES=	bin/gocr.tcl
 
-.if ${PORT_OPTIONS:MX11}
-USES+=		tk
-PLIST_FILES+=	bin/gocr.tcl
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in
-.if !  ${PORT_OPTIONS:MX11}
+
+post-patch-X11-off:
 	@${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in
-.else
+
+post-patch-X11-on:
 	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/bin/gocr.tcl
-.endif
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gocr
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
-.endif
 
 .include <bsd.port.mk>