cvs commit: ports/textproc/pdftohtml/files patch-fofi::Makefile patch-splash::Makefile

[Jan Beich]

Erwin Lansing <erwin at FreeBSD.org> writes:

>   FreeBSD ports repository
>
>   Modified files:
>     textproc/pdftohtml/files patch-fofi::Makefile 
>                              patch-splash::Makefile 
>   Log:
>   Respect CC
[...]
>  --- fofi/Makefile
>  +++ fofi/Makefile
> @@ -10,5 +10,8 @@ $FreeBSD: /usr/local/www/cvsroot/FreeBSD
>  -CXXFLAGS =   -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir)
>  +CXXFLAGS +=   -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir)
>   
> - CXX = g++
> + CXX =? g++
>   AR = ar rc

This change has no effect, it's treated as fuzz by patch(1)
and contains a typo (`?=' vs. `=?').

  $ mv /usr/bin/g++ $HOME
  $ echo CXX=$HOME/g++ >>Makefile.local
  $ make patch PATCH_DEBUG= |& fgrep -B1 fuzz
  Patching file fofi/Makefile using Plan A...
  Hunk #1 succeeded at 14 with fuzz 2.
  $ __MAKE_CONF= make
  ===>  Building for pdftohtml-0.39_5
  cd goo; gmake
  gmake[1]: Entering directory `/usr/ports/textproc/pdftohtml/work/pdftohtml-0.39/goo'
  /home/luser/g++ -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c GHash.cc
  /home/luser/g++ -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c GList.cc
  /home/luser/g++ -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c GString.cc
  /home/luser/g++ -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c gmempp.cc
  /home/luser/g++ -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c gfile.cc
  cc -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c gmem.c
  cc -O2 -pipe -fno-strict-aliasing   -DHAVE_CONFIG_H -I.. -I.  -c parseargs.c
  rm -f libGoo.a
  ar rc libGoo.a GHash.o GList.o GString.o gmempp.o gfile.o gmem.o parseargs.o
  ranlib libGoo.a
  gmake[1]: Leaving directory `/usr/ports/textproc/pdftohtml/work/pdftohtml-0.39/goo'
  cd fofi; gmake
  gmake[1]: Entering directory `/usr/ports/textproc/pdftohtml/work/pdftohtml-0.39/fofi'
  g++ -O2 -pipe -fno-strict-aliasing -DHAVE_CONFIG_H -I.. -I./../goo -I. -c FoFiBase.cc
  gmake[1]: g++: Command not found
  gmake[1]: *** [FoFiBase.o] Error 127
  gmake[1]: Leaving directory `/usr/ports/textproc/pdftohtml/work/pdftohtml-0.39/fofi'
  gmake: *** [all] Error 2
  *** [do-build] Error code 1