From owner-svn-ports-head@freebsd.org Thu Sep 3 12:57:13 2015 Return-Path: Delivered-To: svn-ports-head@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 45DCB9C8837; Thu, 3 Sep 2015 12:57:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 369C3F7C; Thu, 3 Sep 2015 12:57:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83CvDOc043715; Thu, 3 Sep 2015 12:57:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83CvCJq043713; Thu, 3 Sep 2015 12:57:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509031257.t83CvCJq043713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 3 Sep 2015 12:57:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395950 - head/security/libp11 X-SVN-Group: ports-head 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2015 12:57:13 -0000 Author: amdmi3 Date: Thu Sep 3 12:57:12 2015 New Revision: 395950 URL: https://svnweb.freebsd.org/changeset/ports/395950 Log: - Switch to options helpers - Make EXAMPLES option actually do some job Approved by: portmgr blanket Modified: head/security/libp11/Makefile head/security/libp11/pkg-plist Modified: head/security/libp11/Makefile ============================================================================== --- head/security/libp11/Makefile Thu Sep 3 12:56:30 2015 (r395949) +++ head/security/libp11/Makefile Thu Sep 3 12:57:12 2015 (r395950) @@ -28,11 +28,7 @@ CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBA PORTDOCS= * -.include - -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--enable-doc -.endif +DOCS_CONFIGURE_ON= --enable-doc post-patch: @${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ @@ -40,7 +36,7 @@ post-patch: @${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \ ${WRKSRC}/doc/Makefile.in -post-install: +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} Modified: head/security/libp11/pkg-plist ============================================================================== --- head/security/libp11/pkg-plist Thu Sep 3 12:56:30 2015 (r395949) +++ head/security/libp11/pkg-plist Thu Sep 3 12:57:12 2015 (r395950) @@ -4,8 +4,8 @@ lib/libp11.so lib/libp11.so.2 lib/libp11.so.2.2.0 libdata/pkgconfig/libp11.pc -%%EXAMPLESDIR%%/Makefile -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/auth.c -%%EXAMPLESDIR%%/decrypt.c -%%EXAMPLESDIR%%/getrandom.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/decrypt.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getrandom.c