Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
textproc/mdocml/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.42 2014/01/06 17:43:50 tez Exp $
# $NetBSD: Makefile,v 1.49 2015/03/26 14:16:12 sevan Exp $
DISTNAME= mdocml-1.12.3
DISTNAME= mdocml-1.13.3
PKGREVISION= 1
CATEGORIES= textproc devel
MASTER_SITES= http://mdocml.bsd.lv/snapshots/
@@ -10,7 +10,7 @@ HOMEPAGE= http://mdocml.bsd.lv/
COMMENT= Convert man pages from mdoc, man, and tbl to txt, html, ps, or pdf
LICENSE= 2-clause-bsd # not exactly, but near enough
MAKE_FLAGS+= PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q}
HAS_CONFIGURE= yes
CONFLICTS= man-pages-[0-9]*
@@ -22,13 +22,21 @@ SUBST_SED.roff= -e 's,Xr roff,Xr mandoc-roff,g'
.include "../../mk/bsd.fast.prefs.mk"
post-extract:
${ECHO} PREFIX=${PREFIX} > ${WRKSRC}/configure.local
${ECHO} MANDIR=${PREFIX}/${PKGMANDIR} >> ${WRKSRC}/configure.local
${ECHO} CFLAGS=\"${CFLAGS:Q}\" >> ${WRKSRC}/configure.local
${ECHO} DBLIB=\"${LDFLAGS} -lsqlite3\" >> ${WRKSRC}/configure.local
${ECHO} INSTALL=\"${INSTALL:Q}\" >> ${WRKSRC}/configure.local
${ECHO} INSTALL_PROGRAM=\"${INSTALL_PROGRAM:Q}\" >> ${WRKSRC}/configure.local
${ECHO} INSTALL_LIB=\"${INSTALL_DATA:Q}\" >> ${WRKSRC}/configure.local
${ECHO} INSTALL_MAN=\"${INSTALL_MAN:Q}\" >> ${WRKSRC}/configure.local
${ECHO} INSTALL_DATA=\"${INSTALL_DATA:Q}\" >> ${WRKSRC}/configure.local
${ECHO} MANM_ROFF="mandoc-roff" >> ${WRKSRC}/configure.local
# Mac OS X and Solaris 10 and newer do not support static binaries.
.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
MAKE_FLAGS+= STATIC=
${ECHO} STATIC= >> ${WRKSRC}/configure.local
.endif
post-extract:
${CP} -p ${FILESDIR}/*.c ${WRKSRC}
.include "../../mk/bdb.buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

18
textproc/mdocml/PLIST
View File

@@ -1,20 +1,32 @@
@comment $NetBSD: PLIST,v 1.10 2014/03/19 21:48:54 wiz Exp $
@comment $NetBSD: PLIST,v 1.12 2014/12/13 15:52:53 wiz Exp $
bin/apropos
bin/demandoc
bin/man
bin/mandoc
bin/mandoc-preconv
bin/whatis
include/mandoc/man.h
include/mandoc/mandoc.h
include/mandoc/mandoc_aux.h
include/mandoc/mdoc.h
lib/mandoc/libmandoc.a
man/man1/apropos.1
man/man1/demandoc.1
man/man1/mandoc-preconv.1
man/man1/man.1
man/man1/mandoc.1
man/man1/whatis.1
man/man3/mandoc.3
man/man3/mandoc_escape.3
man/man3/mandoc_malloc.3
man/man3/mansearch.3
man/man3/mchars_alloc.3
man/man3/tbl.3
man/man5/mandoc.db.5
man/man7/eqn.7
man/man7/man.7
man/man7/mandoc-roff.7
man/man7/mandoc_char.7
man/man7/mdoc.7
man/man7/tbl.7
man/man8/makewhatis.8
sbin/makewhatis
share/examples/mandoc/example.style.css

15
textproc/mdocml/distinfo
View File

@@ -1,10 +1,7 @@
$NetBSD: distinfo,v 1.33 2014/01/06 17:43:50 tez Exp $
$NetBSD: distinfo,v 1.40 2015/03/26 19:59:53 sevan Exp $
SHA1 (mdocml-1.12.3.tar.gz) = 6a74b4e4b54a20b8022f05236e2294ad2915e5d7
RMD160 (mdocml-1.12.3.tar.gz) = 0a9a717ddf9d32c4ce1be8e51659932c5ccf2b8b
Size (mdocml-1.12.3.tar.gz) = 292544 bytes
SHA1 (patch-Makefile) = 569fdf24dff306c6c7222a3807e99d9ae1bb0ce6
SHA1 (patch-apropos__db.c) = efde1e020c84307e8549cf8b3e25668023fb4d34
SHA1 (patch-mdoc_validate.c) = 270d754613fa4f1e079cc047593d1eb05c9fc7a9
SHA1 (patch-preconv.1) = 92787c58f451e1d247a25bbe136f188bf42e4c73
SHA1 (patch-roff.7) = 9b6033b5ec92c8e8c827fe79aff30228f7c2fc2f
SHA1 (mdocml-1.13.3.tar.gz) = 3ccfbb492a477b84343c97de743b3dd5bd3c763b
RMD160 (mdocml-1.13.3.tar.gz) = 47d1096708b45b15d8f198404fd6608d164bb66a
Size (mdocml-1.13.3.tar.gz) = 358971 bytes
SHA1 (patch-compat_fts.c) = bc20484964d8ff0aa2af07d581bad39a6c056a5a
SHA1 (patch-roff.7) = 22335024f83abc347ca39aabf7ab8d9cb38f7db2

58
textproc/mdocml/files/strcasestr.c
View File

@@ -1,58 +0,0 @@
/* $NetBSD: strcasestr.c,v 1.1 2013/12/29 19:19:03 tron Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Chris Torek.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
/*
* Find the first occurrence of find in s, ignore case.
*/
char *
strcasestr(const char *s, const char *find)
{
char c, sc;
size_t len;
if ((c = *find++) != 0) {
c = tolower((unsigned char)c);
len = strlen(find);
do {
do {
if ((sc = *s++) == 0)
return (NULL);
} while ((char)tolower((unsigned char)sc) != c);
} while (strncasecmp(s, find, len) != 0);
s--;
}
return __UNCONST(s);
}

