Bug 117008 - [patch] textproc/docbook-410: fix weird catalog file
Summary: [patch] textproc/docbook-410: fix weird catalog file
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Gabor Kovesdan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-10-08 09:20 UTC by Gabor Kovesdan
Modified: 2007-11-20 20:50 UTC (History)
0 users

See Also:


Attachments
textproc-docbook-410.diff (4.59 KB, patch)
2007-10-08 09:20 UTC, Gabor Kovesdan
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gabor Kovesdan freebsd_committer freebsd_triage 2007-10-08 09:20:01 UTC
The catalog file that docbook-410 installs, contains the entity filenames
in a wrong way, textproc/iso8879 uses naming conventions like ISOlat1
instead on iso-lat1.gml, thus sgmlnorm drops errors when parsing an SGML
file from "-//OASIS//DTD DocBook V4.1//EN":

/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:54:0:E: cannot find "iso-amsa.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amsa.gml", "/usr/local/share/sgml/iso8879/iso-amsa.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:61:0:E: cannot find "iso-amsb.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amsb.gml", "/usr/local/share/sgml/iso8879/iso-amsb.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:68:0:E: cannot find "iso-amsc.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amsc.gml", "/usr/local/share/sgml/iso8879/iso-amsc.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:75:0:E: cannot find "iso-amsn.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amsn.gml", "/usr/local/share/sgml/iso8879/iso-amsn.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:82:0:E: cannot find "iso-amso.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amso.gml", "/usr/local/share/sgml/iso8879/iso-amso.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:89:0:E: cannot find "iso-amsr.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-amsr.gml", "/usr/local/share/sgml/iso8879/iso-amsr.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:96:0:E: cannot find "iso-box.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-box.gml", "/usr/local/share/sgml/iso8879/iso-box.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:103:0:E: cannot find "iso-cyr1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-cyr1.gml", "/usr/local/share/sgml/iso8879/iso-cyr1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:110:0:E: cannot find "iso-cyr2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-cyr2.gml", "/usr/local/share/sgml/iso8879/iso-cyr2.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:117:0:E: cannot find "iso-dia.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-dia.gml", "/usr/local/share/sgml/iso8879/iso-dia.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:124:0:E: cannot find "iso-grk1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-grk1.gml", "/usr/local/share/sgml/iso8879/iso-grk1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:131:0:E: cannot find "iso-grk2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-grk2.gml", "/usr/local/share/sgml/iso8879/iso-grk2.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:138:0:E: cannot find "iso-grk3.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-grk3.gml", "/usr/local/share/sgml/iso8879/iso-grk3.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:145:0:E: cannot find "iso-grk4.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-grk4.gml", "/usr/local/share/sgml/iso8879/iso-grk4.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:152:0:E: cannot find "iso-lat1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat1.gml", "/usr/local/share/sgml/iso8879/iso-lat1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:159:0:E: cannot find "iso-lat2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat2.gml", "/usr/local/share/sgml/iso8879/iso-lat2.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:166:0:E: cannot find "iso-num.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-num.gml", "/usr/local/share/sgml/iso8879/iso-num.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:173:0:E: cannot find "iso-pub.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-pub.gml", "/usr/local/share/sgml/iso8879/iso-pub.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/4.1/dbcent.mod:180:0:E: cannot find "iso-tech.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-tech.gml", "/usr/local/share/sgml/iso8879/iso-tech.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1bg.dsl:3:0:E: cannot find "iso-cyr1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-cyr1.gml", "/usr/local/share/sgml/iso8879/iso-cyr1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1no.dsl:3:0:E: cannot find "iso-lat1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat1.gml", "/usr/local/share/sgml/iso8879/iso-lat1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1ro.dsl:3:0:E: cannot find "iso-lat1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat1.gml", "/usr/local/share/sgml/iso8879/iso-lat1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1ro.dsl:5:0:E: cannot find "iso-lat2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat2.gml", "/usr/local/share/sgml/iso8879/iso-lat2.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1ru.dsl:3:0:E: cannot find "iso-cyr1.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-cyr1.gml", "/usr/local/share/sgml/iso8879/iso-cyr1.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1sl.dsl:3:0:E: cannot find "iso-lat2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat2.gml", "/usr/local/share/sgml/iso8879/iso-lat2.gml"
/usr/local/bin/jade:/usr/local/share/sgml/docbook/dsssl/modular/html/../common/../common/dbl1sr.dsl:3:0:E: cannot find "iso-lat2.gml"; tried "/usr/local/share/sgml/docbook/4.1/iso-lat2.gml", "/usr/local/share/sgml/iso8879/iso-lat2.gml"
*** Error code 1

The attached patch does the following:
 - Fix the catalog file
 - Bump PORTREVISION
 - Pet portlint(1)

