Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Sep 2015 12:57:12 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r395950 - head/security/libp11
Message-ID:  <201509031257.t83CvCJq043713@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509031257.t83CvCJq043713>