ports/126346: [patch] textproc/docbook improvements

[Gabor Kovesdan]

>Number:         126346
>Category:       ports
>Synopsis:       [patch] textproc/docbook improvements
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 07 19:00:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Kovesdan
>Release:        
>Organization:
>Environment:
>Description:
	- Add DocBook 5
	- Add XML character entities
	- Rename option for SGML character entities to be more descriptive
	- Sort option in a more logical way
	- Bump PORTVERSION
>How-To-Repeat:
>Fix:

--- docbook.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/docbook/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	15 Jan 2007 15:11:11 -0000	1.22
+++ Makefile	7 Aug 2008 18:13:25 -0000
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	docbook
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	textproc
 MASTER_SITES=	#
 DISTFILES=	#
@@ -23,14 +23,16 @@
 		DB31 "DocBook SGML DTD 3.1" on \
 		DB40 "DocBook SGML DTD 4.0" on \
 		DB41 "DocBook SGML DTD 4.1" on \
-		DB41_XML "DocBook XML DTD 4.1" off \
 		DB42 "DocBook SGML DTD 4.2" off \
+		DB41_XML "DocBook XML DTD 4.1" off \
 		DB42_XML "DocBook XML DTD 4.2" on \
 		DB43_XML "DocBook XML DTD 4.3" off \
 		DB44_XML "DocBook XML DTD 4.4" off \
 		DB45_XML "DocBook XML DTD 4.5" off \
-		ISO8879 "ISO 8879:1986 character entity sets (SGML)" on \
-		SDB_XML "Simplified DocBook XML DTD" off
+		DB50_XML "DocBook XML 5.0 distribution" on \
+		SDB_XML "Simplified DocBook XML DTD" off \
+		SGMLCHARENT "ISO 8879:1986 character entity sets (SGML)" on \
+		XMLCHARENT "ISO 8879:1986 character entity sets (XML)" on
 
 .include <bsd.port.pre.mk>
 
@@ -54,14 +56,14 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
 .endif
 
-.if defined(WITH_DB41_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
-.endif
-
 .if defined(WITH_DB42)
 RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420
 .endif
 
+.if defined(WITH_DB41_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+.endif
+
 .if defined(WITH_DB42_XML)
 RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
 .endif
@@ -78,14 +80,22 @@
 RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
 .endif
 
-.if defined(WITH_ISO8879)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
+.if defined(WITH_DB50_XML)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-500
 .endif
 
 .if defined(WITH_SDB_XML)
 RUN_DEPENDS+=	${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
 .endif
 
+.if defined(WITH_SGMLCHARENT)
+RUN_DEPENDS+=	${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
+.endif
+
+.if defined(WITH_XMLCHARENT)
+RUN_DEPENDS+=	${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
+.endif
+
 do-install:
 	@${DO_NADA}
 
--- docbook.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: