[pkgsrc/pkgsrc-2017Q2]: pkgsrc/math/octave Pullup ticket #5504 - requested by...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaa189aaa896
branches:  pkgsrc-2017Q2
changeset: 408639:eaa189aaa896
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jul 15 18:43:57 2017 +0000

description:
Pullup ticket #5504 - requested by maya
math/octave: build fix

Revisions pulled up:
- math/octave/Makefile                                          1.152
- math/octave/PLIST                                             1.30

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Mon Jul  3 13:40:00 UTC 2017

   Modified Files:
           pkgsrc/math/octave: Makefile PLIST

   Log Message:
   Get rid of charset.alias. it creates conflicts with other packages (gdb
   being one example), and the logic for building it is conditional, causing
   PLIST mismatches for GLIBC users.

   Reported by Jason Bacon in pkgsrc-users.
   Bump PKGREVISION

diffstat:

 math/octave/Makefile |  5 +++--
 math/octave/PLIST    |  3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r d9880819471f -r eaa189aaa896 math/octave/Makefile
--- a/math/octave/Makefile      Mon Jul 10 19:53:38 2017 +0000
+++ b/math/octave/Makefile      Sat Jul 15 18:43:57 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2017/04/30 01:21:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.151.2.1 2017/07/15 18:43:57 bsiegert Exp $
 
 DISTNAME=      octave-4.2.0
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=octave/}
 
@@ -99,6 +99,7 @@
 .for f in ${OCTAVE_DOC}
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
 .endfor
+       ${RM} -f ${DESTDIR}/${PREFIX}/lib/charset.alias
 
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff -r d9880819471f -r eaa189aaa896 math/octave/PLIST
--- a/math/octave/PLIST Mon Jul 10 19:53:38 2017 +0000
+++ b/math/octave/PLIST Sat Jul 15 18:43:57 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2016/11/19 21:53:12 maya Exp $
+@comment $NetBSD: PLIST,v 1.29.6.1 2017/07/15 18:43:57 bsiegert Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
@@ -746,7 +746,6 @@
 include/${PKGNAME}/octave/zfstream.h
 info/liboctave.info
 info/octave.info
-lib/charset.alias
 lib/octave/${PKGVERSION}/__delaunayn__.a
 lib/octave/${PKGVERSION}/__eigs__.a
 lib/octave/${PKGVERSION}/__fltk_uigetfile__.a