Re: pkg/45318: [PATCH] lang/nhc98: DESTDIR support and version update

[David Holland <dholland-pbugs%netbsd.org@localhost>]

The following reply was made to PR pkg/45318; it has been noted by GNATS.

From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/45318: [PATCH] lang/nhc98: DESTDIR support and version update
Date: Sat, 2 Nov 2013 18:50:05 +0000

 ok, divergences of this patch from what's been committed:
 
  > +LICENSE=           gnu-gpl-v2 AND gnu-lgpl-v2.1 AND modified-bsd
 
 This is wrong - the package's own license is not (just) a modified-bsd
 and the combination with the other bits is more complex than just AND.
 It really needs its own nhc98-license.
 
  > +CONFIGURE_ARGS+=   --buildwith=gcc --hostcc=gcc --installdir=${PREFIX} \
  >                     +docs --docdir=${PREFIX}/share/doc/nhc98
 
 I don't have --hostcc=gcc. Is this needed?
 
  > -BUILD_TARGET=              default
 
 Will merge this.
 
  > +SUBST_CLASSES+=            fix-cc
  > +SUBST_STAGE.fix-cc=        post-configure
  > +SUBST_MESSAGE.fix-cc=      Fixing c compiler name.
  > +SUBST_FILES.fix-cc=        lib/*/config
  > +SUBST_SED.fix-cc=  -e 's,CC=cc,CC=gcc,g'
 
 Not sure that this is needed.
 
  > Index: patches/patch-aa
  > ===================================================================
  > RCS file: patches/patch-aa
  > diff -N patches/patch-aa
  > --- patches/patch-aa        12 May 2005 17:53:29 -0000      1.7
  > +++ /dev/null       1 Jan 1970 00:00:00 -0000
 
 That patch (or at least most of it) was still needed. The package
 needs to honor pkgsrc LDFLAGS or the rpaths for curses and readline
 won't get set right on some platforms.
 
  > Index: patches/patch-ab
  > ===================================================================
  > RCS file: patches/patch-ab
  > diff -N patches/patch-ab
  > --- patches/patch-ab        24 Jun 2005 23:58:18 -0000      1.3
  > +++ /dev/null       1 Jan 1970 00:00:00 -0000
 
 That patch still applies and still seems pertinent.
 
  > Index: patches/patch-src_libraries_base_include_HsBase.h
  > ===================================================================
  > RCS file: patches/patch-src_libraries_base_include_HsBase.h
  > diff -N patches/patch-src_libraries_base_include_HsBase.h
  > --- /dev/null       1 Jan 1970 00:00:00 -0000
  > +++ patches/patch-src_libraries_base_include_HsBase.h       31 Aug 2011 
12:23:49 -0000
  > @@ -0,0 +1,24 @@
  > +$NetBSD$
  > +
  > +* Fix pre-processor syntax for modern gcc:s
  > +
  > +--- src/libraries/base/include/HsBase.h.orig       2009-08-09 
03:02:00.000000000 +0000
  > ++++ src/libraries/base/include/HsBase.h
  > +@@ -72,7 +72,7 @@
  > + #  if HAVE_SYS_TIME_H
  > + #   include <sys/time.h>
  > + #  endif
  > +-#elif HAVE_GETCLOCK
  > ++#elif defined(HAVE_GETCLOCK)
  > + # if HAVE_SYS_TIMERS_H
  > + #  define POSIX_4D9 1
  > + #  include <sys/timers.h>
  > +@@ -101,7 +101,7 @@
  > + #endif
  > + #if HAVE_INTTYPES_H
  > + # include <inttypes.h>
  > +-#elif HAVE_STDINT_H
  > ++#elif defined(HAVE_STDINT_H)
  > + # include <stdint.h>
  > + #endif
  > + 
 
 ...this seems wrong. And, why change only some of the HAVE_* tests?
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost