54 Commits

Author SHA1 Message Date
naddy
d159f8d1ad Make use of "find -exec {} +" (which is POSIX) and "find -delete"
(which is not) throughout the ports Makefiles.

* Replace find|xargs with find -exec {} +
* Replace -exec {} \; with -exec {} + if applicable.
* Use the -delete operator to remove files and empty directories.
* Combine and tweak some find(1) invocations while here.

ok kn@ rsadowski@ espie@
2020-03-20 16:44:21 +00:00
schwarze
9b22ac7086 update comments after pushing patches upstream;
no bump needed because the package does not change
2020-01-18 17:33:56 +00:00
schwarze
7bda9cceb2 I'm sorry for the last commit; it caused havoc because cvs(1)
mangled the "Mdocdate" contained in the doc-common patch.
This commit rearranges the code such that cvs(1) won't break it again.
2019-12-30 12:34:55 +00:00
schwarze
798f7a3c54 Bugfix: accept any number of arguments for .Dd (also submitted upstream).
Needed to format 4.4BSD manual pages.
Bug found and patch OK'ed by jsg@.
2019-12-27 00:48:04 +00:00
schwarze
69c0cfd0e1 bugfix, also submitted upstream:
with the groff_man(7) macros, .AT and .UC did not work at all;
bug reported and patch OK'ed by jsg@
2019-12-16 07:09:49 +00:00
sthen
77f7cc9c61 replace simple PERMIT_PACKAGE_CDROM=Yes with PERMIT_PACKAGE=Yes 2019-07-12 20:49:33 +00:00
schwarze
26232b64a2 Correctly handle groff_mdoc(7) .Lk arguments starting with a dot;
bug reported by jmc@; fix committed upstream, too.
2019-01-12 17:01:35 +00:00
schwarze
6b930f8789 Add a missing prerequisite that could cause parallel builds to fail.
Issue found and patch OK by sthen@.
2018-12-26 00:49:22 +00:00
schwarze
d06673bd07 update to the maintenance release groff-1.22.4;
lots of small improvements, and most of our patches incorporated;
tweaks to the port and OK bcallah@
2018-12-24 10:42:00 +00:00
sthen
44b7d9f469 Build groff with a base compiler, suggested by/ok schwarze@. It is somewhat
an "infrastructure" port, won't have library conflict problems, and as
Ingo says, 'Groff does not really use C++, it is merely "C with classes"'
and this is not expected to change.
2018-10-25 13:26:48 +00:00
sthen
25f0e460f2 Add COMPILER lines to c++ ports which currently use the default. Adjust
some existing COMPILER lines with arch restrictions etc. In the usual
case this is now using "COMPILER = base-clang ports-gcc base-gcc" on
ports with c++ libraries in WANTLIB.

This is basically intended to be a noop on architectures using clang
as the system compiler, but help with other architectures where we
currently have many ports knocked out due to building with an unsuitable
compiler -

- some ports require c++11/newer so the GCC version in base that is used
on these archirtectures is too old.

- some ports have conflicts where an executable is built with one compiler
(e.g. gcc from base) but a library dependency is built with a different
one (e.g. gcc from ports), resulted in mixing incompatible libraries in the
same address space.

devel/gmp is intentionally skipped as it's on the path to building gcc -
the c++ library there is unused in ports (and not built by default upstream)
so intending to disable building gmpcxx in a future commit.
2018-10-24 14:27:57 +00:00
espie
f4b7f81318 convert to PKGSTEM 2018-09-04 12:46:09 +00:00
schwarze
746e2dd53d No longer preformat the manual pages with groff, install the sources.
Mandoc is now able to handle them.

OK jca@ bentley@
2018-08-27 00:16:24 +00:00
schwarze
93e607fd55 My patch to render mathematical symbols and greek letters intelligibly
in ASCII output finally got committed upstream.  Use it in OpenBSD
right away, such that related work on mandoc can proceed.
Maybe we can even improve libm documentation before release.
2017-08-22 23:28:52 +00:00
sthen
5e964ab0df bump LIBCXX/LIBECXX/COMPILER_LIBCXX ports. 2017-07-26 22:45:14 +00:00
espie
c114d7057b add pthread to COMPILER_LIBCXX.
white lie, but it allows clang and gcc to be more similar
bump accordingly.
2017-07-23 09:26:25 +00:00
espie
8ac47fd9c6 use COMPILER_LIBCXX where applicable 2017-07-16 19:18:47 +00:00
schwarze
348cbccb36 Set the default operating system name for manual pages
to just "OpenBSD": that's the obvious thing to do, no idea why i
didn't do it long ago.  So far, man(7) had no default at all, and
the "OpenBSD ports" used by mdoc(7) no longer makes sense because
only about 25 ports use groff nowadays, and none of those use mdoc(7).
This change is also simplifies groff-mandoc comparisons.
2017-07-04 17:44:13 +00:00
schwarze
ff8f5cf260 Pull in four patches that i recently pushed upstream to GNU troff.
Joint work with bentley@, all committed upstream by Carsten Kunze.

https://savannah.gnu.org/bugs/?43554 - better \*[Lq] and \*[Rq]
https://savannah.gnu.org/bugs/?43553 - typographic quotes for .%T
https://savannah.gnu.org/bugs/?50771 - punctuation after .Lk
https://savannah.gnu.org/bugs/?50789 - .Lk with more than two args
2017-04-14 19:49:06 +00:00
sthen
073d25a37c use LIBCXX 2017-04-10 11:46:32 +00:00
schwarze
fa5ae68988 Pull in a patch committed upstream:
Make the behaviour of .Bl -tag without -width comprehensible
and the same as in mandoc(1).
No opposition when shown on ports@.
2016-10-17 18:32:34 +00:00
schwarze
2dc6d7cc18 Make sure all directories used as targets during the fake install
stage are marked as .PHONY, or make(1) might consider some of them
up to date, skipping the fake install for them and causing later
packaging to fail.
Also regenerate the patch with make update-patches.
No package change (as far as it built at all), no bump.
Issue observed by Jerome Ibanes <jibanes at gmail dot com> on sparc64.
OK sthen@
2016-09-13 11:17:21 +00:00
schwarze
7c26714893 Fix bullet character for UTF-8 output. From upstream git.
naddy@ says i should just commit.
2015-07-18 04:32:26 +00:00
schwarze
5d7933ecb5 Apply a bugfix to .Bl that i sent upstream and that got merged there.
Helps groff-mandoc comparisons, for example in mutella(1).
No opposition when shown on ports@.
2015-04-19 15:20:43 +00:00
schwarze
7fc0cbc6a2 * delete bogus version number from README; from Kaspars at Bankovskis dot net
* we no longer change the rendering of the bullet character
* avoid groff warning "unbalanced .el request" when running with -mdoc -ww
* improve rendering of large braces in UTF-8 output (accepted upstream)
* bump REVISION
ok sthen@ naddy@
2015-02-16 15:45:11 +00:00
schwarze
c619518f20 src/devices/gropdf depends on arch/misc (I will send this upstream, too.)
For those cases where the build succeeded, no bump needed because
the package doesn't change; for those cases where parallel builds
failed, no bump needed either.  Committing quickly to fix the build.

ok sthen@
2014-11-07 17:10:36 +00:00
schwarze
545d4e77f7 update to groff-1.22.3
new features:
* glilypond(1) - new preprocessor for music typesetting
* gperl(1) - new preprocessor for embedding Perl code in roff documents
* gpinyin(1) - new preprocessor to pretty-print Pinyin syllables
* groff_mom(7) now has full eqn(7), pic(7), and tbl(7) support
* mdoc(7) now supports the %C macro (already available in mandoc)

* various bugfixes
* many of our patches have been integrated upstream
* changing the bullet is no longer needed, mandoc can now handle it

ok sthen@ naddy@
2014-11-06 22:15:22 +00:00
schwarze
eda4114db6 Two bug fixes, one bump.
1) For man(7), initialize internal numerical registers correctly
such that a stray .RE without a preceding .RS doesn't set the left
margin to column 0.  Reported by bentley@ on discuss at mdocml.
Patch technically approved by Werner Lemberg (upstream).
The only reason it isn't committed upstream yet is that FSF
pesters me to sign a Copyright Assignment contract under
Massachusetts legislature, talking about Warranties and whatnot,
which i resist.

2) Restore correct syntax to the .ie cascade governing section titles
that i broke, trying to be too clever.  Problem reported by
David Levine via pascal@ after the nmh(1) folks added an OpenBSD
machine to their buildbot cluster.

ok pascal@
2013-12-15 15:19:50 +00:00
schwarze
1e89139261 My implementation of .%C (city) in .Rs (citation block), accepted and
committed upstream.  It already works in mandoc(1), and it is used in
some OpenBSD base system manuals, and using it is generally encouraged,
so having it in our groff port as well really makes sense.
ok bentley@ on August 1, 2013 (and i forgot to commit after unlock, sorry)
2013-11-11 06:41:02 +00:00
naddy
725de75f3a move http://www.gnu.org to https 2013-11-09 23:19:01 +00:00
schwarze
a7f1b9dfac Add a patch to avoid permanent damage to the right margin
when a man(7) input file contains two consecutive .TP lines.
This bugfix improves the formatting of unzip(1), for example.

While here, recognize 5.4 as an OpenBSD version in mdoc(7) files.

ok sthen@ dcoppa@ espie@
2013-07-13 07:38:59 +00:00
zhuk
4e09e1fefd Use MODPERL_BIN_ADJ for those ports.
okay dcoppa@ and schwarze@ (MAINTAINER)
2013-05-24 14:10:01 +00:00
schwarze
84233c0355 Maintenance update to groff-1.22.2.
* New features: gropdf(1), pdfmom(1)
* Lots of our patches were accepted upstream, lots of upstream bug fixes.
Tested by landry@ and pascal@, ok landry@ and sthen@.
2013-03-30 23:10:05 +00:00
espie
eae66e4a7b PERMIT_* / REGRESS->TEST sweep 2013-03-11 11:35:43 +00:00
sthen
9366d3a0a9 let dpb build groff in parallel, suggested by espie@ 2012-09-25 19:31:59 +00:00
schwarze
54bbdb42f3 In the footers of manuals formatted with groff,
do not print "OpenBSD 5.0" but "OpenBSD ports".
While here, remove some noise from the groff build log.
Bump the groff package.

