From owner-svn-ports-all@freebsd.org Thu Sep 3 12:56:31 2015 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 CE0D89C8777; Thu, 3 Sep 2015 12:56:31 +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 A4B59D52; Thu, 3 Sep 2015 12:56:31 +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 t83CuVXd043535; Thu, 3 Sep 2015 12:56:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83CuVTH043533; Thu, 3 Sep 2015 12:56:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509031256.t83CuVTH043533@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:56:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395949 - head/security/libgringotts 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.20 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, 03 Sep 2015 12:56:31 -0000 Author: amdmi3 Date: Thu Sep 3 12:56:30 2015 New Revision: 395949 URL: https://svnweb.freebsd.org/changeset/ports/395949 Log: - Switch to options helpers - Use %%DOCSDIR%% Modified: head/security/libgringotts/Makefile head/security/libgringotts/pkg-plist Modified: head/security/libgringotts/Makefile ============================================================================== --- head/security/libgringotts/Makefile Thu Sep 3 12:14:25 2015 (r395948) +++ head/security/libgringotts/Makefile Thu Sep 3 12:56:30 2015 (r395949) @@ -20,23 +20,20 @@ USES= tar:bzip2 libtool GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS+= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig +CONFIGURE_ARGS= --with-pkg-config-files=${PREFIX}/libdata/pkgconfig INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS -.include - post-patch: @${REINPLACE_CMD} -e "s|md5sum|md5|g" ${WRKSRC}/Makefile.in -pre-install: -.if ${PORT_OPTIONS:MDOCS} +pre-install-DOCS-on: @${REINPLACE_CMD} -E "s|^(libgringottsdocdir =).*|\1 $$\(datadir\)/doc/libgringotts|" ${WRKSRC}/docs/Makefile ${WRKSRC}/Makefile -.else + +pre-install-DOCS-off: @${REINPLACE_CMD} -E -e "s|^(SUBDIRS =.*) docs|\1|" ${WRKSRC}/Makefile @${REINPLACE_CMD} -E -e "s|^(install-data-am:.*)install-libgringottsdocDATA|\1|" ${WRKSRC}/Makefile -.endif .include Modified: head/security/libgringotts/pkg-plist ============================================================================== --- head/security/libgringotts/pkg-plist Thu Sep 3 12:14:25 2015 (r395948) +++ head/security/libgringotts/pkg-plist Thu Sep 3 12:56:30 2015 (r395949) @@ -4,10 +4,10 @@ lib/libgringotts.so lib/libgringotts.so.2 lib/libgringotts.so.2.0.7 libdata/pkgconfig/libgringotts.pc -%%PORTDOCS%%share/doc/libgringotts/AUTHORS -%%PORTDOCS%%share/doc/libgringotts/COPYING -%%PORTDOCS%%share/doc/libgringotts/ChangeLog -%%PORTDOCS%%share/doc/libgringotts/NEWS -%%PORTDOCS%%share/doc/libgringotts/README -%%PORTDOCS%%share/doc/libgringotts/TODO -%%PORTDOCS%%share/doc/libgringotts/manual.htm +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/manual.htm