diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile index c63a4a6233d5..24dc0e28c457 100644 --- a/textproc/mdocml/Makefile +++ b/textproc/mdocml/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.36 2013/09/15 13:03:27 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2013/10/05 14:48:15 wiz Exp $ -DISTNAME= mdocml-1.12.0 -PKGREVISION= 3 +DISTNAME= mdocml-1.12.2 CATEGORIES= textproc devel MASTER_SITES= http://mdocml.bsd.lv/snapshots/ diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST index cbb6e87193f5..798fef92fdb2 100644 --- a/textproc/mdocml/PLIST +++ b/textproc/mdocml/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2013/09/12 10:33:29 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.9 2013/10/05 14:48:15 wiz Exp $ bin/demandoc bin/mandoc bin/mandoc-preconv @@ -10,6 +10,7 @@ man/man1/demandoc.1 man/man1/mandoc.1 man/man1/mandoc-preconv.1 man/man3/mandoc.3 +man/man3/tbl.3 man/man7/eqn.7 man/man7/man.7 man/man7/mandoc_char.7 diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo index ee81b8774a45..35bdc0bc7aa6 100644 --- a/textproc/mdocml/distinfo +++ b/textproc/mdocml/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.27 2013/09/12 10:33:29 jperkin Exp $ +$NetBSD: distinfo,v 1.28 2013/10/05 14:48:15 wiz Exp $ -SHA1 (mdocml-1.12.0.tar.gz) = 7c2c1a23c0bba61d9fc4ee7dc5b47a0a07e0b981 -RMD160 (mdocml-1.12.0.tar.gz) = 3ea04c4b4639ae63ae924db3645f1712f149ec5b -Size (mdocml-1.12.0.tar.gz) = 236717 bytes -SHA1 (patch-Makefile) = 8bd03c7514c4c27635c0af93ce94a8310b3b824f -SHA1 (patch-apropos.c) = 7f87b36a20a6682a922e1c1ee7ca144be7f020ab -SHA1 (patch-mandocdb.c) = 2a0d1aacd3d8c2411e7d067df08151d57afae7ab -SHA1 (patch-preconv.1) = d2826262f96d89c3465246eab230b3a5d1f9dda2 -SHA1 (patch-roff.7) = d8479f3fd95146088af0bf5955aa3563ef50d160 +SHA1 (mdocml-1.12.2.tar.gz) = 6a86cc4f373bcc51aa8bf1a7499db368e977a166 +RMD160 (mdocml-1.12.2.tar.gz) = 8fcd1b9dd20b3a2eee9412d210e1b994c9ae7c17 +Size (mdocml-1.12.2.tar.gz) = 286400 bytes +SHA1 (patch-Makefile) = 30ae6393f1af5995735fb98c9bbfa53f22cdc0a8 +SHA1 (patch-preconv.1) = 92787c58f451e1d247a25bbe136f188bf42e4c73 +SHA1 (patch-roff.7) = a8daeae7e8e6c0117d499fb0c4a848d724b29b3e diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile index df7e07aaefd9..0aa08937b284 100644 --- a/textproc/mdocml/patches/patch-Makefile +++ b/textproc/mdocml/patches/patch-Makefile @@ -1,13 +1,13 @@ -$NetBSD: patch-Makefile,v 1.4 2013/09/12 10:33:29 jperkin Exp $ +$NetBSD: patch-Makefile,v 1.5 2013/10/05 14:48:15 wiz Exp $ Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff. ---- Makefile.orig 2011-10-08 20:07:21.000000000 +0000 +--- Makefile.orig 2013-09-29 23:34:34.000000000 +0000 +++ Makefile -@@ -392,12 +392,15 @@ install: all +@@ -321,12 +321,15 @@ install: all + mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man3 mkdir -p $(DESTDIR)$(MANDIR)/man7 - mkdir -p $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) preconv $(DESTDIR)$(BINDIR)/mandoc-preconv @@ -16,10 +16,10 @@ Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff. - $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) preconv.1 $(DESTDIR)$(MANDIR)/man1/mandoc-preconv.1 - $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 - $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_MAN) man.7 mdoc.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/mandoc-roff.7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) - installwww: www + installcgi: all diff --git a/textproc/mdocml/patches/patch-apropos.c b/textproc/mdocml/patches/patch-apropos.c deleted file mode 100644 index 38744678bbf8..000000000000 --- a/textproc/mdocml/patches/patch-apropos.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-apropos.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $ - ---- apropos.c.orig 2011-10-08 20:07:21.000000000 +0000 -+++ apropos.c -@@ -33,7 +33,7 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) || defined(__sun) - # include - #else - # include diff --git a/textproc/mdocml/patches/patch-mandocdb.c b/textproc/mdocml/patches/patch-mandocdb.c deleted file mode 100644 index 4ad582c6b869..000000000000 --- a/textproc/mdocml/patches/patch-mandocdb.c +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-mandocdb.c,v 1.2 2012/12/24 13:40:18 jperkin Exp $ - ---- mandocdb.c.orig 2011-10-08 20:07:22.000000000 +0000 -+++ mandocdb.c -@@ -29,12 +29,16 @@ - #include - #include - --#ifdef __linux__ -+#if defined(__linux__) || defined(__sun) - # include - #else - # include - #endif - -+#if defined(__sun) -+# include -+#endif -+ - #include "man.h" - #include "mdoc.h" - #include "mandoc.h" -@@ -1223,7 +1227,15 @@ ofile_dirbuild(const char *dir, int verb - - while (NULL != (dp = readdir(d))) { - fn = dp->d_name; -+#if defined(__sun) -+ struct stat s; -+ stat(dp->d_name, &s); -+#endif -+#if !defined(__sun) - if (DT_DIR == dp->d_type) { -+#else -+ if (!(s.st_mode & S_IFDIR)) { -+#endif - if (0 == strcmp(".", fn)) - continue; - if (0 == strcmp("..", fn)) -@@ -1244,7 +1256,11 @@ ofile_dirbuild(const char *dir, int verb - fprintf(stderr, "%s: Path too long\n", dir); - return(0); - } -+#if !defined(__sun) - if (DT_REG != dp->d_type) -+#else -+ if (!(s.st_mode & S_IFREG)) -+#endif - continue; - - if (0 == strcmp(MANDOC_DB, fn) || diff --git a/textproc/mdocml/patches/patch-preconv.1 b/textproc/mdocml/patches/patch-preconv.1 index 0378bb63f697..d0068e1113e4 100644 --- a/textproc/mdocml/patches/patch-preconv.1 +++ b/textproc/mdocml/patches/patch-preconv.1 @@ -1,13 +1,13 @@ -$NetBSD: patch-preconv.1,v 1.1 2013/09/12 10:33:29 jperkin Exp $ +$NetBSD: patch-preconv.1,v 1.2 2013/10/05 14:48:15 wiz Exp $ Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff. ---- preconv.1.orig 2011-10-08 20:07:22.000000000 +0000 +--- preconv.1.orig 2013-09-29 23:34:34.000000000 +0000 +++ preconv.1 @@ -15,13 +15,13 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" - .Dd $Mdocdate: August 18 2011 $ + .Dd $Mdocdate: July 13 2013 $ -.Dt PRECONV 1 +.Dt MANDOC-PRECONV 1 .Os @@ -21,7 +21,7 @@ Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff. .Op Fl D Ar enc .Op Fl e Ar enc .Op Ar file -@@ -126,7 +126,7 @@ Explicitly page a UTF\-8 manual +@@ -122,7 +122,7 @@ Explicitly page a UTF\-8 manual .Pa foo.1 in the current locale: .Pp diff --git a/textproc/mdocml/patches/patch-roff.7 b/textproc/mdocml/patches/patch-roff.7 index 42f51aac9ae4..676a12288633 100644 --- a/textproc/mdocml/patches/patch-roff.7 +++ b/textproc/mdocml/patches/patch-roff.7 @@ -1,13 +1,13 @@ -$NetBSD: patch-roff.7,v 1.1 2013/09/12 10:33:29 jperkin Exp $ +$NetBSD: patch-roff.7,v 1.2 2013/10/05 14:48:15 wiz Exp $ Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff. ---- roff.7.orig 2011-10-08 20:07:22.000000000 +0000 +--- roff.7.orig 2013-09-29 23:34:34.000000000 +0000 +++ roff.7 @@ -16,10 +16,10 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" - .Dd $Mdocdate: September 26 2011 $ + .Dd $Mdocdate: August 8 2013 $ -.Dt ROFF 7 +.Dt MANDOC-ROFF 7 .Os