CVS commit: [pkgsrc-2017Q2] pkgsrc/math/octave

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jul 15 18:43:57 UTC 2017

Modified Files:
        pkgsrc/math/octave [pkgsrc-2017Q2]: Makefile PLIST

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.151.2.1 pkgsrc/math/octave/Makefile
cvs rdiff -u -r1.29 -r1.29.6.1 pkgsrc/math/octave/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/octave/Makefile
diff -u pkgsrc/math/octave/Makefile:1.151 pkgsrc/math/octave/Makefile:1.151.2.1
--- pkgsrc/math/octave/Makefile:1.151   Sun Apr 30 01:21:50 2017
+++ pkgsrc/math/octave/Makefile Sat Jul 15 18:43:57 2017
@@ -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 @@ post-install:
 .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"

Index: pkgsrc/math/octave/PLIST
diff -u pkgsrc/math/octave/PLIST:1.29 pkgsrc/math/octave/PLIST:1.29.6.1
--- pkgsrc/math/octave/PLIST:1.29       Sat Nov 19 21:53:12 2016
+++ pkgsrc/math/octave/PLIST    Sat Jul 15 18:43:57 2017
@@ -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/xpow.h
 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