Technically, this changes the contents of all packages that USE_GROFF,
but please refrain from bumping the world:  Having "OpenBSD 5.0" in
the footers of some ports manual until they are updated the next time,
or until the next libc bump if they aren't, is not a real problem.

string "OpenBSD ports" suggested and patch ok'ed by sthen@
2012-05-28 13:23:28 +00:00
schwarze
a9e83bd435 Correct the expansion of -xbd5,
keeping groff in sync with the mandoc(1) fix just committed by guenther@;
also committed upstream by Werner Lemberg <wl at gnu dot org>.
2012-02-26 22:28:34 +00:00
schwarze
e5e54bed0e Avoid bogus -k flags; proposed by pascal@.
Build fonts before using them; fixes parallel builds as tested by naddy@.
In case we ever support PDF, don't break parallel builds; ok pascal@.
These are all purely build system fixes; no package change, no bump.
2012-01-01 21:05:33 +00:00
pascal
9c83004f63 Don't pick up gmkdir and gawk (ac_cv_path_AWK is not respected here).
ok schwarze@
2011-12-13 18:16:37 +00:00
schwarze
98b4adfee4 General cleanup:
* Unbreak groff manuals by using tbl(1); reported by pascal@.
* Deal with our Mdocdate cvs keyword; as designed by jmc@ in 2007.
* Use troffrc for OpenBSD config changes; suggested by Werner Lemberg.
* Unbreak the hdtbl examples; from upstream.
* Volume names in man(7) page headers; suggested by Yuri Pankov.
* Update various string tables; coordinated with upstream.
* Add a README explaining local changes; using feedback from pascal@.
* Better description and bump.
ok pascal@, and tested in an i386 bulk build by naddy@, thanks!
2011-12-04 15:41:26 +00:00
schwarze
25d26710b1 Format groff manuals with groff before installing them
because mandoc(1) doesn't like them, with the exception
of groff_mdoc(7), which is derived from the traditional
mdoc.samples(7) and which is just fine with mandoc(1).
Problem reported and fix tested by <Pascal dot Stumpf at cubes dot de>.
naddy@ and deraadt@ agree with the general direction
2011-10-12 22:00:07 +00:00
schwarze
a3bd54ca5a Represent bullets (for example in .Bl -bullet) by "o\bo" instead of "+\bo"
to agree with mandoc(1) and reduce noise in automatic output comparisons.
ok ajacoutot@
2011-07-07 05:27:15 +00:00
schwarze
2ad97ee4b1 Following http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538330,
Solar Designer did an audit of temp file handling in groff-1.20.
He found and fixed *lots* of ugliness, but most does not look
exploitable and some was already improved in groff-1.21.

This is my own fix for the only one that, with a huge amount of extra
paranoia, might be worth patching.  To mount an exploit, the attacker
would need to trick root into setting an unusable TMPDIR (or similar)
variable in the environment such that mktemp -d fails, then convince
root to run pdfroff (*you* don't run that as root, do you?), then
handle a race condition to find the PID and predict the temp file
name to mount a symlink attack.

"I think we should still go for the fix" jasper@
2011-06-23 12:14:51 +00:00
kili
df86ff5428 Don't use #!/usr/bin/env perl in installed scripts, just use
#!/usr/bin/perl.

ok schwarze@, espie@ (well, kind of)
2011-04-13 16:20:34 +00:00
espie
cbfa779924 work-around until someone actually debugs the grammar: use the provided
generated file, don't call yacc.

okay millert@, naddy@
2011-03-22 22:27:03 +00:00
schwarze
4f18fef153 Support upgrades from both groff-1.15+groff-mdoc
and from groff-mdoc only to groff-1.21.
Muliple cluesticks applied by and OK espie@.
2011-03-20 17:30:24 +00:00
schwarze
c72e745e6b First major OpenBSD groff update since 2000.
Lots of new functionality, lots of bug fixes, and bringing in
significant maintenance efforts from upstream.
To name just one specific example, the number of arguments mdoc(7)
macros can take is no longer limited.
Two of the more tricky patches contributed by naddy@, thanks!
Tested in bulk builds by landry@.
Tested on sparc (GCC 2) by phessler@ and on alpha (GCC 3) by naddy@.
ok naddy@, landry@

Before using this to build ports, make sure you install
the src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm patch
i'm going to commit right afterwards as well, or you will end up
with ports manuals containing ANSI escape sequences.
2011-03-19 16:48:53 +00:00
espie
811d94d9d6 new depends 2010-11-20 19:56:47 +00:00
schwarze
f8b61892f7 Increase the -man -Tascii text width from 65 to 78 characters.
Patch by millert@, see OpenBSD tmac.an rev. 1.2.
Bump.
Requested by naddy@; ok espie@.
2010-10-28 14:41:55 +00:00
espie
881087b89d make sure groff has its macros 2010-10-19 21:26:26 +00:00