summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgrant <grant>2003-09-27 17:07:34 +0000
committergrant <grant>2003-09-27 17:07:34 +0000
commitec387322092fd97dcf2e79ec9d5896de87f1ca54 (patch)
tree98d26898906da29a444ed0a29822dcbe33691639
parentde593d16af6c30f2f38b531fa13c888a63943e9e (diff)
downloadpkgsrc-ec387322092fd97dcf2e79ec9d5896de87f1ca54.tar.gz
move ncurses/buildlink2.mk to mk/curses.buildlink2.mk, as it provides
support for base system curses/ncurses as well as ncurses itself. suggested by wiz.
-rw-r--r--audio/aumix/Makefile4
-rw-r--r--audio/cmp3/Makefile4
-rw-r--r--audio/emixer/Makefile4
-rw-r--r--audio/gmp3info/Makefile4
-rw-r--r--audio/juke/Makefile4
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/mikmod/Makefile4
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/timidity/Makefile4
-rw-r--r--audio/xmcd/Makefile4
-rw-r--r--cad/ng-spice/Makefile4
-rw-r--r--chat/bitchx/Makefile4
-rw-r--r--chat/centericq/Makefile4
-rw-r--r--chat/ekg/Makefile4
-rw-r--r--chat/ekg/buildlink2.mk4
-rw-r--r--chat/licq-gui-console/Makefile4
-rw-r--r--chat/naim/Makefile4
-rw-r--r--chat/tirc/Makefile4
-rw-r--r--databases/abook/Makefile4
-rw-r--r--devel/cdk/Makefile4
-rw-r--r--devel/cdk/buildlink2.mk4
-rw-r--r--devel/cmake/Makefile4
-rw-r--r--devel/coconut/Makefile4
-rw-r--r--devel/coconut/buildlink2.mk4
-rw-r--r--devel/cscope/Makefile4
-rw-r--r--devel/libslang/Makefile4
-rw-r--r--devel/opencm/Makefile4
-rw-r--r--devel/p5-Curses/Makefile4
-rw-r--r--devel/prc-tools/Makefile4
-rw-r--r--devel/py-curses/Makefile4
-rw-r--r--devel/py-cursespanel/Makefile4
-rw-r--r--devel/tvision/Makefile4
-rw-r--r--editors/bvi/Makefile4
-rw-r--r--editors/ce-x11/Makefile4
-rw-r--r--editors/ce/Makefile4
-rw-r--r--editors/hexedit/Makefile4
-rw-r--r--editors/hnb/Makefile4
-rw-r--r--editors/mined/Makefile4
-rw-r--r--editors/nano/Makefile4
-rw-r--r--editors/pico/Makefile4
-rw-r--r--editors/vile/Makefile4
-rw-r--r--editors/vim-gtk/Makefile4
-rw-r--r--editors/vim-gtk2/Makefile4
-rw-r--r--editors/vim-kde/Makefile4
-rw-r--r--editors/vim-motif/Makefile4
-rw-r--r--editors/vim-xaw/Makefile4
-rw-r--r--editors/vim/Makefile4
-rw-r--r--editors/zile/Makefile4
-rw-r--r--games/angband-x11/Makefile4
-rw-r--r--games/dopewars/Makefile4
-rw-r--r--games/freesci/Makefile4
-rw-r--r--games/frotz/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnome-games/buildlink2.mk4
-rw-r--r--games/gnome2-games/Makefile4
-rw-r--r--games/gnome2-games/buildlink2.mk4
-rw-r--r--games/level9/Makefile4
-rw-r--r--games/omega/Makefile4
-rw-r--r--games/pag/Makefile4
-rw-r--r--games/vms-empire/Makefile4
-rw-r--r--graphics/gphoto2/Makefile4
-rw-r--r--graphics/libggi/Makefile4
-rw-r--r--lang/erlang/Makefile4
-rw-r--r--lang/guile/Makefile4
-rw-r--r--lang/guile14/Makefile4
-rw-r--r--lang/mercury/Makefile4
-rw-r--r--lang/nhc98/Makefile4
-rw-r--r--lang/ruby-base/Makefile4
-rw-r--r--lang/swi-prolog/Makefile4
-rw-r--r--lang/yabasic/Makefile4
-rw-r--r--mail/mutt/Makefile4
-rw-r--r--mail/pine/Makefile4
-rw-r--r--math/capc-calc/Makefile4
-rw-r--r--math/pari/Makefile4
-rw-r--r--misc/dialog/Makefile4
-rw-r--r--misc/gnome-utils/Makefile4
-rw-r--r--misc/gnome2-utils/Makefile4
-rw-r--r--misc/iselect/Makefile4
-rw-r--r--misc/multitail/Makefile4
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/reed/Makefile4
-rw-r--r--misc/siag/Makefile4
-rw-r--r--misc/vfu/Makefile4
-rw-r--r--mk/curses.buildlink2.mk (renamed from devel/ncurses/buildlink2.mk)8
-rw-r--r--net/chrony/Makefile4
-rw-r--r--net/ettercap/Makefile4
-rw-r--r--net/mtr-gtk/Makefile4
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/nap/Makefile4
-rw-r--r--net/ncftp3/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/scli/Makefile4
-rw-r--r--net/slurm/Makefile4
-rw-r--r--net/sniffit/Makefile4
-rw-r--r--net/tn5250/Makefile4
-rw-r--r--net/wap-utils/Makefile4
-rw-r--r--print/teTeX2-bin/Makefile.common4
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/grub/Makefile4
-rw-r--r--sysutils/vifm/Makefile4
-rw-r--r--sysutils/whowatch/Makefile4
-rw-r--r--sysutils/wtail/Makefile4
-rw-r--r--textproc/aspell/Makefile4
-rw-r--r--textproc/urlview/Makefile4
-rw-r--r--www/lynx-current/Makefile4
-rw-r--r--www/lynx/Makefile6
-rw-r--r--www/wml/Makefile4
-rw-r--r--x11/kdebase/Makefile4
-rw-r--r--x11/kdebase/buildlink2.mk4
109 files changed, 221 insertions, 221 deletions
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 6d0c343ffce..aa81800320e 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:50:21 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
DISTNAME= aumix-2.8
PKGREVISION= 2
@@ -24,6 +24,6 @@ CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --without-gtk1
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../x11/gtk2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 990bc8d65cb..44ea6fe9c83 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 16:30:36 martti Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
#
DISTNAME= cmp3-2.0pre5
@@ -25,5 +25,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cmp3
${INSTALL_DATA} ${WRKSRC}/cmp3rc ${PREFIX}/share/doc/cmp3/sample.cmp3rc
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
index 5151ff456f4..bee9c1585f6 100644
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/09 01:18:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:34 grant Exp $
#
DISTNAME= emixer-0.05.5
@@ -18,5 +18,5 @@ USE_BUILDLINK2= YES
post-extract:
${CP} ${FILESDIR}/Makefile ${WRKSRC}
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index c80ec902f67..be1e6fc1406 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:22:15 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:34 grant Exp $
DISTNAME= mp3info-0.8.4
PKGNAME= g${DISTNAME}
@@ -20,7 +20,7 @@ USE_X11= YES
# wgetnstr()
INCOMPAT_CURSES= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 98100f45216..e16ca5b487f 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:34 grant Exp $
#
DISTNAME= juke-0.7
@@ -34,5 +34,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/juke.conf ${EGDIR}/juke.conf.default
${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/juke/
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index c80c2ed0fc1..5052f28ad3a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/08/27 08:32:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2003/09/27 17:07:34 grant Exp $
#
VERS= 3.93.1
@@ -41,5 +41,5 @@ CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \
-finline-functions -DFLOAT=double
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index a7cfa928705..7fd21c83116 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/07/13 13:50:27 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:34 grant Exp $
#
DISTNAME= mikmod-3.1.6-a
@@ -16,5 +16,5 @@ GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
.include "../../audio/libmikmod/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index f48e4e6440e..d5d8cde581f 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/25 16:50:27 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:34 grant Exp $
DISTNAME= mp3blaster-3.1.3
PKGREVISION= 3
@@ -26,6 +26,6 @@ CONFIGURE_ARGS+= --enable-newthreads
.endif
.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 6e212d15ed4..82a5d087409 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2003/07/17 21:23:31 grant Exp $
+# $NetBSD: Makefile,v 1.41 2003/09/27 17:07:34 grant Exp $
#
DISTNAME= TiMidity++-2.11.3
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \
USE_BUILDLINK2= yes
.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/xaw.buildlink2.mk"
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 1d6dc81d857..bb77c85f866 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2003/08/30 22:51:12 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2003/09/27 17:07:34 grant Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 3
@@ -55,7 +55,7 @@ post-install:
done; \
fi
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/motif.buildlink2.mk"
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index c6484068fb4..59ce1f5137d 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/08/09 10:32:14 seb Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= ng-spice-rework-14
@@ -25,6 +25,6 @@ LIBS+= ${LIBGETOPT}
INFO_FILES= ngspice.info
.include "../../devel/libgetopt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 03a7bb1b382..0a446b2a8ae 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/13 13:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= ircii-pana-1.0c19
@@ -38,7 +38,7 @@ post-patch:
${WRKSRC}/doc/BitchX.1.orig > ${WRKSRC}/doc/BitchX.1
.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index dac26d4d777..f47d83cfc24 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/09/19 21:32:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= centericq-4.9.6
@@ -40,7 +40,7 @@ CPPFLAGS+= -DAUDIO_PLAYER=\"\\\"${SOX_PREFIX}/bin/play\\\"\"
.include "../../converters/libiconv/buildlink2.mk"
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index 573cbe1dc0a..b3993a60b33 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/16 15:16:34 adam Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= ekg-1.3
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=--without-debug
CONFIGURE_ARGS+=--with-pthread
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/pkgconfig/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
diff --git a/chat/ekg/buildlink2.mk b/chat/ekg/buildlink2.mk
index 54812a262ca..32f0c0c18a0 100644
--- a/chat/ekg/buildlink2.mk
+++ b/chat/ekg/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/22 10:41:42 adam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 17:07:35 grant Exp $
.if !defined(EKG_BUILDLINK2_MK)
EKG_BUILDLINK2_MK= # defined
@@ -12,7 +12,7 @@ BUILDLINK_PREFIX.ekg_DEFAULT= ${LOCALBASE}
BUILDLINK_FILES.ekg= include/libgadu*.h
BUILDLINK_FILES.ekg+= lib/libgadu.*
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/pkgconfig/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile
index 1ef8c682a9e..c423e9a9777 100644
--- a/chat/licq-gui-console/Makefile
+++ b/chat/licq-gui-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/22 13:49:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= licq-1.2.6
@@ -20,6 +20,6 @@ WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/console}
INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/naim/Makefile b/chat/naim/Makefile
index 4513694a37f..b481bfcbdf4 100644
--- a/chat/naim/Makefile
+++ b/chat/naim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/24 10:14:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= naim-0.11.6.1
@@ -17,6 +17,6 @@ USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_NCURSES= # assertion "COLOR_PAIRS >= (COLORS*COLORS)" failed: file "./win.c", line 250, function "wsetup_colors"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/tirc/Makefile b/chat/tirc/Makefile
index df9804e9490..bc0f414eafa 100644
--- a/chat/tirc/Makefile
+++ b/chat/tirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:26:20 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= tirc-1.2
@@ -30,5 +30,5 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/tirc
${INSTALL_DATA} ${WRKSRC}/dot.tircrc ${PREFIX}/share/tirc/tircrc
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/abook/Makefile b/databases/abook/Makefile
index 801aeb07128..00055afe7d1 100644
--- a/databases/abook/Makefile
+++ b/databases/abook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/24 07:54:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= abook-0.5.0
@@ -13,6 +13,6 @@ USE_BUILDLINK2= yes
USE_GNU_READLINE= yes
GNU_CONFIGURE= yes
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index d265c822065..405c18aac28 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/07/13 13:51:03 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= latestCDK
@@ -30,6 +30,6 @@ post-install:
${INSTALL_DATA} $${file} ${PREFIX}/share/examples/cdk/; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/autoconf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk
index 084be9e136c..3173d706d12 100644
--- a/devel/cdk/buildlink2.mk
+++ b/devel/cdk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:35 grant Exp $
.if !defined(CDK_BUILDLINK2_MK)
CDK_BUILDLINK2_MK= # defined
@@ -25,7 +25,7 @@ BUILDLINK_PREFIX.cdk= /usr
BUILDLINK_FILES.cdk= include/cdk/*.h
BUILDLINK_FILES.cdk+= lib/libcdk.*
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
BUILDLINK_TARGETS+= cdk-buildlink
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 8069f107c6e..df188966607 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 16:43:17 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= cmake-1.6.6
@@ -20,5 +20,5 @@ post-patch:
${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/Modules/FindCurses.cmake.bak > \
${WRKSRC}/Modules/FindCurses.cmake
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index db747931967..55030de5873 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:29:57 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= coconut-0.3.0
@@ -27,7 +27,7 @@ pre-configure:
.include "../../graphics/gtkglext/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/papaya/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
.include "../../net/gnet1/buildlink2.mk"
diff --git a/devel/coconut/buildlink2.mk b/devel/coconut/buildlink2.mk
index 6975e7b2836..de6d7527ade 100644
--- a/devel/coconut/buildlink2.mk
+++ b/devel/coconut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:51:05 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/09/27 17:07:35 grant Exp $
#
# This Makefile fragment is included by packages that use coconut.
#
@@ -26,7 +26,7 @@ BUILDLINK_FILES.coconut+= lib/libcoconut_gtk.*
.include "../../graphics/gtkglext/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/papaya/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
.include "../../net/gnet1/buildlink2.mk"
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index a4d3ae10434..24157e02c62 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/08/02 18:17:44 kristerw Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= cscope-15.4
@@ -27,5 +27,5 @@ LEX= ${LOCALBASE}/bin/flex
CONFIGURE_ENV+= LEX=${LEX}
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 2f4ccb442ca..00803b7572e 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/07/17 21:31:40 grant Exp $
+# $NetBSD: Makefile,v 1.44 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= slang-1.4.9
@@ -39,7 +39,7 @@ post-patch:
${WRKSRC}/src/Makefile.in.tmp && \
${MV} ${WRKSRC}/src/Makefile.in.tmp ${WRKSRC}/src/Makefile.in
-. include "../../devel/ncurses/buildlink2.mk"
+. include "../../mk/curses.buildlink2.mk"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 33eaf3d3d86..3cb0994dee6 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/08/09 10:44:47 seb Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= ${OPENCM_VERSION}-1-src
@@ -31,7 +31,7 @@ CPPFLAGS+= -D__unix__
MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q}
.include "../../devel/boehm-gc/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 30f886c0d17..552298728a3 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:43:35 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:35 grant Exp $
# FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
#
@@ -23,6 +23,6 @@ MAKE_PARAMS= PANELS
pre-configure:
@${LN} -sf ${WRKSRC}/hints/c-netbsd.ncurses.h ${WRKSRC}/c-config.h
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 018c65c6dd6..ca2ef4d5466 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:14 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= prc-tools-2.2
@@ -62,5 +62,5 @@ pre-patch:
&& ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff
.include "../../mk/autoconf.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index f506f1cab80..7ec256d8d10 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/09/14 14:16:53 recht Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $
#
PKGNAME= ${PYPKGPREFIX}-curses-0
@@ -33,5 +33,5 @@ do-patch:
.include "../../lang/python/extension.mk"
.include "../../lang/python/srcdist.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile
index 6fec0d16090..6c881d57f75 100644
--- a/devel/py-cursespanel/Makefile
+++ b/devel/py-cursespanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/09 11:50:12 recht Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
#
PKGNAME= ${PYPKGPREFIX}-cursespanel-0
@@ -32,5 +32,5 @@ do-patch:
.include "../../lang/python/extension.mk"
.include "../../lang/python/srcdist.mk"
.include "../../devel/py-curses/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 527584bff01..1ce484d2595 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= tvision-0.7
@@ -14,5 +14,5 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 73a3d2274f3..c2f9f52c2a3 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:34:21 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= bvi-1.3.0.src
@@ -16,5 +16,5 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
MAKE_ENV+= SHELL=${SH}
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile
index 49c6b425a3a..86f898265ab 100644
--- a/editors/ce-x11/Makefile
+++ b/editors/ce-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:51:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
#
.include "../ce/Makefile.common"
@@ -13,5 +13,5 @@ USE_X11= # defined
ALL_TARGET= xce
INSTALL_TARGET= install-x11 man-install-x11
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/ce/Makefile b/editors/ce/Makefile
index 4e38e796050..9a057869026 100644
--- a/editors/ce/Makefile
+++ b/editors/ce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:51:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $
#
.include "Makefile.common"
@@ -11,5 +11,5 @@ USE_BUILDLINK2= # defined
ALL_TARGET= ce
INSTALL_TARGET= install man-install
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 856bd06e4f3..56c14571acd 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/08/08 13:24:56 scw Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= hexedit-1.2.2
@@ -21,5 +21,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
.endfor
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index fda0a265092..6a276649931 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:34:30 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= hnb-1.8.1
@@ -16,6 +16,6 @@ GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
USE_GMAKE= yes
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index 51a9822c7ed..fcb96044cc4 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:44:37 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:35 grant Exp $
#
DISTNAME= mined-2000.7
@@ -15,5 +15,5 @@ USE_BUILDLINK2= yes
MAKEFILE= makefile.bsd
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index a1a354771df..e3fb6b8b95c 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 10:48:09 seb Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:35 grant Exp $
DISTNAME= nano-1.0.9
PKGREVISION= 1
@@ -16,5 +16,5 @@ USE_PKGLOCALEDIR= yes
INFO_FILES= nano.info
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 8800e093e66..bffc8171ba9 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/09/18 18:42:22 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2003/09/27 17:07:35 grant Exp $
DISTNAME= pine4.58
PKGNAME= pico-4.6
@@ -47,5 +47,5 @@ do-install:
cd ${WRKSRC}/pico && \
${INSTALL_DATA} *.h ${PREFIX}/include/pico
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index cf3ea171c7f..09a9c2e0833 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/08/08 13:31:06 agc Exp $
+# $NetBSD: Makefile,v 1.34 2003/09/27 17:07:36 grant Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/06 19:55:09 gj Exp
DISTNAME= vile-9.4
@@ -37,6 +37,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR}; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 56f0a13484c..d17748fe45e 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/07/13 13:51:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/27 17:07:36 grant Exp $
.include "../vim-share/Makefile.common"
@@ -28,7 +28,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index 44f26b8a1fa..cc6eda348b8 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:51:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $
.include "../vim-share/Makefile.common"
@@ -28,7 +28,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../x11/gtk2/buildlink2.mk"
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index be327fb89a1..089ff0864ac 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/29 16:18:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:36 grant Exp $
DISTNAME= kvim-${KVIM_VERSION}
PKGNAME= vim-kde-${KVIM_VERSION}
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-tlib=ncurses
post-configure:
${TOUCH} ${WRKSRC}/auto/configure ${WRKSRC}/auto/config.mk
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../meta-pkgs/kde3/buildlink2.mk"
.include "../../x11/kdebase3/buildlink2.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index e00e4d022f2..c93b138561c 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/13 13:51:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:36 grant Exp $
.include "../vim-share/Makefile.common"
@@ -28,7 +28,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/motif.buildlink2.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index a3bcd6d5ecf..fe04362d446 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/07/13 13:51:37 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2003/09/27 17:07:36 grant Exp $
.include "../vim-share/Makefile.common"
@@ -37,7 +37,7 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/xaw.buildlink2.mk"
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index eeacb901ac9..1e707cb5175 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/08/10 03:15:30 grant Exp $
+# $NetBSD: Makefile,v 1.48 2003/09/27 17:07:36 grant Exp $
.include "../vim-share/Makefile.common"
@@ -24,5 +24,5 @@ post-install:
${LN} -s vim ${PREFIX}/bin/$$f; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index aa07c51611e..4ea917c5703 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/08/09 10:48:10 seb Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/27 17:07:36 grant Exp $
DISTNAME= zile-1.6.2
PKGREVISION= 1
@@ -15,5 +15,5 @@ USE_BUILDLINK2= yes
USE_MAKEINFO= YES
INFO_FILES= zile.info
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index add23d2b101..1b8e03ccdc0 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/09/17 19:40:23 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= angband-3.0.3
@@ -36,5 +36,5 @@ post-install:
${CHOWN} -R bin:games ${PREFIX}/share/games/angband
${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \;
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index f739c46552f..57add819b48 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/07/18 18:04:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:36 grant Exp $
DISTNAME= dopewars-1.5.9
PKGREVISION= 2
@@ -30,5 +30,5 @@ USE_NCURSES= # KEY_RESIZE
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index ca1263d39d1..9fe44bddddd 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/16 18:27:30 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= freesci-0.3.4a
@@ -21,7 +21,7 @@ post-install:
.include "../../devel/SDL/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
#.include "../../mk/motif.buildlink2.mk"
#.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 251e6bc7708..30a0d8a2647 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/13 13:51:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= frotz-2.43
@@ -31,6 +31,6 @@ do-install:
${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 464ae9fc82b..716bd71a0c3 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2003/07/17 21:38:31 grant Exp $
+# $NetBSD: Makefile,v 1.55 2003/09/27 17:07:36 grant Exp $
DISTNAME= gnome-games-1.4.0.4
PKGREVISION= 7
@@ -65,7 +65,7 @@ post-install:
${LN} -s same-gnome ${PREFIX}/share/gnome/help/samegnome
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
# Required for ports which don't build "libgtop".
.include "../../lang/guile/buildlink2.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/games/gnome-games/buildlink2.mk b/games/gnome-games/buildlink2.mk
index 5346fefcc22..de31903217c 100644
--- a/games/gnome-games/buildlink2.mk
+++ b/games/gnome-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:47 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $
#
# This Makefile fragment is included by packages that use gnome-games.
#
@@ -20,7 +20,7 @@ BUILDLINK_FILES.gnome-games+= lib/gnome-stones/objects/libgnomekoban.*
BUILDLINK_FILES.gnome-games+= lib/libgdkcardimage.*
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/guile14/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2cad96f284d..31f500c18e4 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/09/03 03:47:01 jmc Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:36 grant Exp $
DISTNAME= gnome-games-2.2.1
PKGREVISION= 4
@@ -67,7 +67,7 @@ GCONF2_SCHEMAS+= same-gnome.schemas
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/libgnome/buildlink2.mk"
.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/guile/buildlink2.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome2-games/buildlink2.mk b/games/gnome2-games/buildlink2.mk
index d979be5896b..a756429d9a1 100644
--- a/games/gnome2-games/buildlink2.mk
+++ b/games/gnome2-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:47 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $
#
# This Makefile fragment is included by packages that use gnome-games.
#
@@ -20,7 +20,7 @@ BUILDLINK_FILES.gnome-games+= lib/gnome-stones/objects/libgnomekoban.*
BUILDLINK_FILES.gnome-games+= lib/libgdkcardimage.*
.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/guile14/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
diff --git a/games/level9/Makefile b/games/level9/Makefile
index 17421676c6a..95ecd658376 100644
--- a/games/level9/Makefile
+++ b/games/level9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/24 23:04:09 dillo Exp $
+# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= Level9_3.0_Source
@@ -24,5 +24,5 @@ do-install:
${INSTALL_DATA} ${WRKDIR}/level9.txt ${PREFIX}/share/doc/level9
${INSTALL_PROGRAM} ${WRKSRC}/level9 ${PREFIX}/bin
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/omega/Makefile b/games/omega/Makefile
index b9962809c35..5bdbfe6cd8a 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/19 23:08:23 dent Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:36 grant Exp $
DISTNAME= omega-0.90-pa4
PKGNAME= omega-0.90.4
@@ -37,5 +37,5 @@ post-install:
${INSTALL_DATA} $${file} ${PREFIX}/share/doc/omega; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/pag/Makefile b/games/pag/Makefile
index 3260dc015cd..25601efb4ac 100644
--- a/games/pag/Makefile
+++ b/games/pag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= pag-0.91
@@ -16,6 +16,6 @@ USE_NCURSES= yes # missing function stdscr
ALL_TARGET= compile
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/aalib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/vms-empire/Makefile b/games/vms-empire/Makefile
index ffacdbeb750..ad53136f3e2 100644
--- a/games/vms-empire/Makefile
+++ b/games/vms-empire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:51:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= vms-empire-1.4
@@ -16,5 +16,5 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/vms-empire ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/man/man6/vms-empire.6
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 1662ff86aef..df738d72cf6 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:51:44 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= gphoto2-2.1.1
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --without-readline
.include "../../devel/cdk/buildlink2.mk"
.include "../../devel/libgphoto2/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/pkgconfig/buildlink2.mk"
.include "../../devel/popt/buildlink2.mk"
.include "../../graphics/aalib/buildlink2.mk"
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index fd7d03ddf16..e12a808348b 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:41:32 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:36 grant Exp $
#
DISTNAME= libggi-2.0.3.src
@@ -44,7 +44,7 @@ PLIST_SRC= ${PKGDIR}/PLIST.dga
PLIST_SRC+= ${PKGDIR}/PLIST
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/libgii/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 59e5e99c80a..e8efc2f7067 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/09/11 03:42:02 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:36 grant Exp $
DISTNAME= otp_src_R9C-0
PKGNAME= erlang-9.2
@@ -20,7 +20,7 @@ USE_JAVA= yes
USE_JAVA2= yes
.include "../../security/openssl/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/java-vm.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 2dc5a98be69..ff441fed05c 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/08/09 10:59:08 seb Exp $
+# $NetBSD: Makefile,v 1.45 2003/09/27 17:07:36 grant Exp $
DISTNAME= guile-1.6.3
#PKGREVISION= 1
@@ -27,6 +27,6 @@ USE_MAKEINFO= YES
INFO_FILES= guile.info guile-tut.info goops.info r5rs.info
.include "../../devel/libtool/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index c939409181d..125c9dff2f3 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 10:59:12 seb Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/27 17:07:36 grant Exp $
DISTNAME= guile-1.4.1
PKGNAME= guile14-1.4.1
@@ -29,7 +29,7 @@ INFO_FILES= guile.info
CFLAGS+= ${PTHREAD_CFLAGS}
.include "../../devel/libtool/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index ae7dd6f2fd3..4eb368c927e 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/09 10:59:10 seb Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:36 grant Exp $
DISTNAME= mercury-compiler-0.11.0
PKGNAME= mercury-0.11.0
@@ -38,5 +38,5 @@ do-install:
cd ${WRKSRC}/samples && ${PAX} -rw . ${PREFIX}/share/examples/mercury
.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 360a884c402..95951d177ed 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 21:44:59 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:37 grant Exp $
DISTNAME= nhc98src-1.16
PKGNAME= nhc98-1.16
@@ -35,5 +35,5 @@ PLIST_SUBST+= HARCH=${HARCH}
post-extract:
@${FIND} ${WRKSRC}/docs -type d -name \*CVS\* | ${XARGS} ${RM} -rf
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index fe7a5db5080..3560e807c4e 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:54:06 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:37 grant Exp $
# FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
DISTNAME= ${RUBY_DISTNAME}
@@ -104,5 +104,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
.endfor
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index a79243537ff..cadbc45b39a 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:45:28 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:37 grant Exp $
DISTNAME= pl-lite-5.0.10
PKGNAME= swi-prolog-5.0.10
@@ -33,6 +33,6 @@ PLIST_SUBST+= BITS=64
PLIST_SUBST+= BITS=32
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index a4214406dd6..801cba98afa 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:52:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:37 grant Exp $
DISTNAME= yabasic-2.722
PKGREVISION= 1
@@ -18,5 +18,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/yabasic.htm \
${PREFIX}/share/doc/html/yabasic
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 70a2fc5d810..c90d5e1104b 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2003/09/25 08:36:16 grant Exp $
+# $NetBSD: Makefile,v 1.103 2003/09/27 17:07:37 grant Exp $
DISTNAME= mutt-1.4.1i
PKGNAME= ${DISTNAME:C/i$//}
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --with-slang=${BUILDLINK_PREFIX.libslang}
. if ${MUTT_USE_NCURSES} == YES
USE_NCURSES= yes
. endif
-. include "../../devel/ncurses/buildlink2.mk"
+. include "../../mk/curses.buildlink2.mk"
CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses}
.endif
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 2ac1c832309..5626fa95939 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2003/09/18 18:42:25 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2003/09/27 17:07:37 grant Exp $
DISTNAME= pine4.58
PKGNAME= pine-4.58
@@ -87,7 +87,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../editors/pico/buildlink2.mk"
.include "../../mail/imap-uw/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 21ef34584dc..702ef2bfa7d 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/08/30 23:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= calc-2.11.8
@@ -13,6 +13,6 @@ COMMENT= C arbitrary precision calculator
USE_BUILDLINK2= # defined
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 928552636e9..2f466d13cb1 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/21 16:57:14 martti Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $
DISTNAME= pari-2.1.5
PKGREVISION= 1
@@ -26,7 +26,7 @@ CONFIGURE_ENV+= X11BASE=${X11BASE}
TEST_TARGET= test-compat bench
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 2a2ecad602c..f7798e03404 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 21:48:52 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:37 grant Exp $
DISTNAME= dialog-0.6z
PKGREVISION= 2
@@ -27,5 +27,5 @@ post-install:
${INSTALL_SCRIPT} $${file} ${EGDIR}; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index dfb604f09de..590ed568e7d 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2003/07/17 21:49:02 grant Exp $
+# $NetBSD: Makefile,v 1.64 2003/09/27 17:07:37 grant Exp $
DISTNAME= gnome-utils-1.4.1.2
PKGREVISION= 4
@@ -33,7 +33,7 @@ CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
.include "../../devel/gnome-objc/buildlink2.mk"
.include "../../devel/libglade/buildlink2.mk"
.include "../../devel/libgtop/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
#.include "../../lang/guile14/buildlink2.mk" # XXX: req. guile1[46] fix first
.include "../../www/gtkhtml/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 83f4d1e34cb..8451134c364 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/23 15:36:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= gnome-utils-2.2.1
@@ -32,7 +32,7 @@ GCONF2_SCHEMAS+= gdict.schemas
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/libgnome/buildlink2.mk"
.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/guile/buildlink2.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink2.mk"
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index b5f4cff36c5..6e73449fecd 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:49:12 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= iselect-1.2.0
@@ -16,5 +16,5 @@ GNU_CONFIGURE= # defined
post-configure:
touch ${WRKSRC}/config_ac.h.in
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index c9ee1624917..67aff1b876b 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:01:19 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= multitail-2.4
@@ -17,5 +17,5 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/multitail ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/multitail.1 ${PREFIX}/man/man1/
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index a6463ef2053..742b3bfbe47 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 11:14:07 seb Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= pinfo-0.6.1
@@ -34,7 +34,7 @@ post-install:
.if defined(PINFO_USE_NATIVE_CURSES) && ${PINFO_USE_NATIVE_CURSES} == "YES"
CONFIGURE_ARGS+= --with-vcurses
.else
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.ncurses}
.endif
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index 67736541452..50429f5ea2a 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:01:26 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:37 grant Exp $
DISTNAME= reed-5.4
PKGREVISION= 1
@@ -29,5 +29,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/reed
${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/reed/
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 420f1ebbdab..1e07c049660 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 21:49:55 grant Exp $
+# $NetBSD: Makefile,v 1.37 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= siag-3.5.7
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
CONFIGURE_ARGS+=--with-xawm=Xaw
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/guile14/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
.include "../../x11/mowitz/buildlink2.mk"
diff --git a/misc/vfu/Makefile b/misc/vfu/Makefile
index 60b0f4cecbc..07b12ab6463 100644
--- a/misc/vfu/Makefile
+++ b/misc/vfu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/07/17 21:50:01 grant Exp $
+# $NetBSD: Makefile,v 1.32 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= vfu-3.04
@@ -36,6 +36,6 @@ post-install:
cd ${WRKSRC}; \
${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfu.conf
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ncurses/buildlink2.mk b/mk/curses.buildlink2.mk
index 5e8700a23d9..cdf191e5a73 100644
--- a/devel/ncurses/buildlink2.mk
+++ b/mk/curses.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2003/09/27 10:27:39 grant Exp $
+# $NetBSD: curses.buildlink2.mk,v 1.1 2003/09/27 17:07:34 grant Exp $
#
# Optionally define:
#
@@ -6,8 +6,8 @@
# INCOMPAT_CURSES specify MACHINE_PLATFORM versions that are missing
# some needed functions.
-.if !defined(NCURSES_BUILDLINK2_MK)
-NCURSES_BUILDLINK2_MK= # defined
+.if !defined(CURSES_BUILDLINK2_MK)
+CURSES_BUILDLINK2_MK= # defined
.include "../../mk/bsd.prefs.mk"
@@ -115,4 +115,4 @@ ncurses-curses-h:
${LN} -s ${BUILDLINK_PREFIX.ncurses}/include/ncurses.h ${BUILDLINK_DIR}/include/curses.h; \
fi
-.endif # NCURSES_BUILDLINK2_MK
+.endif # CURSES_BUILDLINK2_MK
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index eba49134c83..ab2caf55d69 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:51:03 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:37 grant Exp $
DISTNAME= chrony-1.17
PKGREVISION= 1
@@ -33,5 +33,5 @@ post-install:
done
.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 162be6d4b6f..172b3bb483d 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:52:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $
DISTNAME= ettercap-0.6.9
PKGREVISION= 3
@@ -22,6 +22,6 @@ MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
BUILD_DIRS= ${WRKSRC} ${WRKSRC}/plugins
INSTALL_DIRS= ${WRKSRC} ${WRKSRC}/plugins
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 4f24fe5c545..e33588e6778 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:51:24 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= mtr-0.54
@@ -23,7 +23,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 7a9b977131c..3cc8a9f747a 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/07/17 22:51:23 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/09/27 17:07:37 grant Exp $
#
DISTNAME= mtr-0.54
@@ -22,5 +22,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/nap/Makefile b/net/nap/Makefile
index afedaa1acf3..bd4f7710239 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/09 01:08:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/27 17:07:37 grant Exp $
DISTNAME= nap-1.4.4
PKGREVISION= 1
@@ -22,5 +22,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/nap.conf.dist \
${PREFIX}/share/examples/nap/nap.conf
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index 9fdc28fb835..7660ff26843 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:51:25 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:37 grant Exp $
DISTNAME= ncftp-3.0.3-src
PKGNAME= ncftp3-3.0.3
@@ -19,5 +19,5 @@ post-patch:
@${SED} -e "s:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:" \
< ${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 4f26e477298..0020a18ef17 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/21 17:10:58 martti Exp $
+# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:37 grant Exp $
DISTNAME= ntop-1.1
PKGREVISION= 2
@@ -17,6 +17,6 @@ CONFIGURE_ARGS+= --enable-threads=no
INSTALL_TARGET= install install-man
.include "../../net/libpcap/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/scli/Makefile b/net/scli/Makefile
index d951c692cc2..b28babe87dd 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/09 11:16:24 seb Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= scli-0.2.12
@@ -31,5 +31,5 @@ LDFLAGS+= -L${BUILDLINK_PREFIX.${_p_}}/lib
.include "../../devel/readline/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index 707fd0bfa32..ea5f457d520 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:53:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= slurm-0.2.1
@@ -19,5 +19,5 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index c7f0e5e0f13..c25007f6d08 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 22:51:52 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= sniffit.0.3.5
@@ -23,5 +23,5 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index dcc61e84be3..e39d8171152 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:51:56 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= tn5250-0.12.51
@@ -13,5 +13,5 @@ COMMENT= Implementation of the IBM 5250 telnet protocol
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile
index b794714c6bd..1576ac3a1bc 100644
--- a/net/wap-utils/Makefile
+++ b/net/wap-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= ap-utils-1.3.2
@@ -17,5 +17,5 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_NCURSES= # redrawwin()
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/teTeX2-bin/Makefile.common b/print/teTeX2-bin/Makefile.common
index 930654e9ac9..7275edeb1db 100644
--- a/print/teTeX2-bin/Makefile.common
+++ b/print/teTeX2-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2003/07/30 10:41:26 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/09/27 17:07:38 grant Exp $
TETEX_BIN_VERS= 2.0.2
DIST_SUBDIR= teTeX
@@ -59,4 +59,4 @@ OWN_DIRS_PERMS+= ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
.include "../../graphics/png/buildlink2.mk"
.include "../../fonts/t1lib/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 09e759c6d51..1585482a94f 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/17 22:53:27 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/09/27 17:07:38 grant Exp $
DISTNAME= apcupsd-3.8.6
PKGREVISION= 1
@@ -23,7 +23,7 @@ PKG_SYSCONFSUBDIR= apcupsd
# which has a curses interface
#
#CONFIGURE_ARGS+= --enable-http # include http support
-#.include "../../devel/ncurses/buildlink2.mk"
+#.include "../../mk/curses.buildlink2.mk"
#CONFIGURE_ARGS+= --enable-threads # compile threading code
#CONFIGURE_ARGS+= --enable-powerflute # compile powerflute program
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index b25ced8e33a..79825b41d40 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 11:25:13 seb Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= grub-0.93
@@ -42,5 +42,5 @@ CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
.endif
.include "../../devel/binutils/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index fe7a9161e4e..b0b8f6f27ca 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:24 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= vifm-0.1
@@ -23,6 +23,6 @@ pre-configure:
${WRKSRC}/src/vifmrc0.1 > ${WRKSRC}/src/vifmrc0.1.new && \
${MV} ${WRKSRC}/src/vifmrc0.1.new ${WRKSRC}/src/vifmrc0.1
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index 9dfafc0c182..c1145833c7c 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:24:44 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= whowatch-1.4
@@ -14,5 +14,5 @@ COMMENT= Interactive who-like program displaying real-time user information
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile
index 19ce830881a..ed53a74071b 100644
--- a/sysutils/wtail/Makefile
+++ b/sysutils/wtail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/08/28 20:05:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= wtail-0.2.2
@@ -14,5 +14,5 @@ USE_BUILDLINK2= YES
MAKE_ENV+= SED="${SED}"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 870a5ed1f49..24c91dd5a04 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/19 10:55:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= aspell-0.50.3
@@ -32,5 +32,5 @@ REPLACE_PERL= scripts/aspell-import
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/aspell
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 4528a25ab66..330ccb6079d 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:27:54 martti Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:38 grant Exp $
DISTNAME= urlview-0.9
PKGREVISION= 1
@@ -14,5 +14,5 @@ COMMENT= Extract URLs from text files and display them in a menu
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index e06526fd65b..58e6a66fb4d 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2003/07/17 22:55:41 grant Exp $
+# $NetBSD: Makefile,v 1.46 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= lynx2.8.5dev.7
@@ -66,7 +66,7 @@ post-install:
. include "../../devel/libslang/buildlink2.mk"
.elif (${LYNX_SCREEN_LIB} == ncurses)
USE_NCURSES= color
-. include "../../devel/ncurses/buildlink2.mk"
+. include "../../mk/curses.buildlink2.mk"
CONFIGURE_ARGS+= --enable-color-style
.elif (${LYNX_SCREEN_LIB} == curses)
. if ${MACHINE_PLATFORM:MNetBSD-1.5*-i386} != ""
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 33fb09552c3..2251177a8ff 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2003/09/14 19:03:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.59 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= lynx2.8.4rel.1
@@ -78,7 +78,7 @@ post-install:
. include "../../devel/libslang/buildlink2.mk"
.elif (${LYNX_SCREEN_LIB} == ncurses)
USE_NCURSES= color
-. include "../../devel/ncurses/buildlink2.mk"
+. include "../../mk/curses.buildlink2.mk"
CONFIGURE_ARGS+= --enable-color-style
.elif (${LYNX_SCREEN_LIB} != curses)
pre-configure:
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+= --with-socks5
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/zlib/buildlink2.mk"
.include "../../security/openssl/buildlink2.mk"
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 8e114f7726c..82b99f39b43 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:38 grant Exp $
#
DISTNAME= wml-2.0.3
@@ -42,6 +42,6 @@ post-install:
${MV} $${i}.7 $${i}.0 ; \
done
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index cf2dfed954b..0c6d29fe3f3 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2003/07/17 22:56:34 grant Exp $
+# $NetBSD: Makefile,v 1.92 2003/09/27 17:07:38 grant Exp $
# FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
DISTNAME= kdebase-1.1.2
@@ -95,7 +95,7 @@ post-install:
# Make template links writeable, to prevent "Permission denied"
${CHMOD} u+w ${PREFIX}/share/kde/apps/kfm/Desktop/Templates/*.kdelnk
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
# kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
# often do, so put the dependency here.
.include "../../graphics/libungif/buildlink2.mk"
diff --git a/x11/kdebase/buildlink2.mk b/x11/kdebase/buildlink2.mk
index 6baaabefffc..1b1fd616e71 100644
--- a/x11/kdebase/buildlink2.mk
+++ b/x11/kdebase/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:54:23 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:38 grant Exp $
#
.if !defined(KDEBASE_BUILDLINK2_MK)
@@ -146,7 +146,7 @@ BUILDLINK_FILES.kdebase+= lib/libkimgio.*
BUILDLINK_FILES.kdebase+= lib/libkspell.*
BUILDLINK_FILES.kdebase+= lib/libmediatool.*
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../mk/curses.buildlink2.mk"
.include "../../graphics/libungif/buildlink2.mk"
.include "../../graphics/MesaLib/buildlink2.mk"
.include "../../graphics/glu/buildlink2.mk"