Re: pkg_create fails for math/octave

[Iain Morgan <Iain.Morgan%nasa.gov@localhost>]

On Mon, Mar 24, 2014 at 16:55:30 -0700, Iain Morgan wrote:
> On Wed, Mar 05, 2014 at 15:37:13 -0800, Iain Morgan wrote:
> > Hello,
> > 
> > With the 2013Q4 pkgsrc snapshot on SLES 11, pkg_create fails for
> > math/octave.
> > 
> > There seem to be two issues:
> > 
> >     - The PLIST file refers to charset.alias which does not exist.
> >     - There is a discrepency in the directory structure generated
> >       from the PLIST and the actual directory structure.
> > 
> > The only occurence of charset.alias under the work directory is:
> > 
> >     ./work/octave-3.6.4/libgnu/charset.alias
> > 
> > It is, indeed, missing from under work/.destdir, but I'm not sure why.
> > 
> > The discrepancy in the directory structure is in the name of a single
> > directory in the path: x86_64-unknown-linux vs.
> > x86_64-unknown-linux-gnu.
> > 
[snip]
> 
> I finally got some time to look into this issue in a little more detail.
> 
> To clarify the directory mismatch issue, the output from 
> build-aux/config.guess
> in the source distribution does not match MACHINE_GNU_PLATFORM;
> build-aux/config.guess has a trailing -gnu. I tried using :S to modify
> the variable, but that only cuased mk/plist/plist.subst.awk to ignore
> teh variable.
> 
> The other issue is due to the conditional inclusion of charset.alias,
> whereas the PLIST file unconditionally includes it. From
> lbgnu/Makefile.in, 
> 

The directory mismatch tuns out to be due to the use of the
canonical_host_type variable. Fixing it in the main distribution
Makefile.in was not sufficient, to the approach that I have taken is to
set canonical_host_type to $host_alias (instead of $host) in the
configure script.

To address the charset.alias issue, I've modified libgnu/Makefile.in to
unconditionally set need_charset_alias=true.

I've attached a patch which includes these two fixes. The changes to
distinfo (as made by bmake distinfo) are more than I expected, but the
rest should be relatively free of cruft.

-- 
Iain Morgan

? math/octave/patches/patch-libgnu_Makefile.in
Index: math/octave/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- math/octave/Makefile        12 Feb 2014 23:18:11 -0000      1.119
+++ math/octave/Makefile        26 Mar 2014 21:48:18 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.119 2014/02/12 23:18:11 tron Exp $
 
 DISTNAME=      octave-${OCTAVE_VER}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=octave/} \
                ftp://ftp.octave.org/pub/octave/ \
Index: math/octave/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/distinfo,v
retrieving revision 1.40
diff -u -r1.40 distinfo
--- math/octave/distinfo        6 Mar 2014 23:09:04 -0000       1.40
+++ math/octave/distinfo        26 Mar 2014 21:48:18 -0000
@@ -3,11 +3,12 @@
 SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
 RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
 Size (octave-3.6.4.tar.bz2) = 15627315 bytes
-SHA1 (patch-configure) = 627b8868d2cdd3c3a44e1485c8e7c47f481ca63e
+SHA1 (patch-configure) = 935f5d850fc6dbe01b4e6cc305955c8fa566df75
 SHA1 (patch-doc_interpreter_plot.txi) = 
b205f704ce625694a25ab57f4fad4460d1fbc0e9
 SHA1 (patch-doc_liboctave_liboctave.texi) = 
c53484c70adea766ba1378a1f118942c924a88a5
 SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512
 SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9
+SHA1 (patch-libgnu_Makefile.in) = 711b80fce81aa7c433774a2f39b00e2a2059e366
 SHA1 (patch-libgnu_stdio.in.h) = 20950b67577e0ff34e761b02ac15338c9cfc4cb9
 SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d
 SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515
Index: math/octave/patches/patch-configure
===================================================================
RCS file: /cvsroot/pkgsrc/math/octave/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- math/octave/patches/patch-configure 27 Oct 2013 20:35:16 -0000      1.1
+++ math/octave/patches/patch-configure 26 Mar 2014 21:48:18 -0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-configure,v 1.1 2013/10/27 20:35:16 joerg Exp $
+$NetBSD$
 
---- configure.orig     2013-10-27 16:08:37.000000000 +0000
+--- configure.orig     2013-02-21 20:21:49.000000000 +0000
 +++ configure
+@@ -5198,7 +5198,7 @@ case $host_os in *\ *) host_os=`echo "$h
+ if test -z "$host"; then
+   host=unknown
+ fi
+-canonical_host_type=$host
++canonical_host_type=$host_alias
+ if test "$host" = unknown; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: configuring Octave for 
unknown system type
+ " >&5
 @@ -33819,7 +33819,12 @@ else
  fi
          done