svn commit: r437342 - head/devel/gnulib

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri Mar 31 09:02:07 UTC 2017


Author: amdmi3
Date: Fri Mar 31 09:02:06 2017
New Revision: 437342
URL: https://svnweb.freebsd.org/changeset/ports/437342

Log:
  - Add LICENSE
  - Simplify installation
  - Switch to options helpers

Modified:
  head/devel/gnulib/Makefile

Modified: head/devel/gnulib/Makefile
==============================================================================
--- head/devel/gnulib/Makefile	Fri Mar 31 07:33:32 2017	(r437341)
+++ head/devel/gnulib/Makefile	Fri Mar 31 09:02:06 2017	(r437342)
@@ -9,6 +9,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-sta
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	GNU portability library
 
+LICENSE=	GPLv2+ GPLv3+ LGPL20+ LGPL3+ PD
+LICENSE_COMB=	multi
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 USES=		gmake perl5 shebangfix
@@ -22,7 +25,7 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's/date -u.*/stat -f %Sa -t "@set UPDATED %F %T" `ls -t $$^ | sed 1q` > $$@/' \
+	@${REINPLACE_CMD} -e 's,date -u.*,stat -f %Sa -t "@set UPDATED %F %T" `${LS} -t $$^ | ${SED} 1q` > $$@,' \
 		-e 's: makeinfo$$: ${LOCALBASE}/bin/makeinfo:' \
 		${WRKSRC}/doc/Makefile
 
@@ -31,16 +34,16 @@ do-build:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
-	for p in check-module gnulib-tool;\
-		do ${INSTALL_SCRIPT} ${WRKSRC}/$$p ${STAGEDIR}${DATADIR};\
-			cd ${STAGEDIR}${PREFIX}/bin;\
-			${LN} -s ../${DATADIR_REL}/$$p;\
-		done
+.for p in check-module gnulib-tool
+	${INSTALL_SCRIPT} ${WRKSRC}/${p} ${STAGEDIR}${DATADIR}/
+	${LN} -s ../${DATADIR_REL}/${p} ${STAGEDIR}${PREFIX}/bin/
+.endfor
 	${TAR} -cf - -C ${WRKSRC} build-aux config doc lib m4 modules \
 		tests top | ${TAR} -xof - -C ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/gnulib.info \
-		${STAGEDIR}${PREFIX}/${INFO_PATH}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/gnulib.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gnulib.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list