Hi!
Attached is the patch for RELENG_4. It works but I don't like
how it pollutes the Makefile.inc1. Anyone with a better idea?
On Tue, Dec 12, 2000 at 09:43:55AM -0800, Marcel Moolenaar wrote:
> Ruslan Ermilov wrote:
> >
> > > Let me rephrase the question: Did you modify the manpages to get it to
> > > work with the new groff(1) or is the new groff(1) backward compatible
> > > with the old groff(1)?
> > >
> > The new groff(1) is not always backwards compatible.
>
> Ok, thanks. That's all I wanted to hear.
>
> > OK, I will augment the USRDIRS then, add the groff to bootstrap-tools,
> > and leave the better (if one exists) implementation to someone else.
>
> Works for me.
>
> thanks,
>
> --
> Marcel Moolenaar
> mail: [EMAIL PROTECTED] / [EMAIL PROTECTED]
> tel: (408) 447-4222
On Wed, Jan 24, 2001 at 06:27:29PM +0100, [EMAIL PROTECTED] wrote:
> Hi. did you get any chance to fix the problem discussed earlier yet?
>
> I'm currently trying to buildworld on sources gootten with CVSup, using
> this supfile:
>
> # Defaults that apply to all the collections
> *default host=cvsup.FreeBSD.org
> *default base=/usr
> *default prefix=/usr
> *default release=cvs tag=RELENG_4
> *default delete use-rel-suffix
> *default compress
>
> ## The international secure collections.
> src-all
>
> buildworld fails as follows;
>
> ===> share/doc/usd/12.vi/summary
> touch _stamp.extraobjs
> (cd
> /usr/src/share/doc/usd/12.vi/summary/../../../../../contrib/nvi/docs/USD.doc/vitut;
> groff -mtty-char -Tascii -t -ms -o1-
>
>/usr/src/share/doc/usd/12.vi/summary/../../../../../contrib/nvi/docs/USD.doc/vitut/vi.summary)
> | gzip -cn > summary.ascii.gz
> ===> share/doc/usd/13.viref
> (cd
> /usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref;
> sed -e\ 's:\(\.so[\ \ ][\ \
>
>]*\)\(vi.ref\)$:\1/usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref/\2:'
> -e\ 's:\(\.so[\ \ ][\ \
>
>]*\)\(ex.cmd.roff\)$:\1/usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref/\2:'
> -e\ 's:\(\.so[\ \ ][\ \
>
>]*\)\(ref.so\)$:\1/usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref/\2:'
> -e\ 's:\(\.so[\ \ ][\ \
>
>]*\)\(set.opt.roff\)$:\1/usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref/\2:'
> -e\ 's:\(\.so[\ \ ][\ \
>
>]*\)\(vi.cmd.roff\)$:\1/usr/src/share/doc/usd/13.viref/../../../../contrib/nvi/docs/USD.doc/vi.ref/\2:'
> -e 's:^\.so index.so$::' vi.ref) | groff -mtty-char -Tascii -t -s -me -U
> -o1- > /dev/null
> groff: illegal option -- U
> usage: groff [-abehilpstvzCENRSVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]
> [-wname]
> [-Wname] [ -Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg] [-Larg]
> [files...]
> groff -h gives more help
> *** Error code 1
>
> Stop.
>
> Can you please help me out here?
>
>
> On Sat, Dec 16, 2000 at 05:15:26PM +0200, Ruslan Ermilov wrote:
> > On Sat, Dec 16, 2000 at 01:28:16PM +0100, [EMAIL PROTECTED] wrote:
> > > Hi.
> > >
> > > I'm having a hell of a time upgrading my 3.4-STABLE box to 4.2-STABLE.
> > > My latest blues concern groff, for which I saw you posting a patch on
> > > the freeBSD questions mailing list on the 9th of December.
> > >
> > > I hope this patch solved the problem, I did not see any messages on that.
> > >
> > > Unfortunately, you do not post instructions to apply the patch. I'm hoping
> > > to get them out of you via this email ;-)
> > >
> > I am planning to commit the fix to 5.0-CURRENT and 4.2-STABLE shortly.
> > I will send you a notice after I do this.
> >
> > --
> > Ruslan Ermilov Oracle Developer/DBA,
> > [EMAIL PROTECTED] Sunbay Software AG,
> > [EMAIL PROTECTED] FreeBSD committer,
> > +380.652.512.251 Simferopol, Ukraine
> >
> > http://www.FreeBSD.org The Power To Serve
> > http://www.oracle.com Enabling The Information Age
--
Ruslan Ermilov Oracle Developer/DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.141.2.19
diff -u -p -r1.141.2.19 Makefile.inc1
--- Makefile.inc1 2001/01/22 23:26:15 1.141.2.19
+++ Makefile.inc1 2001/01/25 12:16:07
@@ -168,6 +168,8 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib \
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
+ GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \
+ GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac \
PERL5LIB=${WORLDTMP}/usr/libdata/perl/5.00503
# bootstrap-tool stage
@@ -199,7 +201,24 @@ IMAKEENV= ${CROSSENV} \
IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1
USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
- usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc
+ usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc \
+ usr/share/tmac/locale usr/share/tmac/mdoc/locale \
+ usr/share/tmac/mm \
+ usr/share/groff_font/devX100 \
+ usr/share/groff_font/devX100-12 \
+ usr/share/groff_font/devX75 \
+ usr/share/groff_font/devX75-12 \
+ usr/share/groff_font/devascii \
+ usr/share/groff_font/devcp1047 \
+ usr/share/groff_font/devdvi \
+ usr/share/groff_font/devhtml \
+ usr/share/groff_font/devkoi8-r \
+ usr/share/groff_font/devlatin1 \
+ usr/share/groff_font/devlbp \
+ usr/share/groff_font/devlj4 \
+ usr/share/groff_font/devps \
+ usr/share/groff_font/devutf8 \
+ usr/share/dict
.if ${MACHINE_ARCH} == "i386" && ${MACHINE} == "pc98"
USRDIRS+= usr/libexec/aout
@@ -222,7 +241,7 @@ buildworld:
.if !defined(NOCLEAN)
rm -rf ${WORLDTMP}
.else
- for dir in bin games include lib sbin; do \
+ for dir in bin games include lib sbin share; do \
rm -rf ${WORLDTMP}/usr/$$dir; \
done
rm -f ${WORLDTMP}/sys
@@ -512,7 +531,7 @@ _strfile= games/fortune/strfile
bootstrap-tools:
.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.sbin/config \
- gnu/usr.bin/gperf gnu/usr.bin/texinfo
+ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo
cd ${.CURDIR}/${_tool}; \
${MAKE} obj; \
${MAKE} depend; \
