Problem updating math/gri: gmake vs. pmake

[Christopher Illies]

I am trying to upgrade the unmaintained port math/gri to its latest
version.
The programm itself compiles well after aplying two small patches.
The problem starts when trying to make the gri-2.12.9/doc directory.
If the regular make is used, the following error is seen:
[...]
Making all in examples
make: don't know how to make example1.html. Stop
*** Error code 1

Stop in /usr/ports/math/gri/work/gri-2.12.9/doc.

I then switched to using gmake (USE_GMAKE= yes). This time it started
out nicely, but came to a stop later on:

Making all in examples
[...]
make html
make: don't know how to make w. Stop
gmake[1]: *** [all-local] Error 2
gmake[1]: Leaving directory `/usr/ports/math/gri/work/gri-2.12.9/doc'
gmake: *** [all-recursive] Error 1

Googleing for this error told me, that this probably has something to
do with gmake.
Interestingly, when I now, after running the make process with gmake,
cd to work/gri-2.12.9/doc and start 'make all' (not 'gmake all'), the
whole process finishes nicely.

It seems that the work/gri-2.12.9/doc/Makefile is incompatible with
both pmake and gmake, at least parts of it.
Sill, I am very unexperienced with all of this so it might very well
be something silly that I missed.
Any suggestions on how to proceed and to make this port compile are 
wellcome.

Note: Please CC me so I can respond more quickly. I get the list as 
a digest.

Thanks,

Christopher 

This is what I have done so far:
diff for math/gri/Makefile:

--- Makefile.orig       Fri May 27 15:41:56 2005
+++ Makefile    Fri May 27 15:38:18 2005
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=      gri
-PORTVERSION=   2.12.1
+PORTVERSION=   2.12.9
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ${PORTNAME}
-DISTNAME=      gri-${PORTVERSION}-arch-indep
+EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    ports at FreeBSD.org
 COMMENT=       An extensible plotting language for producing scientific graphs
@@ -19,6 +19,7 @@
 BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
 
 WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+#USE_GMAKE=    yes
 USE_PERL5_BUILD=       yes
 USE_REINPLACE= yes
 GNU_CONFIGURE= YES

These two file go in math/files/:

math/gri/files/patch-1:

--- src/gr.hh.orig      Tue Apr  6 15:17:24 2004
+++ src/gr.hh   Tue May 24 09:28:19 2005
@@ -28,7 +28,7 @@
 #if STDC_HEADERS
 #include        <stdlib.h>
 #else
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(__FreeBSD__)
 #include        <malloc.h>
 #endif                         // not MSDOS
 #endif                         // Doesn't have stdlib
@@ -357,7 +357,7 @@
 #endif
 
 // Time type (time_t, int, or long) varies per machine (ug).
-#if defined(VMS) || defined(MSDOS) || defined(IS_DEC_ALPHA) || defined(AIX)
+#if defined(VMS) || defined(MSDOS) || defined(IS_DEC_ALPHA) || defined(AIX) ||
 defined(__FreeBSD__)
 #define SECOND_TYPE time_t
 #else
 #if defined(__DECCXX)


math/gri/files/patch-2:

--- configure.orig      Tue May 24 11:22:30 2005
+++ configure   Tue May 24 11:24:35 2005
@@ -4718,7 +4718,7 @@
     else
        if test -f /usr/local/include/netcdf.h ; then
            AM_CXXFLAGS="$AM_CXXFLAGS -I/usr/local/include"
-            EXTRA_CFLAGS_TEMPLATE="$EXTRA_CFLAGS_TEMPLATE -I/opt/netcdf/include"
+            EXTRA_CFLAGS_TEMPLATE="$EXTRA_CFLAGS_TEMPLATE -I/usr/local/include"
            LIBS="$LIBS -L/usr/local/lib -lnetcdf"
             if test $gri_cv_is_sun = yes ; then
                LIBS="$LIBS -lnsl"