Re: net/openvpn_bsdauth, was: mandoc errors in ports

2010-04-05 Thread Felix Kronlage
On Sat, Apr 03, 2010 at 09:16:23PM +0200, Ingo Schwarze wrote:

Hi,

  net/openvpn_bsdauth
openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
scope of Xo
 At least on a short time scale, mandoc(1) will not be able to cope
 with block nesting errors like the Oo Xo Oc Xc here.
 In the case at hand, there is no need for explicit blocks at all,
 so i suggest to commit this and also push it upstream:
 OK?

well, since Tamas (the author of the plugin) only serves OpenBSD
with this software, I think it would be better to have the change
done upstream.

felix

(diff from schwarze@)


diff -Nup /var/empty/patch-openvpn_bsdauth_8 patches/patch-openvpn_bsdauth_8
--- /var/empty/patch-openvpn_bsdauth_8  Thu Jan  1 01:00:00 1970
+++ patches/patch-openvpn_bsdauth_8 Sat Apr  3 21:03:15 2010
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- openvpn_bsdauth.8.orig Sat Apr  3 20:58:49 2010
 openvpn_bsdauth.8  Sat Apr  3 21:01:27 2010
+@@ -19,7 +19,7 @@
+ .Nd Authenticate users for OpenVPN
+ .Sh SYNOPSYS
+ .Nm
+-.Oo Xo Ar file Oc Xc
++.Op Ar file
+ .Sh DESCRIPTION
+ .Nm
+ is invoked by OpenVPN to authenticate a user by checking a username and a
Index: Makefile
===
RCS file: /cvs/ports/net/openvpn_bsdauth/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile30 Dec 2009 01:11:05 -  1.3
+++ Makefile3 Apr 2010 19:07:42 -
@@ -3,6 +3,7 @@
 COMMENT =  BSD Auth helper program for OpenVPN
 
 DISTNAME = openvpn_bsdauth-5
+PKGNAME =  ${DISTNAME}p0
 CATEGORIES =   net
 HOMEPAGE = http://www.wormhole.hu/~ice/openvpn_bsdauth/
 

-- 
GPG/PGP:   D9AC74D0 / 076E 1E87 3E05 1C7F B1A0  8A48 0D31 9BD3 D9AC 74D0
http://hazardous.org/~fkr - f...@silc|irc  -  @felixkronlage  -  FKR-RIPE
https://www.bytemine.net/ - bytemine - BSD based Hosting/Solutions/Ideas



Re: net/openvpn_bsdauth, was: mandoc errors in ports

2010-04-05 Thread Tamas TEVESZ
On Mon, 5 Apr 2010, Felix Kronlage wrote:

net/openvpn_bsdauth
  openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
  scope of Xo
   At least on a short time scale, mandoc(1) will not be able to cope
   with block nesting errors like the Oo Xo Oc Xc here.
   In the case at hand, there is no need for explicit blocks at all,
   so i suggest to commit this and also push it upstream:
   OK?
  
  well, since Tamas (the author of the plugin) only serves OpenBSD
  with this software, I think it would be better to have the change
  done upstream.

ja, ja. i have a new revision ready fixing an embarrassing typo 
anyway, so let me just sort this out with fkr in a week or so, if it 
can wait that.

-- 
[-]

mkdir /nonexistent



Re: mandoc errors in ports

2010-04-04 Thread Marc Espie
On Sat, Apr 03, 2010 at 02:40:23PM +0200, Ingo Schwarze wrote:
 Nicholas Marriott wrote on Sat, Apr 03, 2010 at 08:10:47AM +0100:
 
  mandoc doesn't understand Spanish, it expects NAME not NOMBRE.
 
 In the long run, we might or might not consider adding proper support
 for section names in national languages.  For some sections, it makes
 a difference because some macros behave differently in some sections.
 
 For now, just treating section names in national languages as custom
 sections is probably the way to go (see the patch it sent out).

I would tend to disagree. Please consider adding section names in national
languages. makewhatis already does so, it's completely harmless.

