Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Aug 2015 21:48:32 +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: r395731 - head/devel/liblouisxml
Message-ID:  <201508312148.t7VLmWZ4011251@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Aug 31 21:48:31 2015
New Revision: 395731
URL: https://svnweb.freebsd.org/changeset/ports/395731

Log:
  - Clarify license (GPL for tools, LGPL for lib)
  - Pet portlint
  - Switch to options helpers
  - Fix install commands
  
  Approved by:	portmgr blanket

Modified:
  head/devel/liblouisxml/Makefile

Modified: head/devel/liblouisxml/Makefile
==============================================================================
--- head/devel/liblouisxml/Makefile	Mon Aug 31 21:28:55 2015	(r395730)
+++ head/devel/liblouisxml/Makefile	Mon Aug 31 21:48:31 2015	(r395731)
@@ -10,13 +10,14 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library Provide Complete Braille Transcription Services
 
-LICENSE=	GPLv3
+LICENSE=	LGPL3 GPLv3 # or later
+LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	liblouis.so:${PORTSDIR}/devel/liblouis
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake libtool
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 USE_GCC=	yes
@@ -25,8 +26,6 @@ INFO=		liblouisxml
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${REINPLACE_CMD} -e \
 		's#@libdir@#${PREFIX}/libdata#g' ${WRKSRC}/Makefile.in
@@ -37,12 +36,12 @@ post-build:
 .endfor
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/liblouisxml.info ${STAGEDIR}${PREFIX}/info
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in liblouisxml.html liblouisxml.txt
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
-.endif
-	${INSTALL_MAN} ${WRKSRC}/doc/liblouisxml.info ${STAGEDIR}${PREFIX}/info
 
 .include <bsd.port.mk>



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