From owner-svn-ports-all@FreeBSD.ORG  Sat Apr 12 20:38:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 882AEF27;
 Sat, 12 Apr 2014 20:38:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 742031C29;
 Sat, 12 Apr 2014 20:38:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CKceBo030576;
 Sat, 12 Apr 2014 20:38:40 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CKcelH030575;
 Sat, 12 Apr 2014 20:38:40 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404122038.s3CKcelH030575@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 12 Apr 2014 20:38:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351131 - head/textproc/docbook-xml
X-SVN-Group: ports-head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 20:38:40 -0000

Author: antoine
Date: Sat Apr 12 20:38:39 2014
New Revision: 351131
URL: http://svnweb.freebsd.org/changeset/ports/351131
QAT: https://qat.redports.org/buildarchive/r351131/

Log:
  Do not add 4.1.2/docbook.cat to catalog
  This fixes docbook2man at runtime and unbreaks gnome-packagekit build
  
  Silence from:	doceng
  Reported by:	pkg-fallout since several weeks
  With hat:	portmgr

Modified:
  head/textproc/docbook-xml/Makefile

Modified: head/textproc/docbook-xml/Makefile
==============================================================================
--- head/textproc/docbook-xml/Makefile	Sat Apr 12 20:04:19 2014	(r351130)
+++ head/textproc/docbook-xml/Makefile	Sat Apr 12 20:38:39 2014	(r351131)
@@ -2,7 +2,7 @@
 
 PORTNAME=	docbook
 PORTVERSION=	5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${DBFILES:C,(.*):(.*),http://www.docbook.org/xml/\1/:\2,:C,:docbook-xml-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,:C,:docbook-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,}
 PKGNAMESUFFIX=	-xml
@@ -57,7 +57,7 @@ do-install-${D:S/./_/g}:
 	    ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DBKDIR}/$D
 	${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \
 	    add nextCatalog "${PREFIX}/${DBKDIR}/$D/catalog.xml"
-	test "$D" = 5.0 || \
+	test "$D" = 5.0 || test "$D" = 4.1.2 || \
 	    ${ECHO_CMD} "CATALOG \"${PREFIX}/${DBKDIR}/$D/docbook.cat\"" \
 	    >> ${STAGEDIR}${DBCAT_SGML}
 do-install: do-install-${D:S/./_/g}