summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2015-10-15 14:11:20 +0000
committerrichard <richard@pkgsrc.org>2015-10-15 14:11:20 +0000
commit19603e9d1a5a3c030c4189005fc59dfbd7102074 (patch)
tree3bc24c8671c82d31830fe2e7ec018931fb9c6bb7
parent3962fe9a62546f39fa3a7c489cca4d2b9b4aeb94 (diff)
downloadpkgsrc-19603e9d1a5a3c030c4189005fc59dfbd7102074.tar.gz
Avoid arbitrary decisions wrt troff being present or not to use a g'prefix.
Force it instead and use PKGGNUDIR logic to work it out. Thanks for the heads up wiz@.
-rw-r--r--textproc/groff/distinfo4
-rw-r--r--textproc/groff/patches/patch-aa17
2 files changed, 16 insertions, 5 deletions
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 83f680a40c8..272570c8bf6 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2015/01/16 23:28:23 wiz Exp $
+$NetBSD: distinfo,v 1.23 2015/10/15 14:11:20 richard Exp $
SHA1 (groff-1.22.3.tar.gz) = 61a6808ea1ef715df9fa8e9b424e1f6b9fa8c091
RMD160 (groff-1.22.3.tar.gz) = 8f6d364f759e559c12c497091118f6d68f3a3b85
Size (groff-1.22.3.tar.gz) = 4188772 bytes
-SHA1 (patch-aa) = b9ca249a89b1e658d5629863aef38eb5fcb359af
+SHA1 (patch-aa) = 3f5d2c29397377f673a863e0ea953eaac4088898
SHA1 (patch-ab) = 64ba9805a0798bfce543a258cd66347caa1bf860
SHA1 (patch-src_libs_libgroff_tmpfile.cpp) = 3794a028dc7c569e5adea6b7b876c3ac085376ba
diff --git a/textproc/groff/patches/patch-aa b/textproc/groff/patches/patch-aa
index d48d0b7ea92..2cbf0fd8a4b 100644
--- a/textproc/groff/patches/patch-aa
+++ b/textproc/groff/patches/patch-aa
@@ -1,10 +1,21 @@
-$NetBSD: patch-aa,v 1.5 2015/01/08 09:14:58 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2015/10/15 14:11:20 richard Exp $
Fix path to papers directory on NetBSD.
+Avoid arbitrary decisions wrt troff being present or not to use a g'prefix.
+Force it instead and use PKGGNUDIR logic to work it out.
---- Makefile.in.orig 2005-08-07 10:03:33.000000000 +0200
+--- Makefile.in.orig 2014-11-04 08:38:35.145524997 +0000
+++ Makefile.in
-@@ -214,7 +214,7 @@ tmac_an_prefix=\
+@@ -123,7 +123,7 @@ DVIPRINT=@DVIPRINT@
+ # gtroff. This doesn't affect programs like grops or groff that have
+ # no Unix counterparts. Note that the groff versions of eqn and tbl
+ # will not work with Unix troff.
+-g=@g@
++g=g
+
+ # Common prefix for installation directories.
+ # Used in definitions of exec_prefix, datasubdir, fontpath, manroot.
+@@ -237,7 +237,7 @@ tmac_an_prefix=\
indexext=.i
# Directory containing the default index for refer.