pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Back out last change related to moving ncurses/buildli...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f91a4d4aec3
branches:  trunk
changeset: 462214:4f91a4d4aec3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 28 09:13:55 2003 +0000

description:
Back out last change related to moving ncurses/buildlink2.mk to
curses.buildlink2.mk.  This was wrong because we _really_ do want to
express that we want _n_curses when we include the buildlink2.mk file.

We should have a better way to say that the NetBSD curses doesn't
quite work well enough.  In fact, it's far better to depend on ncurses
by default, and exceptionally note when it's okay to use NetBSD curses
for specific packages.  We will look into this again in the future.

diffstat:

 audio/aumix/Makefile             |    4 +-
 audio/cmp3/Makefile              |    4 +-
 audio/emixer/Makefile            |    4 +-
 audio/gmp3info/Makefile          |    4 +-
 audio/juke/Makefile              |    4 +-
 audio/lame/Makefile              |    4 +-
 audio/mikmod/Makefile            |    4 +-
 audio/mp3blaster/Makefile        |    4 +-
 audio/timidity/Makefile          |    4 +-
 audio/xmcd/Makefile              |    4 +-
 cad/ng-spice/Makefile            |    4 +-
 chat/bitchx/Makefile             |    4 +-
 chat/centericq/Makefile          |    4 +-
 chat/ekg/Makefile                |    4 +-
 chat/ekg/buildlink2.mk           |    4 +-
 chat/licq-gui-console/Makefile   |    4 +-
 chat/naim/Makefile               |    4 +-
 chat/tirc/Makefile               |    4 +-
 databases/abook/Makefile         |    4 +-
 devel/cdk/Makefile               |    4 +-
 devel/cdk/buildlink2.mk          |    4 +-
 devel/cmake/Makefile             |    4 +-
 devel/coconut/Makefile           |    4 +-
 devel/coconut/buildlink2.mk      |    4 +-
 devel/cscope/Makefile            |    4 +-
 devel/libslang/Makefile          |    4 +-
 devel/ncurses/buildlink2.mk      |  118 +++++++++++++++++++++++++++++++++++++++
 devel/opencm/Makefile            |    4 +-
 devel/p5-Curses/Makefile         |    4 +-
 devel/prc-tools/Makefile         |    4 +-
 devel/py-curses/Makefile         |    4 +-
 devel/py-cursespanel/Makefile    |    4 +-
 devel/tvision/Makefile           |    4 +-
 editors/bvi/Makefile             |    4 +-
 editors/ce-x11/Makefile          |    4 +-
 editors/ce/Makefile              |    4 +-
 editors/hexedit/Makefile         |    4 +-
 editors/hnb/Makefile             |    4 +-
 editors/mined/Makefile           |    4 +-
 editors/nano/Makefile            |    4 +-
 editors/pico/Makefile            |    4 +-
 editors/vile/Makefile            |    4 +-
 editors/vim-gtk/Makefile         |    4 +-
 editors/vim-gtk2/Makefile        |    4 +-
 editors/vim-kde/Makefile         |    4 +-
 editors/vim-motif/Makefile       |    4 +-
 editors/vim-xaw/Makefile         |    4 +-
 editors/vim/Makefile             |    4 +-
 editors/zile/Makefile            |    4 +-
 games/angband-x11/Makefile       |    4 +-
 games/dopewars/Makefile          |    4 +-
 games/freesci/Makefile           |    4 +-
 games/frotz/Makefile             |    4 +-
 games/gnome-games/Makefile       |    4 +-
 games/gnome-games/buildlink2.mk  |    4 +-
 games/gnome2-games/Makefile      |    4 +-
 games/gnome2-games/buildlink2.mk |    4 +-
 games/level9/Makefile            |    4 +-
 games/omega/Makefile             |    4 +-
 games/pag/Makefile               |    4 +-
 games/vms-empire/Makefile        |    4 +-
 graphics/gphoto2/Makefile        |    4 +-
 graphics/libggi/Makefile         |    4 +-
 lang/erlang/Makefile             |    4 +-
 lang/guile/Makefile              |    4 +-
 lang/guile14/Makefile            |    4 +-
 lang/mercury/Makefile            |    4 +-
 lang/nhc98/Makefile              |    4 +-
 lang/ruby-base/Makefile          |    4 +-
 lang/swi-prolog/Makefile         |    4 +-
 lang/yabasic/Makefile            |    4 +-
 mail/mutt/Makefile               |    4 +-
 mail/pine/Makefile               |    4 +-
 math/capc-calc/Makefile          |    4 +-
 math/pari/Makefile               |    4 +-
 misc/dialog/Makefile             |    4 +-
 misc/gnome-utils/Makefile        |    4 +-
 misc/gnome2-utils/Makefile       |    4 +-
 misc/iselect/Makefile            |    4 +-
 misc/multitail/Makefile          |    4 +-
 misc/pinfo/Makefile              |    4 +-
 misc/reed/Makefile               |    4 +-
 misc/siag/Makefile               |    4 +-
 misc/vfu/Makefile                |    4 +-
 mk/curses.buildlink2.mk          |  118 ---------------------------------------
 net/chrony/Makefile              |    4 +-
 net/ettercap/Makefile            |    4 +-
 net/mtr-gtk/Makefile             |    4 +-
 net/mtr/Makefile                 |    4 +-
 net/nap/Makefile                 |    4 +-
 net/ncftp3/Makefile              |    4 +-
 net/ntop/Makefile                |    4 +-
 net/scli/Makefile                |    4 +-
 net/slurm/Makefile               |    4 +-
 net/sniffit/Makefile             |    4 +-
 net/tn5250/Makefile              |    4 +-
 net/wap-utils/Makefile           |    4 +-
 print/teTeX2-bin/Makefile.common |    4 +-
 sysutils/apcupsd/Makefile        |    4 +-
 sysutils/grub/Makefile           |    4 +-
 sysutils/vifm/Makefile           |    4 +-
 sysutils/whowatch/Makefile       |    4 +-
 sysutils/wtail/Makefile          |    4 +-
 textproc/aspell/Makefile         |    4 +-
 textproc/urlview/Makefile        |    4 +-
 www/lynx-current/Makefile        |    4 +-
 www/lynx/Makefile                |    4 +-
 www/wml/Makefile                 |    4 +-
 x11/kdebase/Makefile             |    4 +-
 x11/kdebase/buildlink2.mk        |    4 +-
 110 files changed, 334 insertions(+), 334 deletions(-)

