svn commit: r406115 - head/textproc/s5

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Jan 14 13:34:43 2016
New Revision: 406115
URL: https://svnweb.freebsd.org/changeset/ports/406115

Log:
  - Add PD license along with BSD2CLAUSE. Different files mention either of them [1]
  - Add NO_ARCH
  - Silence patching
  - Fix manpage installation
  
  PR:		204638 [1]
  Submitted by:	george at nycbug.org

Modified:
  head/textproc/s5/Makefile

Modified: head/textproc/s5/Makefile
==============================================================================
--- head/textproc/s5/Makefile	Thu Jan 14 13:07:29 2016	(r406114)
+++ head/textproc/s5/Makefile	Thu Jan 14 13:34:43 2016	(r406115)
@@ -11,7 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Simple HTML-based presentation system
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD2CLAUSE PD
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -19,21 +20,22 @@ USES=		dos2unix zip
 DOS2UNIX_REGEX=	.*\.(css|htc|html|js|txt)
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 S5_DIR=		${PREFIX}/share/${PORTNAME}
 S5_SUBDIRS=	pix primer s5-blank ui
 
 post-extract:
-	cd ${WRKSRC} && ${TAR} -xf s5-blank.zip
-	${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.sh > ${WRKDIR}/s5
-	${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.1 > ${WRKDIR}/s5.1
-	${FIND} ${WRKDIR} -type f -name .DS_Store -delete
+	@cd ${WRKSRC} && ${TAR} -xf s5-blank.zip
+	@${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.sh > ${WRKDIR}/s5
+	@${SED} -e "s,/usr/local,${PREFIX}," ${FILESDIR}/s5.1 > ${WRKDIR}/s5.1
+	@${FIND} ${WRKDIR} -type f -name .DS_Store -delete
 
 do-install:
-	${MKDIR} ${STAGEDIR}${S5_DIR}
-	(cd ${WRKDIR} && \
+	@${MKDIR} ${STAGEDIR}${S5_DIR}
+	@(cd ${WRKDIR} && \
 		${COPYTREE_SHARE} "*.html ${S5_SUBDIRS}" ${STAGEDIR}${S5_DIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/s5 ${STAGEDIR}${PREFIX}/bin/s5
-	${INSTALL_DATA} ${WRKDIR}/s5.1 ${STAGEDIR}${PREFIX}/man/man1/s5.1
+	${INSTALL_MAN} ${WRKDIR}/s5.1 ${STAGEDIR}${MANPREFIX}/man/man1/s5.1
 
 .include <bsd.port.mk>