Bug 182648
| Summary: | [PATCH] textproc/docbook-xml Revert r284943 for docbook-xml to fix install | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Chris Rees <crees> |
| Component: | Individual Port(s) | Assignee: | Jun Kuriyama <kuriyama> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-ports-bugs->kuriyama Over to maintainer (via the GNATS Auto Assign Tool) Author: crees Date: Sun Oct 6 12:34:47 2013 New Revision: 329556 URL: http://svnweb.freebsd.org/changeset/ports/329556 Log: Partially revert r284943 to enable building with base unzip. The better solution would be to do the extraction in the do-extract section. PR: ports/182648 Submitted by: ports/182022 Approved by: maintainer timeout (kuriyama, 4 weeks) Modified: head/textproc/docbook-xml/Makefile Modified: head/textproc/docbook-xml/Makefile ============================================================================== --- head/textproc/docbook-xml/Makefile Sun Oct 6 12:34:35 2013 (r329555) +++ head/textproc/docbook-xml/Makefile Sun Oct 6 12:34:47 2013 (r329556) @@ -33,7 +33,7 @@ pre-su-install: @[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent do-install: - for file in `${UNZIP_CMD} -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \ + for file in `unzip -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCBOOKDIR}/$$file; \ done _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" State Changed From-To: open->closed Oops, duplicated my own PR (ports/182022). |
Unfortunately, replacing unzip with ${UNZIP_CMD} causes install to fail when dependencies are deinstalled before the stage, i.e. USE_ZIP is not effective during the do-install phase. http://www.bayofrum.net/medusa/tinderlogs/10i386-local-20130830203915/docbook-xml-4.2_1.log Unzip is in all supported versions of FreeBSD anyway. Fix: -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.--6tUcLVA4hHksbtSbw0vJjrW7xZJBKNGG2jhDj2OqSHHekfgt Content-Type: text/plain; name="docbook-xml-unzip.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="docbook-xml-unzip.diff" Index: Makefile =================================================================== --- Makefile (revision 329372) +++ Makefile (working copy) @@ -33,7 +33,7 @@ @[ -d ${DOCBOOKDIR}/ent ] || ${MKDIR} ${DOCBOOKDIR}/ent do-install: - for file in `${UNZIP_CMD} -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \ + for file in `unzip -l ${DISTDIR}/${DISTFILES}|${AWK} '/:[0-9].*[^\/]$$/{print $$4}'`; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCBOOKDIR}/$$file; \ done