diffs (truncated from 2069 to 300 lines):

diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/aumix/Makefile
--- a/audio/aumix/Makefile      Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/aumix/Makefile      Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=      aumix-2.8
 PKGREVISION=   2
@@ -24,6 +24,6 @@
 CONFIGURE_ARGS+=       --without-gtk1
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/cmp3/Makefile
--- a/audio/cmp3/Makefile       Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/cmp3/Makefile       Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      cmp3-2.0pre5
@@ -25,5 +25,5 @@
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
        ${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/emixer/Makefile
--- a/audio/emixer/Makefile     Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/emixer/Makefile     Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      emixer-0.05.5
@@ -18,5 +18,5 @@
 post-extract:
        ${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/gmp3info/Makefile
--- a/audio/gmp3info/Makefile   Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/gmp3info/Makefile   Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=      mp3info-0.8.4
 PKGNAME=       g${DISTNAME}
@@ -20,7 +20,7 @@
 # wgetnstr()
 INCOMPAT_CURSES=       NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/juke/Makefile
--- a/audio/juke/Makefile       Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/juke/Makefile       Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      juke-0.7
@@ -34,5 +34,5 @@
        ${INSTALL_DATA} ${WRKSRC}/juke.conf ${EGDIR}/juke.conf.default
        ${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/juke/
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/lame/Makefile
--- a/audio/lame/Makefile       Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/lame/Makefile       Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/28 09:13:55 jlam Exp $
 #
 
 VERS=          3.93.1
@@ -41,5 +41,5 @@
                -finline-functions -DFLOAT=double
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/mikmod/Makefile
--- a/audio/mikmod/Makefile     Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/mikmod/Makefile     Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      mikmod-3.1.6-a
@@ -16,5 +16,5 @@
 USE_BUILDLINK2=                yes
 
 .include "../../audio/libmikmod/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/mp3blaster/Makefile
--- a/audio/mp3blaster/Makefile Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/mp3blaster/Makefile Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=      mp3blaster-3.1.3
 PKGREVISION=   3
@@ -26,6 +26,6 @@
 .endif
 
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/timidity/Makefile
--- a/audio/timidity/Makefile   Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/timidity/Makefile   Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      TiMidity++-2.11.3
@@ -21,7 +21,7 @@
 USE_BUILDLINK2=        yes
 
 .include "../../audio/libvorbis/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/xaw.buildlink2.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 audio/xmcd/Makefile
--- a/audio/xmcd/Makefile       Sun Sep 28 09:03:52 2003 +0000
+++ b/audio/xmcd/Makefile       Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/09/27 17:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.44 2003/09/28 09:13:55 jlam Exp $
 
 DISTNAME=      xmcd-3.0.2
 PKGREVISION=    3
@@ -55,7 +55,7 @@
                done;                                                   \
        fi
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/motif.buildlink2.mk"
 
diff -r 6ac658157c43 -r 4f91a4d4aec3 cad/ng-spice/Makefile
--- a/cad/ng-spice/Makefile     Sun Sep 28 09:03:52 2003 +0000
+++ b/cad/ng-spice/Makefile     Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      ng-spice-rework-14
@@ -25,6 +25,6 @@
 INFO_FILES=    ngspice.info
 
 .include "../../devel/libgetopt/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/bitchx/Makefile
--- a/chat/bitchx/Makefile      Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/bitchx/Makefile      Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:55 jlam Exp $
 #
 
 DISTNAME=      ircii-pana-1.0c19
@@ -38,7 +38,7 @@
                ${WRKSRC}/doc/BitchX.1.orig > ${WRKSRC}/doc/BitchX.1
 
 .include "../../archivers/bzip2/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/centericq/Makefile
--- a/chat/centericq/Makefile   Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/centericq/Makefile   Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=      centericq-4.9.6
@@ -40,7 +40,7 @@
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/ekg/Makefile
--- a/chat/ekg/Makefile Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/ekg/Makefile Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=      ekg-1.3
@@ -29,7 +29,7 @@
 CONFIGURE_ARGS+=--with-pthread
 .endif
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/ekg/buildlink2.mk
--- a/chat/ekg/buildlink2.mk    Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/ekg/buildlink2.mk    Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/09/28 09:13:56 jlam Exp $
 
 .if !defined(EKG_BUILDLINK2_MK)
 EKG_BUILDLINK2_MK=     # defined
@@ -12,7 +12,7 @@
 BUILDLINK_FILES.ekg=   include/libgadu*.h
 BUILDLINK_FILES.ekg+=  lib/libgadu.*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/licq-gui-console/Makefile
--- a/chat/licq-gui-console/Makefile    Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/licq-gui-console/Makefile    Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=      licq-1.2.6
@@ -20,6 +20,6 @@
 
 INCOMPAT_CURSES=       NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/naim/Makefile
--- a/chat/naim/Makefile        Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/naim/Makefile        Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=      naim-0.11.6.1
@@ -17,6 +17,6 @@
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 USE_NCURSES=           # assertion "COLOR_PAIRS >= (COLORS*COLORS)" failed: file "./win.c", line 250, function "wsetup_colors"
 
-.include "../../mk/curses.buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac658157c43 -r 4f91a4d4aec3 chat/tirc/Makefile
--- a/chat/tirc/Makefile        Sun Sep 28 09:03:52 2003 +0000
+++ b/chat/tirc/Makefile        Sun Sep 28 09:13:55 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:56 jlam Exp $
 #
 
 DISTNAME=      tirc-1.2



Home | Main Index | Thread Index | Old Index