From owner-svn-ports-all@freebsd.org Wed Nov 13 23:25:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 418B81BF594; Wed, 13 Nov 2019 23:25:37 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47D11r5Z9Cz4B1c; Wed, 13 Nov 2019 23:25:36 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 425351F75B; Wed, 13 Nov 2019 23:25:36 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xADNPZjZ033432; Wed, 13 Nov 2019 23:25:35 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xADNPZXY033430; Wed, 13 Nov 2019 23:25:35 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201911132325.xADNPZXY033430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 13 Nov 2019 23:25:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517416 - in head/textproc/docbook-xsl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/textproc/docbook-xsl: . files X-SVN-Commit-Revision: 517416 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2019 23:25:37 -0000 Author: sunpoet Date: Wed Nov 13 23:25:35 2019 New Revision: 517416 URL: https://svnweb.freebsd.org/changeset/ports/517416 Log: Convert unconditional EXTRA_PATCHES to normal patch file Added: head/textproc/docbook-xsl/files/patch-lib-lib.xsl - copied, changed from r517415, head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch Deleted: head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch Modified: head/textproc/docbook-xsl/Makefile Modified: head/textproc/docbook-xsl/Makefile ============================================================================== --- head/textproc/docbook-xsl/Makefile Wed Nov 13 23:25:29 2019 (r517415) +++ head/textproc/docbook-xsl/Makefile Wed Nov 13 23:25:35 2019 (r517416) @@ -5,8 +5,8 @@ PORTVERSION= 1.79.1 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc -MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION}:src \ - SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc +MASTER_SITES= SF/docbook/docbook-xsl/${PORTVERSION}:src \ + SF/docbook/docbook-xsl-doc/${PORTVERSION}:doc DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src MAINTAINER= sunpoet@FreeBSD.org @@ -19,8 +19,6 @@ BUILD_DEPENDS= xmlcatmgr:textproc/xmlcatmgr RUN_DEPENDS= docbook>=0:textproc/docbook \ xmlcatmgr:textproc/xmlcatmgr -EXTRA_PATCHES= ${PATCHDIR}/docbook-style-xsl-non-recursive-string-subst.patch:-p2 - USES= tar:bzip2 NO_ARCH= yes @@ -55,7 +53,7 @@ TOOLS_DESC= Tools WEBSITE_DESC= Website modules XHTML11_DESC= XHTML 1.1 modules -DOCS_DISTFILES= ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc +DOCS_DISTFILES= docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc ECLIPSE_VARS= MODULES+=eclipse EPUB_VARS= MODULES+=epub @@ -108,7 +106,7 @@ do-install-DOCS-on: .if defined(MAINTAINER_MODE) DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \ - ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc + docbook-xsl-doc-${PORTVERSION}${EXTRACT_SUFX}:doc .endif .include Copied and modified: head/textproc/docbook-xsl/files/patch-lib-lib.xsl (from r517415, head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch) ============================================================================== --- head/textproc/docbook-xsl/files/docbook-style-xsl-non-recursive-string-subst.patch Wed Nov 13 23:25:29 2019 (r517415, copy source) +++ head/textproc/docbook-xsl/files/patch-lib-lib.xsl Wed Nov 13 23:25:35 2019 (r517416) @@ -4,8 +4,8 @@ Description: use EXSLT "replace" function when availab Author: Peter De Wachter Bug-Debian: https://bugs.debian.org/750593 ---- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl -+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl +--- lib/lib.xsl.orig 2013-09-04 18:09:43 UTC ++++ lib/lib.xsl @@ -10,7 +10,10 @@ This module implements DTD-independent functions