From owner-svn-ports-all@freebsd.org Thu Jul 6 09:00:22 2017 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 5847CDA8803; Thu, 6 Jul 2017 09:00:22 +0000 (UTC) (envelope-from amdmi3@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 26D363155; Thu, 6 Jul 2017 09:00:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6690LA7001115; Thu, 6 Jul 2017 09:00:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6690LS7001114; Thu, 6 Jul 2017 09:00:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201707060900.v6690LS7001114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 6 Jul 2017 09:00:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445130 - head/math/ocaml-ocamlgraph X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/math/ocaml-ocamlgraph X-SVN-Commit-Revision: 445130 X-SVN-Commit-Repository: ports 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: Thu, 06 Jul 2017 09:00:22 -0000 Author: amdmi3 Date: Thu Jul 6 09:00:21 2017 New Revision: 445130 URL: https://svnweb.freebsd.org/changeset/ports/445130 Log: - Switch to options helpers - Fix META installation, should not depend on DOCS Modified: head/math/ocaml-ocamlgraph/Makefile Modified: head/math/ocaml-ocamlgraph/Makefile ============================================================================== --- head/math/ocaml-ocamlgraph/Makefile Thu Jul 6 06:36:12 2017 (r445129) +++ head/math/ocaml-ocamlgraph/Makefile Thu Jul 6 09:00:21 2017 (r445130) @@ -3,7 +3,7 @@ PORTNAME= ocamlgraph PORTVERSION= 1.8.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://ocamlgraph.lri.fr/download/ \ ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/ @@ -12,14 +12,6 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= Graph manipulation library for OCaml -OPTIONS_DEFINE= GUI DOCS -OPTIONS_DEFAULT=GUI -OPTIONS_SUB= yes -GUI_DESC= Include GUI user programs: viewer and editor -GUI_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 -GUI_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 -GUI_CONFIGURE_OFF= LABLGTK2=no - USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes @@ -28,32 +20,39 @@ USE_OCAMLFIND_PLIST= yes OCAML_LDLIBS= ${OCAML_LIBDIR}/${PORTNAME} GNU_CONFIGURE= yes -PLIST_SUB+= OCAMLGRAPHDIR="${OCAML_LDLIBS}" - ALL_TARGET= all INSTALL_TARGET= install MAKE_JOBS_UNSAFE= yes PORTSCOUT= skipv:1.81 -.include +PLIST_SUB= OCAMLGRAPHDIR="${OCAML_LDLIBS}" -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= doc DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * -post-patch: +OPTIONS_DEFINE= GUI DOCS +OPTIONS_DEFAULT=GUI +OPTIONS_SUB= yes +GUI_DESC= Include GUI user programs: viewer and editor +GUI_BUILD_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 +GUI_RUN_DEPENDS= lablgtk2:x11-toolkits/ocaml-lablgtk2 +GUI_CONFIGURE_OFF= LABLGTK2=no + +DOCS_ALL_TARGET= doc + +post-patch-DOCS-on: @${REINPLACE_CMD} -e '/VIEWER_DIR. doc/d' ${WRKSRC}/Makefile.in -.if empty(PORT_OPTIONS:MGUI) + +post-patch-GUI-off: # Override auto-detection @${REINPLACE_CMD} -Ee 's/(LABLGTK2)=yes/\1=no/' ${WRKSRC}/configure -.endif post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/META ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS} -.endif + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include