Formated.pm:if 
(m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
 {

(the too last weird sequences correspond to namae in japanese common codings,
SJIS and EUC if memory serves).



Re: mandoc errors in ports

2010-04-04 Thread Ingo Schwarze
Hi Marc,

Marc Espie wrote on Sun, Apr 04, 2010 at 04:34:53PM +0200:
 On Sat, Apr 03, 2010 at 02:40:23PM +0200, Ingo Schwarze wrote:
 Nicholas Marriott wrote on Sat, Apr 03, 2010 at 08:10:47AM +0100:

 mandoc doesn't understand Spanish, it expects NAME not NOMBRE.
 
 In the long run, we might or might not consider adding proper support
 for section names in national languages.  For some sections, it makes
 a difference because some macros behave differently in some sections.

Just to be clear, for the NAME section, it doesn't really make that
much of a difference right now whether it is recognised as such or not.
The only difference is that a bit more validation is done in
mdoc_validate.c, functions post_sh_head and post_sh_body for NAME
sections than for CUSTOM sections:  It warns if NAME doesn't come
first or if it is lacking .Nm and/or .Nd, that's all.

There are other section/macro combinations that trigger special
behaviour, for example, .Nm and .Fd start on a new line in SYNOPSIS,
but not elsewhere, and .In gets an additional '#include' in
SYNOPSIS, but not elsewhere, to name two examples - and such examples
are ugly and fortunately rare.

NAME is not among those sections getting special treatment.

 For now, just treating section names in national languages as custom
 sections is probably the way to go (see the patch it sent out).

 I would tend to disagree. Please consider adding section names in national
 languages. makewhatis already does so, it's completely harmless.
 
 Formated.pm:if 
 (m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
  {
 
 (the too last weird sequences correspond to namae in japanese common codings,
 SJIS and EUC if memory serves).

I'm not sure adding a hack like that is needed, at least not right now.
It changes very little.

Yours,
  Ingo



Re: mandoc errors in ports

2010-04-04 Thread Christian Weisgerber
Marc Espie es...@nerim.net wrote:

 I would tend to disagree. Please consider adding section names in national
 languages. makewhatis already does so, it's completely harmless.
 
 Formated.pm:if
 (m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
  {

I intensely dislike this since it simply doesn't scale.  Luckily
we only have a few non-English man pages in the tree and these are
handled very haphazardly.  But for perspective: LC_MESSAGES come
in, what, fifty languages?  A hundred?

-- 
Christian naddy Weisgerber  na...@mips.inka.de



Re: mandoc errors in ports

2010-04-04 Thread Theo de Raadt
  I would tend to disagree. Please consider adding section names in national
  languages. makewhatis already does so, it's completely harmless.
  
  Formated.pm:if
  (m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
   {
 
 I intensely dislike this since it simply doesn't scale.  Luckily
 we only have a few non-English man pages in the tree and these are
 handled very haphazardly.  But for perspective: LC_MESSAGES come
 in, what, fifty languages?  A hundred?

The bigger picture is that it would be incompatible with the 20 year
mandoc language.

mandoc(1) should do what doc-nroff does.



Re: mandoc errors in ports

2010-04-04 Thread Marc Espie
On Sun, Apr 04, 2010 at 05:05:40PM +, Christian Weisgerber wrote:
 Marc Espie es...@nerim.net wrote:
 
  I would tend to disagree. Please consider adding section names in national
  languages. makewhatis already does so, it's completely harmless.
  
  Formated.pm:if
  (m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
   {
 
 I intensely dislike this since it simply doesn't scale.  Luckily
 we only have a few non-English man pages in the tree and these are
 handled very haphazardly.  But for perspective: LC_MESSAGES come
 in, what, fifty languages?  A hundred?

It's practical. I want it to work on every manpage in the ports tree, not
every possible thing we would have to worry about 20 years in the future.



Re: mandoc errors in ports

2010-04-04 Thread Theo de Raadt
 On Sun, Apr 04, 2010 at 05:05:40PM +, Christian Weisgerber wrote:
  Marc Espie es...@nerim.net wrote:
  
   I would tend to disagree. Please consider adding section names in national
   languages. makewhatis already does so, it's completely harmless.
   
   Formated.pm:if
   (m/^(?:NAME|NAMES|NAMN|NOMBRE|NOME|Name|\xbe|\xcc\xbe\xbe\xce|\xcc\xbe\xc1\xb0)\s*$/)
{
  
  I intensely dislike this since it simply doesn't scale.  Luckily
  we only have a few non-English man pages in the tree and these are
  handled very haphazardly.  But for perspective: LC_MESSAGES come
  in, what, fifty languages?  A hundred?
 
 It's practical. I want it to work on every manpage in the ports tree, not
 every possible thing we would have to worry about 20 years in the future.

Too bad it is incompatible.




Re: mandoc errors in ports

2010-04-03 Thread Nicholas Marriott
mandoc doesn't understand Spanish, it expects NAME not NOMBRE.

I'd guess this should probably be a warning not an error?


On Fri, Apr 02, 2010 at 09:56:44PM -0500, Marco Peereboom wrote:
  x11/scrotwm
scrotwm_es.1:21:2: error: NAME section must be first
 
 I don't understand the issue.  What does this mean?
 



Re: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
Hi naddy,

Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

 Here's the list of ports that pull in bsd.man.mk to format their
 man pages, but mandoc(1) errors out:
 
 benchmarks/smtp-benchmark
   smtpsend.8:38:1: error: blank line disallowed
 devel/ctm
   ctm.1:42:1: error: blank line disallowed
 mail/smtp-vilter
   smtp-vilter.8:186:1: error: blank line disallowed
 mail/movemail
   movemail.1:61:1: error: blank line disallowed
 net/cnupm
   cnupmstat.8:52:1: error: blank line disallowed
 sysutils/openpoppassd
   openpoppassd.8:35:1: error: blank line disallowed

 x11/scrotwm
   scrotwm_es.1:21:2: error: NAME section must be first

These should be converted to warnings, it is still possible to
continue parsing, and the result will probably be more or less
reasonable.

See below for a diff; Kristaps: OK?

All the same, the first block of pages should be reported upstream.
Blank lines are not valid syntax in mdoc(7) except in literal context.
The authors might consider using .Pp instead.  That might not be what
they want in some cases, but it will in many.

Yours,
  Ingo


Remaining:

 games/sudoku-solver
   sudoku-solver.6:33:2: error: too many list types
 misc/omconsole
   omconsole.1:36:5: error: requires line arguments  0 (has 0)
 net/openvpn_bsdauth
   openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
   scope of Xo
 net/ipcalc
   ipcalc.1:70:2: error: multi-line scope breaks multi-line scope of It
 net/bluetooth-tools
   btkey.1:123:2: error: bad child for parent context
 sysutils/tabled
   tabled.8:53:2: error: too many list types
 sysutils/pftop
   pftop.8:146:2: error: multi-line scope breaks multi-line scope of It
 sysutils/login_ldap
   login_ldap.8:283:2: error: multi-line scope breaks multi-line scope of
   It
 sysutils/login_fingerprint
   login_fingerprint.8:72:2: error: multi-line scope breaks multi-line
   scope of It
 textproc/sgmlformat
   instant.1:0:1: error: document has no title/section
 x11/sclock
   sclock.1:0:1: error: document has no title/section


Index: mdoc.c
===
RCS file: /cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.37
diff -u -p -r1.37 mdoc.c
--- mdoc.c  2 Apr 2010 12:39:47 -   1.37
+++ mdoc.c  3 Apr 2010 12:16:22 -
@@ -596,8 +596,12 @@ parsetext(struct mdoc *m, int line, char
for (i = 0; ' ' == buf[i]; i++)
/* Skip leading whitespace. */ ;
 
-   if ('\0' == buf[i])
-   return(mdoc_perr(m, line, 0, ENOBLANK));
+   if ('\0' == buf[i]) {
+   if ( ! mdoc_pwarn(m, line, 0, ENOBLANK))
+   return(0);
+   if ( ! mdoc_elem_alloc(m, line, 0, MDOC_Pp, NULL))
+   return(0);
+   }
 
/*
 * Break apart a free-form line into tokens.  Spaces are
Index: mdoc_validate.c
===
RCS file: /cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.44
diff -u -p -r1.44 mdoc_validate.c
--- mdoc_validate.c 2 Apr 2010 12:39:47 -   1.44
+++ mdoc_validate.c 3 Apr 2010 12:16:22 -
@@ -1306,8 +1306,9 @@ post_sh_head(POST_ARGS)
 * non-CUSTOM has a conventional order to be followed.
 */
 
-   if (SEC_NAME != sec  SEC_NONE == mdoc-lastnamed)
-   return(mdoc_nerr(mdoc, mdoc-last, ESECNAME));
+   if (SEC_NAME != sec  SEC_NONE == mdoc-lastnamed 
+   ! mdoc_nwarn(mdoc, mdoc-last, ESECNAME))
+   return(0);
if (SEC_CUSTOM == sec)
return(1);
if (sec == mdoc-lastnamed)



Re: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
Nicholas Marriott wrote on Sat, Apr 03, 2010 at 08:10:47AM +0100:

 mandoc doesn't understand Spanish, it expects NAME not NOMBRE.

In the long run, we might or might not consider adding proper support
for section names in national languages.  For some sections, it makes
a difference because some macros behave differently in some sections.

For now, just treating section names in national languages as custom
sections is probably the way to go (see the patch it sent out).

 I'd guess this should probably be a warning not an error?

Right, it seems it is possible to continue parsing,
and even the header line is rendered just fine.



Re: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

 textproc/sgmlformat
   instant.1:0:1: error: document has no title/section
 x11/sclock
   sclock.1:0:1: error: document has no title/section

Are these really man(7) pages without a .TH header macro?
Must have a look later...

In any case, this issue need not be fatal.
When we have no title, why not just use unknown and prod on?
For mdoc(7), mandoc(1) already does something similar in one place.

Kristaps, OK?


Remaining:

 misc/omconsole
   omconsole.1:36:5: error: requires line arguments  0 (has 0)
 net/bluetooth-tools
   btkey.1:123:2: error: bad child for parent context
 net/openvpn_bsdauth
   openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
   scope of Xo
 net/ipcalc
   ipcalc.1:70:2: error: multi-line scope breaks multi-line scope of It
 sysutils/pftop
   pftop.8:146:2: error: multi-line scope breaks multi-line scope of It
 sysutils/login_ldap
   login_ldap.8:283:2: error: multi-line scope breaks multi-line scope of
   It
 sysutils/login_fingerprint
   login_fingerprint.8:72:2: error: multi-line scope breaks multi-line
   scope of It


--- man_validate.c.00   Fri Apr  2 13:37:07 2010
+++ man_validate.c  Sat Apr  3 16:52:37 2010
@@ -163,8 +163,11 @@ check_root(CHKARGS) 
 
if (NULL == m-first-child)
return(man_nerr(m, n, WNODATA));
-   if (NULL == m-meta.title)
-   return(man_nerr(m, n, WNOTITLE));
+   if (NULL == m-meta.title) {
+   if ( ! man_nwarn(m, n, WNOTITLE))
+   return(0);
+   m-meta.title = mandoc_strdup(unknown);
+   }
 
return(1);
 }



Re: mandoc errors in ports

2010-04-03 Thread Chris Bennett



Ingo Schwarze wrote:

Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

  

textproc/sgmlformat
  instant.1:0:1: error: document has no title/section
x11/sclock
  sclock.1:0:1: error: document has no title/section



Are these really man(7) pages without a .TH header macro?
Must have a look later...

In any case, this issue need not be fatal.
When we have no title, why not just use unknown and prod on?
For mdoc(7), mandoc(1) already does something similar in one place.

Kristaps, OK?

  
Since someone is talking about man pages, I have gotten the following 
for a long time:


Rebuilding whatis databases:
Couldn't find subject in old manpage /usr/local/man/man3p/SVG::Extension.3p
Unknown manpage type /usr/local/man/man3p/SVG::Extension.3p
Couldn't find subject in old manpage 
/usr/local/man/man3p/Text::Autoformat.3p

Unknown manpage type /usr/local/man/man3p/Text::Autoformat.3p

--
A human being should be able to change a diaper, plan an invasion,
butcher a hog, conn a ship, design a building, write a sonnet, balance
accounts, build a wall, set a bone, comfort the dying, take orders,
give orders, cooperate, act alone, solve equations, analyze a new
problem, pitch manure, program a computer, cook a tasty meal, fight
efficiently, die gallantly. Specialization is for insects.
  -- Robert Heinlein



Re: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

 misc/omconsole
   omconsole.1:36:5: error: requires line arguments  0 (has 0)

That's a bad syntax error in the mdoc(7) source code.
Matthieu should really fix it upstream.
Just remove the .Xr having no argument!

Still, mandoc(1) need not die, we can just ignore the empty .Xr macro.

OK?


Remaining:

 net/bluetooth-tools
   btkey.1:123:2: error: bad child for parent context
 net/openvpn_bsdauth
   openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
   scope of Xo
 net/ipcalc
   ipcalc.1:70:2: error: multi-line scope breaks multi-line scope of It
 sysutils/pftop
   pftop.8:146:2: error: multi-line scope breaks multi-line scope of It
 sysutils/login_ldap
   login_ldap.8:283:2: error: multi-line scope breaks multi-line scope of
   It
 sysutils/login_fingerprint
   login_fingerprint.8:72:2: error: multi-line scope breaks multi-line
   scope of It


Index: mdoc_html.c
===
RCS file: /cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.8
diff -u -p -r1.8 mdoc_html.c
--- mdoc_html.c 2 Mar 2010 00:38:59 -   1.8
+++ mdoc_html.c 3 Apr 2010 16:55:13 -
@@ -753,6 +753,9 @@ mdoc_xr_pre(MDOC_ARGS)
struct htmlpair  tag[2];
const struct mdoc_node  *nn;
 
+   if (NULL == n-child)
+   return(0);
+
PAIR_CLASS_INIT(tag[0], link-man);
 
if (h-base_man) {
Index: mdoc_term.c
===
RCS file: /cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.71
diff -u -p -r1.71 mdoc_term.c
--- mdoc_term.c 26 Mar 2010 01:22:05 -  1.71
+++ mdoc_term.c 3 Apr 2010 16:55:18 -
@@ -1275,7 +1275,10 @@ termp_xr_pre(DECL_ARGS)
 {
const struct mdoc_node *nn;
 
-   assert(n-child  MDOC_TEXT == n-child-type);
+   if (NULL == n-child)
+   return(0);
+
+   assert(MDOC_TEXT == n-child-type);
nn = n-child;
 
term_word(p, nn-string);
Index: mdoc_validate.c
===
RCS file: /cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.46
diff -u -p -r1.46 mdoc_validate.c
--- mdoc_validate.c 3 Apr 2010 16:30:42 -   1.46
+++ mdoc_validate.c 3 Apr 2010 16:55:20 -
@@ -129,7 +129,7 @@ static  v_post   posts_text1[] = { eerr_eq
 static v_post   posts_vt[] = { post_vt, NULL };
 static v_post   posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static v_post   posts_wtext[] = { ewarn_ge1, NULL };
-static v_post   posts_xr[] = { eerr_ge1, NULL };
+static v_post   posts_xr[] = { ewarn_ge1, NULL };
 static v_prepres_an[] = { pre_an, NULL };
 static v_prepres_bd[] = { pre_display, pre_bd, NULL };
 static v_prepres_bl[] = { pre_bl, NULL };



Re: mandoc errors in ports

2010-04-03 Thread Chris Bennett



Chris Bennett wrote:



Ingo Schwarze wrote:

Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

 

textproc/sgmlformat
  instant.1:0:1: error: document has no title/section
x11/sclock
  sclock.1:0:1: error: document has no title/section



Are these really man(7) pages without a .TH header macro?
Must have a look later...

In any case, this issue need not be fatal.
When we have no title, why not just use unknown and prod on?
For mdoc(7), mandoc(1) already does something similar in one place.

Kristaps, OK?

  
Since someone is talking about man pages, I have gotten the following 
for a long time:


Rebuilding whatis databases:
Couldn't find subject in old manpage 
/usr/local/man/man3p/SVG::Extension.3p

Unknown manpage type /usr/local/man/man3p/SVG::Extension.3p
Couldn't find subject in old manpage 
/usr/local/man/man3p/Text::Autoformat.3p

Unknown manpage type /usr/local/man/man3p/Text::Autoformat.3p


This was easy to fix.
Both lacked a NAME.
There is a manpage for SVG::Extension
Nothing for Text::Autoformat

Should a patch be added to the port of p5-SVG to correct this?

--
A human being should be able to change a diaper, plan an invasion,
butcher a hog, conn a ship, design a building, write a sonnet, balance
accounts, build a wall, set a bone, comfort the dying, take orders,
give orders, cooperate, act alone, solve equations, analyze a new
problem, pitch manure, program a computer, cook a tasty meal, fight
efficiently, die gallantly. Specialization is for insects.
  -- Robert Heinlein



net/bluetooth-tools, was: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
 net/bluetooth-tools
   btkey.1:123:2: error: bad child for parent context

This one is rather bad, the nesting of blocks is broken in these manual
pages.  I will have a look whether mandoc(1) can be made to cope,
but i recommend pushing the following upstream in any case -
and perhaps commit it for now to prevent the port from getting broken.

OK?


diff -Nup /var/empty/patch-btkey_btkey_1 patches/patch-btkey_btkey_1
--- /var/empty/patch-btkey_btkey_1  Thu Jan  1 01:00:00 1970
+++ patches/patch-btkey_btkey_1 Sat Apr  3 19:25:42 2010
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- btkey/btkey.1.orig Sun Feb 17 16:58:17 2008
 btkey/btkey.1  Sat Apr  3 19:23:31 2010
+@@ -120,7 +120,8 @@ Clear key for phone at bt3c0 from file and device
+ .Ex -std
+ .Sh FILES
+ .Bl -tag -compact
+-.Pa /var/db/bthcid.keys
++.It Pa /var/db/bthcid.keys
++Bluetooth Link Key cache.
+ .El
+ .Sh SEE ALSO
+ .Xr btpin 1 ,
diff -Nup /var/empty/patch-btpin_btpin_1 patches/patch-btpin_btpin_1
--- /var/empty/patch-btpin_btpin_1  Thu Jan  1 01:00:00 1970
+++ patches/patch-btpin_btpin_1 Sat Apr  3 19:31:46 2010
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- btpin/btpin.1.orig Sat Apr  3 19:31:35 2010
 btpin/btpin.1  Sat Apr  3 19:28:49 2010
+@@ -81,7 +81,8 @@ The default path is
+ .Ex -std
+ .Sh FILES
+ .Bl -tag -compact
+-.Pa /var/run/bthcid
++.It Pa /var/run/bthcid
++The control socket.
+ .El
+ .Sh SEE ALSO
+ .Xr btkey 1 ,
diff -u -p -r1.11 Makefile
--- Makefile22 Nov 2008 14:05:37 -  1.11
+++ Makefile3 Apr 2010 17:35:48 -
@@ -2,6 +2,7 @@
 
 COMMENT=   bluetooth network tools
 DISTNAME=  bluetooth-tools-20081122
+PKGNAME=   ${DISTNAME}p0
 CATEGORIES=net
 MAINTAINER=Uwe Stuehler u...@openbsd.org
 



net/openvpn_bsdauth, was: mandoc errors in ports

2010-04-03 Thread Ingo Schwarze
Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

 net/openvpn_bsdauth
   openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
   scope of Xo

At least on a short time scale, mandoc(1) will not be able to cope
with block nesting errors like the Oo Xo Oc Xc here.

In the case at hand, there is no need for explicit blocks at all,
so i suggest to commit this and also push it upstream:

OK?


diff -Nup /var/empty/patch-openvpn_bsdauth_8 patches/patch-openvpn_bsdauth_8
--- /var/empty/patch-openvpn_bsdauth_8  Thu Jan  1 01:00:00 1970
+++ patches/patch-openvpn_bsdauth_8 Sat Apr  3 21:03:15 2010
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- openvpn_bsdauth.8.orig Sat Apr  3 20:58:49 2010
 openvpn_bsdauth.8  Sat Apr  3 21:01:27 2010
+@@ -19,7 +19,7 @@
+ .Nd Authenticate users for OpenVPN
+ .Sh SYNOPSYS
+ .Nm
+-.Oo Xo Ar file Oc Xc
++.Op Ar file
+ .Sh DESCRIPTION
+ .Nm
+ is invoked by OpenVPN to authenticate a user by checking a username and a
Index: Makefile
===
RCS file: /cvs/ports/net/openvpn_bsdauth/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile30 Dec 2009 01:11:05 -  1.3
+++ Makefile3 Apr 2010 19:07:42 -
@@ -3,6 +3,7 @@
 COMMENT =  BSD Auth helper program for OpenVPN
 
 DISTNAME = openvpn_bsdauth-5
+PKGNAME =  ${DISTNAME}p0
 CATEGORIES =   net
 HOMEPAGE = http://www.wormhole.hu/~ice/openvpn_bsdauth/
 



mandoc errors in ports

2010-04-02 Thread Christian Weisgerber
Here's the list of ports that pull in bsd.man.mk to format their
man pages, but mandoc(1) errors out:

benchmarks/smtp-benchmark
  smtpsend.8:38:1: error: blank line disallowed
devel/ctm
  ctm.1:42:1: error: blank line disallowed
games/sudoku-solver
  sudoku-solver.6:33:2: error: too many list types
mail/smtp-vilter
  smtp-vilter.8:186:1: error: blank line disallowed
mail/movemail
  movemail.1:61:1: error: blank line disallowed
misc/omconsole
  omconsole.1:36:5: error: requires line arguments  0 (has 0)
net/openvpn_bsdauth
  openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
  scope of Xo
net/ipcalc
  ipcalc.1:70:2: error: multi-line scope breaks multi-line scope of It
net/cnupm
  cnupmstat.8:52:1: error: blank line disallowed
net/bluetooth-tools
  btkey.1:123:2: error: bad child for parent context
sysutils/tabled
  tabled.8:53:2: error: too many list types
sysutils/pftop
  pftop.8:146:2: error: multi-line scope breaks multi-line scope of It
sysutils/openpoppassd
  openpoppassd.8:35:1: error: blank line disallowed
sysutils/login_ldap
  login_ldap.8:283:2: error: multi-line scope breaks multi-line scope of
  It
sysutils/login_fingerprint
  login_fingerprint.8:72:2: error: multi-line scope breaks multi-line
  scope of It
textproc/sgmlformat
  instant.1:0:1: error: document has no title/section
x11/scrotwm
  scrotwm_es.1:21:2: error: NAME section must be first
x11/sclock
  sclock.1:0:1: error: document has no title/section
-- 
Christian naddy Weisgerber  na...@mips.inka.de



Re: mandoc errors in ports

2010-04-02 Thread Marco Peereboom
 x11/scrotwm
   scrotwm_es.1:21:2: error: NAME section must be first

I don't understand the issue.  What does this mean?