Applying the patch completely solved the issue for me.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-10-08 09:20:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->murray

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Hiroki Sato freebsd_committer freebsd_triage 2007-10-08 10:51:47 UTC
----Security_Multipart0(Mon_Oct__8_18_51_47_2007_323)--
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Mon_Oct__8_18_51_47_2007_037)--"
Content-Transfer-Encoding: 7bit

----Next_Part(Mon_Oct__8_18_51_47_2007_037)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Gabor Kovesdan <gabor@freebsd.org> wrote
  in <20071008075735.D759FA4A7B6@server.t-hosting.hu>:

ga> -PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
(snip)
ga> +PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ISOdia"

 I think it is better to remove these entries because there is no ISO*
 file in the docbook/4.1 directory actually and iso8879/catalog is
 included in the last line that is added in the do-install target
 anyway.  Could you try the attached patch for files/catalog and let
 me know if it works or not?

--
| Hiroki SATO


----Next_Part(Mon_Oct__8_18_51_47_2007_037)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="catalog.diff"

Index: catalog
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-410/files/catalog,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -r1.2 catalog
--- catalog	31 Oct 2000 00:11:07 -0000	1.2
+++ catalog	8 Oct 2007 09:49:08 -0000
@@ -36,28 +36,5 @@
 PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
 PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"

-  -- ...................................................................... --
-  -- ISO entity sets ...................................................... --
-
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-
   -- End of catalog data for DocBook V4.1 ................................. --
   -- ...................................................................... --

----Next_Part(Mon_Oct__8_18_51_47_2007_037)----

----Security_Multipart0(Mon_Oct__8_18_51_47_2007_323)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQBHCf2zTyzT2CeTzy0RAuT0AKCElrfNvrAng9dAiWBRSp1ZvW5fJQCdHi2o
gUaVqL7qQerAaEUad8vAC8U=
=JIEk
-----END PGP SIGNATURE-----

----Security_Multipart0(Mon_Oct__8_18_51_47_2007_323)----
Comment 3 Gabor Kovesdan freebsd_committer freebsd_triage 2007-10-08 11:56:45 UTC
Yes, it works, too. I've regenerated the complete patch for the port:
http://kovesdan.org/patches/textproc-docbook-410.diff

Regards,

-- 
Gabor Kovesdan
FreeBSD Volunteer

EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org
WEB:   http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org
Comment 4 Hiroki Sato freebsd_committer freebsd_triage 2007-10-14 22:03:28 UTC
----Security_Multipart(Mon_Oct_15_06_03_28_2007_790)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Gabor Kovesdan <gabor@freebsd.org> wrote
  in <470A0CED.2020903@FreeBSD.org>:

ga> Yes, it works, too. I've regenerated the complete patch for the port:
ga> http://kovesdan.org/patches/textproc-docbook-410.diff

 Two more comments from me:

 * Simply removing the BUILD_DEPENDS line for unzip is enough
   USE_ZIP=yes implies EXTRACT_DEPENDS of it.

 * In pre-su-install, "[ -d dir ] || ${MKDIR}" is redundant:

-       @[ -d ${INSTDIR}/${PORTVERSION} ] || ${MKDIR} ${INSTDIR}/${PORTVERSION}
+       @${MKDIR} ${INSTDIR}/${PORTVERSION}

 Others look fine to me.  Murray, could you handle this PR or approve
 this patch?

--
| Hiroki SATO

----Security_Multipart(Mon_Oct_15_06_03_28_2007_790)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQBHEoQgTyzT2CeTzy0RAuXiAJ4tda9YU0cfW8K4KhQU/lzPG/EL8gCgjBxm
Y+cBw0nxwTa8j3qwr8Z31WA=
=0ZX5
-----END PGP SIGNATURE-----

----Security_Multipart(Mon_Oct_15_06_03_28_2007_790)----
Comment 5 dfilter service freebsd_committer freebsd_triage 2007-11-20 20:48:31 UTC
gabor       2007-11-20 20:48:26 UTC

  FreeBSD ports repository

  Modified files:
    textproc/docbook-410 Makefile 
    textproc/docbook-410/files catalog 
  Log:
  - Fix weird catalog file
  - Bump PORTREVISION
  - Pet portlint(1) and cosmetics
  
  PR:             ports/117008
  Submitted by:   gabor
  Reviewed by:    hrs
  Approved by:    portmgr (linimon), maintainer timeout (murray)
  
  Revision  Changes    Path
  1.12      +3 -4      ports/textproc/docbook-410/Makefile
  1.3       +0 -23     ports/textproc/docbook-410/files/catalog
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 6 Gabor Kovesdan freebsd_committer freebsd_triage 2007-11-20 20:48:44 UTC
State Changed
From-To: open->closed
Comment 7 Gabor Kovesdan freebsd_committer freebsd_triage 2007-11-20 20:48:44 UTC
Responsible Changed
From-To: murray->gabor

Track.