69
textproc/mdocml/files/strsep.c
View File

@@ -1,69 +0,0 @@
/* $NetBSD: strsep.c,v 1.1 2013/12/29 19:19:03 tron Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/*
* Get next token from string *stringp, where tokens are possibly-empty
* strings separated by characters from delim.
*
* Writes NULs into the string at *stringp to end tokens.
* delim need not remain constant from call to call.
* On return, *stringp points past the last NUL written (if there might
* be further tokens), or is NULL (if there are definitely no more tokens).
*
* If *stringp is NULL, strsep returns NULL.
*/
char *
strsep(char **stringp, const char *delim)
{
char *s;
const char *spanp;
int c, sc;
char *tok;
if ((s = *stringp) == NULL)
return (NULL);
for (tok = s;;) {
c = *s++;
spanp = delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else
s[-1] = 0;
*stringp = s;
return (tok);
}
} while (sc != 0);
}
/* NOTREACHED */
}

25
textproc/mdocml/patches/patch-Makefile
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-Makefile,v 1.6 2013/10/11 14:45:18 wiz Exp $
Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff.
--- Makefile.orig 2013-10-05 14:09:07.000000000 +0000
+++ Makefile
@@ -322,12 +322,15 @@ install: all
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
mkdir -p $(DESTDIR)$(MANDIR)/man7
- $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) preconv $(DESTDIR)$(BINDIR)/mandoc-preconv
$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
- $(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 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)
installcgi: all

21
textproc/mdocml/patches/patch-apropos__db.c
View File

