aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/docbook-sk/Makefile9
-rw-r--r--textproc/docbook-sk/distinfo2
-rw-r--r--textproc/docbook-sk/pkg-plist7
-rw-r--r--textproc/docbook-xml/Makefile9
-rw-r--r--textproc/docbook-xml/distinfo2
-rw-r--r--textproc/docbook-xml/pkg-plist7
6 files changed, 14 insertions, 22 deletions
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index d67da193aa6c..be934b84e5f5 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -5,13 +5,10 @@
# $FreeBSD$
#
-PORTNAME= docbook
-PKGNAMESUFFIX= -xml
-PORTVERSION= 4.1.2
-PORTREVISION= 1
+PORTNAME= docbook-xml
+PORTVERSION= 4.2
CATEGORIES= textproc
MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/
-DISTNAME= docbkx412
MAINTAINER= kuriyama@FreeBSD.org
@@ -23,7 +20,7 @@ NO_WRKSUBDIR= YES
PLIST_SUB= DTD_VERSION=${PORTVERSION} \
MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
-DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME}/${PORTVERSION}
+DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION}
MKCATALOG= ${LOCALBASE}/sbin/mkcatalog
CATALOG= ${PREFIX}/share/xml/catalog
diff --git a/textproc/docbook-sk/distinfo b/textproc/docbook-sk/distinfo
index 37f37c5382d2..52b540513415 100644
--- a/textproc/docbook-sk/distinfo
+++ b/textproc/docbook-sk/distinfo
@@ -1 +1 @@
-MD5 (docbkx412.zip) = 900d7609fb7e6d78901b357e4acfbc17
+MD5 (docbook-xml-4.2.zip) = 73fe50dfe74ca631c1602f558ed8961f
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index c86be1b41305..6195f7d07bf3 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -1,7 +1,7 @@
-share/xml/docbook/%%DTD_VERSION%%/40chg.txt
-share/xml/docbook/%%DTD_VERSION%%/41chg.txt
share/xml/docbook/%%DTD_VERSION%%/ChangeLog
+share/xml/docbook/%%DTD_VERSION%%/README
share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
+share/xml/docbook/%%DTD_VERSION%%/catalog.xml
share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
@@ -30,8 +30,7 @@ share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat2.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-num.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-pub.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-tech.ent
-share/xml/docbook/%%DTD_VERSION%%/readme.txt
share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
@dirrm share/xml/docbook/%%DTD_VERSION%%/ent
@dirrm share/xml/docbook/%%DTD_VERSION%%
-@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
+@dirrm share/xml/docbook
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index d67da193aa6c..be934b84e5f5 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -5,13 +5,10 @@
# $FreeBSD$
#
-PORTNAME= docbook
-PKGNAMESUFFIX= -xml
-PORTVERSION= 4.1.2
-PORTREVISION= 1
+PORTNAME= docbook-xml
+PORTVERSION= 4.2
CATEGORIES= textproc
MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/
-DISTNAME= docbkx412
MAINTAINER= kuriyama@FreeBSD.org
@@ -23,7 +20,7 @@ NO_WRKSUBDIR= YES
PLIST_SUB= DTD_VERSION=${PORTVERSION} \
MKCATALOG=${MKCATALOG} CATALOG=${CATALOG}
-DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME}/${PORTVERSION}
+DOCBOOKDIR= ${PREFIX}/share/xml/${PORTNAME:S/-xml//}/${PORTVERSION}
MKCATALOG= ${LOCALBASE}/sbin/mkcatalog
CATALOG= ${PREFIX}/share/xml/catalog
diff --git a/textproc/docbook-xml/distinfo b/textproc/docbook-xml/distinfo
index 37f37c5382d2..52b540513415 100644
--- a/textproc/docbook-xml/distinfo
+++ b/textproc/docbook-xml/distinfo
@@ -1 +1 @@
-MD5 (docbkx412.zip) = 900d7609fb7e6d78901b357e4acfbc17
+MD5 (docbook-xml-4.2.zip) = 73fe50dfe74ca631c1602f558ed8961f
diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist
index c86be1b41305..6195f7d07bf3 100644
--- a/textproc/docbook-xml/pkg-plist
+++ b/textproc/docbook-xml/pkg-plist
@@ -1,7 +1,7 @@
-share/xml/docbook/%%DTD_VERSION%%/40chg.txt
-share/xml/docbook/%%DTD_VERSION%%/41chg.txt
share/xml/docbook/%%DTD_VERSION%%/ChangeLog
+share/xml/docbook/%%DTD_VERSION%%/README
share/xml/docbook/%%DTD_VERSION%%/calstblx.dtd
+share/xml/docbook/%%DTD_VERSION%%/catalog.xml
share/xml/docbook/%%DTD_VERSION%%/dbcentx.mod
share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
@@ -30,8 +30,7 @@ share/xml/docbook/%%DTD_VERSION%%/ent/iso-lat2.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-num.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-pub.ent
share/xml/docbook/%%DTD_VERSION%%/ent/iso-tech.ent
-share/xml/docbook/%%DTD_VERSION%%/readme.txt
share/xml/docbook/%%DTD_VERSION%%/soextblx.dtd
@dirrm share/xml/docbook/%%DTD_VERSION%%/ent
@dirrm share/xml/docbook/%%DTD_VERSION%%
-@unexec rmdir %D/share/xml/docbook 2>/dev/null || true
+@dirrm share/xml/docbook