From owner-svn-ports-all@freebsd.org Sat Dec 17 12:58:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2E5AC84ACD; Sat, 17 Dec 2016 12:58:59 +0000 (UTC) (envelope-from sunpoet@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 mx1.freebsd.org (Postfix) with ESMTPS id 582387BD; Sat, 17 Dec 2016 12:58:59 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBHCwwpC080586; Sat, 17 Dec 2016 12:58:58 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBHCwwKw080585; Sat, 17 Dec 2016 12:58:58 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612171258.uBHCwwKw080585@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 17 Dec 2016 12:58:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428757 - head/lang/twelf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2016 12:58:59 -0000 Author: sunpoet Date: Sat Dec 17 12:58:58 2016 New Revision: 428757 URL: https://svnweb.freebsd.org/changeset/ports/428757 Log: - USe DISTVERSIONPREFIX instead of DISTNAME - Add missing OPTIONS_DEFINE=DOCS - Use USES=makeinfo instead of hard-coded BUILD_DEPENDS - Convert to options helper - Convert to options target helper - While I'm here, fix indent Approved by: portmgr (blanket) Modified: head/lang/twelf/Makefile Modified: head/lang/twelf/Makefile ============================================================================== --- head/lang/twelf/Makefile Sat Dec 17 12:58:54 2016 (r428756) +++ head/lang/twelf/Makefile Sat Dec 17 12:58:58 2016 (r428757) @@ -3,10 +3,10 @@ PORTNAME= twelf PORTVERSION= 1.7.1 +DISTVERSIONPREFIX= src- CATEGORIES= lang math MASTER_SITES= http://twelf.plparty.org/releases/ \ - http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/ -DISTNAME= ${PORTNAME}-src-${PORTVERSION} + http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/ MAINTAINER= beyert@cs.ucr.edu COMMENT= Meta-logical framework for deductive systems @@ -18,43 +18,36 @@ RUN_DEPENDS= mlton:lang/mlton BUILD_DEPENDS= mlton:lang/mlton \ texi2html:textproc/texi2html -USES= gmake +OPTIONS_DEFINE= DOCS + +USES= gmake ALL_TARGET= mlton PLIST_FILES= bin/${PORTNAME}-server PORTDATA= emacs examples examples-clp examples-delphin tex vim README PORTDOCS= dvi html info pdf ps +WRKSRC= ${WRKDIR}/twelf +INFO= twelf -.include - -.if ${PORT_OPTIONS:MDOCS} -USE_TEX= tex:build dvipsk:build -BUILD_DEPENDS+= ${LOCALBASE}/bin/makeinfo:print/texinfo -.endif +DOCS_USE= TEX=dvipsk:build,tex:build +DOCS_USES= makeinfo -post-patch: -.if ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: @${REINPLACE_CMD} 's|-number|-number-sections|g' \ ${WRKSRC}/doc/guide/Makefile @${REINPLACE_CMD} 's|twelf_\*.html|twelf/\*.html|g' \ ${WRKSRC}/doc/guide/Makefile -.endif -post-build: -.if ${PORT_OPTIONS:MDOCS} +post-build-DOCS-on: cd ${WRKSRC}/doc/guide && ${MAKE} all ${INSTALL_TARGET} -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME}-server \ ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} -.endif - -WRKSRC= ${WRKDIR}/twelf -INFO= twelf .include