diff options
| author | wiz <wiz@pkgsrc.org> | 2001-04-02 18:43:15 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-04-02 18:43:15 +0000 |
| commit | 349f4ef92a667b8ca051014dc79d52b41258e328 (patch) | |
| tree | 4db9129da1a3fe4d92e53e7a9b5ccd9b328f0fa0 /math | |
| parent | 75ac02572e0f523cf72529a610e4eb01986fadbc (diff) | |
| download | pkgsrc-349f4ef92a667b8ca051014dc79d52b41258e328.tar.gz | |
Remove CONFLICT with octave-2.* since they have the same PKGNAME.
Replace file by f for fewer pkglint warnings.
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave-current/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index ea4acb26a0e..733763710df 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/03/29 21:19:39 wennmach Exp $ +# $NetBSD: Makefile,v 1.4 2001/04/02 18:43:15 wiz Exp $ DISTNAME= octave-2.1.33 CATEGORIES= math @@ -17,8 +17,6 @@ BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot DEPENDS+= readline>=4.0:../../devel/readline -CONFLICTS+= octave-2.0.* - USE_X11= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -41,16 +39,16 @@ OCTAVE_HTML= faq/Octave-FAQ_toc.html interpreter/octave_*.html \ liboctave/liboctave_*.html post-install: -.for file in ${LIBOCTAVE_INFO} - ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/${file} ${PREFIX}/info +.for f in ${LIBOCTAVE_INFO} + ${INSTALL_DATA} ${WRKSRC}/doc/liboctave/$f ${PREFIX}/info .endfor - ${MKDIR} ${PREFIX}/share/doc/octave -.for file in ${OCTAVE_DOC} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/octave + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/octave +.for f in ${OCTAVE_DOC} + ${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/octave .endfor - ${MKDIR} ${PREFIX}/share/doc/html/octave -.for file in ${OCTAVE_HTML} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/html/octave + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/octave +.for f in ${OCTAVE_HTML} + ${INSTALL_DATA} ${WRKSRC}/doc/$f ${PREFIX}/share/doc/html/octave .endfor .include <../../mk/bsd.pkg.mk> |