@@ -1,21 +0,0 @@
$NetBSD: patch-apropos__db.c,v 1.4 2013/12/31 11:06:30 wiz Exp $
SunOS fix.
--- apropos_db.c.orig 2013-10-05 15:09:07.000000000 +0100
+++ apropos_db.c 2013-12-29 19:07:21.000000000 +0000
@@ -141,6 +146,14 @@
const struct expr *, size_t terms,
struct mchars *, int);
+#ifdef __sun
+#define strsep pkgsrc_strsep
+#define strcasestr pkgsrc_strcasestr
+
+#include "strsep.c"
+#include "strcasestr.c"
+#endif
+
/*
* Open the keyword mandoc-db database.
*/

17
textproc/mdocml/patches/patch-compat_fts.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-compat_fts.c,v 1.5 2015/03/26 19:59:53 sevan Exp $
Fix build under Solaris 10.
--- compat_fts.c.orig 2015-03-13 12:38:38.000000000 +0000
+++ compat_fts.c 2015-03-19 08:22:11.000000000 +0000
@@ -76,6 +76,10 @@
#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
+#ifdef __sun__
+#define dirfd(fd) ((fd)->dd_fd)
+#endif
+
FTS *
fts_open(char * const *argv, int options, void *dummy)
{

32
textproc/mdocml/patches/patch-mdoc_validate.c
View File

@@ -1,32 +0,0 @@
$NetBSD: patch-mdoc_validate.c,v 1.1 2014/01/06 17:43:50 tez Exp $
Solaris, Mingw32 & OS X prior to 10.7 are missing strnlen
--- mdoc_validate.c.orig Mon Jan 6 10:25:04 2014
+++ mdoc_validate.c Mon Jan 6 10:36:31 2014
@@ -1863,6 +1863,15 @@
return(1);
}
+#if defined(__MINGW32__) ||defined(__sun) || defined(__APPLE__)
+static size_t p_strnlen(const char *s, size_t maxlen) {
+ const char *end = memchr(s, 0, maxlen);
+ return end ? (size_t)(end - s) : maxlen;
+}
+#else
+ # define p_strnlen strnlen
+#endif
+
/*
* For some arguments of some macros,
* convert all breakable hyphens into ASCII_HYPH.
@@ -1893,7 +1902,7 @@
if (MDOC_TEXT != nch->type)
continue;
cp = nch->string;
- if (3 > strnlen(cp, 3))
+ if (3 > p_strnlen(cp, 3))
continue;
while ('\0' != *(++cp))
if ('-' == *cp &&

32
textproc/mdocml/patches/patch-preconv.1
View File

@@ -1,32 +0,0 @@
$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 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: July 13 2013 $
-.Dt PRECONV 1
+.Dt MANDOC-PRECONV 1
.Os
.Sh NAME
-.Nm preconv
+.Nm mandoc-preconv
.Nd recode multibyte UNIX manuals
.Sh SYNOPSIS
-.Nm preconv
+.Nm mandoc-preconv
.Op Fl D Ar enc
.Op Fl e Ar enc
.Op Ar file
@@ -122,7 +122,7 @@ Explicitly page a UTF\-8 manual
.Pa foo.1
in the current locale:
.Pp
-.Dl $ preconv \-e utf\-8 foo.1 | mandoc -Tlocale | less
+.Dl $ mandoc-preconv \-e utf\-8 foo.1 | mandoc -Tlocale | less
.\" .Sh DIAGNOSTICS
.\" For sections 1, 4, 6, 7, & 8 only.
.\" .Sh ERRORS

8
textproc/mdocml/patches/patch-roff.7
View File

@@ -1,13 +1,13 @@
$NetBSD: patch-roff.7,v 1.3 2013/12/31 11:06:30 wiz Exp $
$NetBSD: patch-roff.7,v 1.6 2015/03/14 10:24:38 wiz Exp $
Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff.
Install roff with 'mandoc-' prefix to avoid conflict with groff.
--- roff.7.orig 2013-12-28 23:28:23.000000000 +0000
--- roff.7.orig 2015-03-13 12:38:38.000000000 +0000
+++ roff.7
@@ -16,10 +16,10 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: December 26 2013 $
.Dd $Mdocdate: February 17 2015 $
-.Dt ROFF 7
+.Dt MANDOC-ROFF 7
.Os