pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/octave Get rid of charset.alias. it creates confl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e44bd662bb74
branches:  trunk
changeset: 364673:e44bd662bb74
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Jul 03 13:40:00 2017 +0000

description:
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 da131f436326 -r e44bd662bb74 math/octave/Makefile
--- a/math/octave/Makefile      Mon Jul 03 13:19:49 2017 +0000
+++ b/math/octave/Makefile      Mon Jul 03 13:40:00 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.151 2017/04/30 01:21:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.152 2017/07/03 13:40:00 maya 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 da131f436326 -r e44bd662bb74 math/octave/PLIST
--- a/math/octave/PLIST Mon Jul 03 13:19:49 2017 +0000
+++ b/math/octave/PLIST Mon Jul 03 13:40:00 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.30 2017/07/03 13:40:00 maya 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



Home | Main Index | Thread Index | Old Index