From owner-svn-ports-head@freebsd.org Thu Jan 14 13:34:45 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B800A8112B; Thu, 14 Jan 2016 13:34:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B56713A5; Thu, 14 Jan 2016 13:34:45 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EDYhOp005808; Thu, 14 Jan 2016 13:34:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EDYh9o005807; Thu, 14 Jan 2016 13:34:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201601141334.u0EDYh9o005807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 14 Jan 2016 13:34:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406115 - head/textproc/s5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2016 13:34:45 -0000 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@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@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