Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Sep 2015 12:56:31 +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: r395949 - head/security/libgringotts
Message-ID:  <201509031256.t83CuVTH043533@repo.freebsd.org>

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

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



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