Subject: Re: pkg/32966 textproc/groff PLIST problem
To: None <wiz@netbsd.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,>
From: Thomas Klausner <wiz@netbsd.org>
List: pkgsrc-bugs
Date: 03/07/2006 04:20:05
The following reply was made to PR pkg/32966; it has been noted by GNATS.
From: Thomas Klausner <wiz@netbsd.org>
To: Neil Hoggarth <neil.hoggarth@physiol.ox.ac.uk>
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/32966 textproc/groff PLIST problem
Date: Tue, 7 Mar 2006 05:18:27 +0100
--mJm6k4Vb/yFcL9ZU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Mon, Mar 06, 2006 at 05:04:14PM +0000, Neil Hoggarth wrote:
> Yes - I just completed a successful build, install and package with
> a freshly cleaned and updated pkgsrc tree. Thanks for the fix.
You're welcome.
I have another fix that is probably better. Could you please check
if the attached diff works too?
Thanks,
Thomas
--mJm6k4Vb/yFcL9ZU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=groff-diff
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/groff/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 5 Mar 2006 19:23:21 -0000 1.35
+++ Makefile 7 Mar 2006 04:02:11 -0000
@@ -24,11 +24,7 @@
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS"
-PLIST_SUBST+= GNU_PREFIX="g"
-.else
PLIST_SUBST+= GNU_PREFIX=""
-.endif
.if defined(PAPERSIZE)
CONFIGURE_ENV+= PAGE=${PAPERSIZE:Q}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/groff/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 7 Dec 2005 17:51:51 -0000 1.12
+++ distinfo 7 Mar 2006 04:02:11 -0000
@@ -4,5 +4,6 @@
RMD160 (groff-1.19.2.tar.gz) = d5e57fa1d71dbff2c59a40a5a68c7417ffe211c9
Size (groff-1.19.2.tar.gz) = 2903263 bytes
SHA1 (patch-aa) = 3c74f1b8e809da5359d4702f0f5f299593601209
+SHA1 (patch-ab) = 19ddc64acd7dad1971fec0b94a0339dab1780647
SHA1 (patch-ac) = 7c29e3ca0c0a2e5389ff436ff5c15c9a0a4d7581
SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ab 7 Mar 2006 04:02:11 -0000
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- configure.orig 2005-09-03 16:28:36.000000000 +0200
++++ configure
+@@ -9791,17 +9791,7 @@ _ACEOF
+ echo "$as_me:$LINENO: result: $PAGE" >&5
+ echo "${ECHO_T}$PAGE" >&6
+
+-echo "$as_me:$LINENO: checking for existing troff installation" >&5
+-echo $ECHO_N "checking for existing troff installation... $ECHO_C" >&6
+- if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- g=g
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ g=
+- fi
+
+ echo "$as_me:$LINENO: checking for prefix of system macro packages" >&5
+ echo $ECHO_N "checking for prefix of system macro packages... $ECHO_C" >&6
--mJm6k4Vb/yFcL9ZU--