diff options
| author | maya <maya@pkgsrc.org> | 2017-07-03 13:40:00 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-07-03 13:40:00 +0000 |
| commit | f40b23cc4078f45ed6bab7c46020358810df602a (patch) | |
| tree | 61e2b503730484550d7730e4d21d9372737e2a20 /math | |
| parent | e0b9ed72eea30b85bd3fa5955e8bf5f29119f30d (diff) | |
| download | pkgsrc-f40b23cc4078f45ed6bab7c46020358810df602a.tar.gz | |
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 (limited to 'math')
| -rw-r--r-- | math/octave/Makefile | 5 | ||||
| -rw-r--r-- | math/octave/PLIST | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 31a019f2322..8fce70322f6 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -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 @@ 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" diff --git a/math/octave/PLIST b/math/octave/PLIST index ee73fe3b839..70e9c9c0070 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -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/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 |