diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-28 09:13:55 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-28 09:13:55 +0000 |
| commit | 2208a6acf9c4762c5094c7a32b330edbae677600 (patch) | |
| tree | b1a9b04306449cc38e3d4129edeafafaad1022c1 | |
| parent | 5334ed437bd19170c839b8c6e12d15837f88ce60 (diff) | |
| download | pkgsrc-2208a6acf9c4762c5094c7a32b330edbae677600.tar.gz | |
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.
109 files changed, 220 insertions, 220 deletions
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile index aa81800320e..49a5835b594 100644 --- a/audio/aumix/Makefile +++ b/audio/aumix/Makefile @@ -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+= --enable-nls 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 --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile index 44ea6fe9c83..875f8e18a9a 100644 --- a/audio/cmp3/Makefile +++ b/audio/cmp3/Makefile @@ -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 @@ do-install: ${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 --git a/audio/emixer/Makefile b/audio/emixer/Makefile index bee9c1585f6..2a6f9b0cd5b 100644 --- a/audio/emixer/Makefile +++ b/audio/emixer/Makefile @@ -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 @@ USE_BUILDLINK2= YES post-extract: ${CP} ${FILESDIR}/Makefile ${WRKSRC} -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile index be1e6fc1406..9e2b8ec650b 100644 --- a/audio/gmp3info/Makefile +++ b/audio/gmp3info/Makefile @@ -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 @@ USE_X11= YES # 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 --git a/audio/juke/Makefile b/audio/juke/Makefile index e16ca5b487f..168067d0d72 100644 --- a/audio/juke/Makefile +++ b/audio/juke/Makefile @@ -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 @@ post-install: ${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 --git a/audio/lame/Makefile b/audio/lame/Makefile index 5052f28ad3a..4d4885a1f79 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -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 @@ CFLAGS+= -O2 -Wall -fomit-frame-pointer -ffast-math -funroll-loops \ -finline-functions -DFLOAT=double .endif -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index 7fd21c83116..950f1ceabbe 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -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 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes .include "../../audio/libmikmod/buildlink2.mk" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index d5d8cde581f..e596f3c9d98 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -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 @@ CONFIGURE_ARGS+= --enable-newthreads .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 --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 82a5d087409..588972dbeba 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -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 @@ CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \ 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 --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index bb77c85f866..7212e2a80be 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -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 @@ post-install: done; \ fi -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 59ce1f5137d..0e9375a00ee 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -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 @@ LIBS+= ${LIBGETOPT} 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 --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile index 0a446b2a8ae..a7688438d91 100644 --- a/chat/bitchx/Makefile +++ b/chat/bitchx/Makefile @@ -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 @@ post-patch: ${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 --git a/chat/centericq/Makefile b/chat/centericq/Makefile index f47d83cfc24..dacbda193df 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -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 @@ CPPFLAGS+= -DAUDIO_PLAYER=\"\\\"${SOX_PREFIX}/bin/play\\\"\" .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 --git a/chat/ekg/Makefile b/chat/ekg/Makefile index b3993a60b33..f8b8bd7a891 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -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+=--without-debug 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 --git a/chat/ekg/buildlink2.mk b/chat/ekg/buildlink2.mk index 32f0c0c18a0..5bc3063dec3 100644 --- a/chat/ekg/buildlink2.mk +++ b/chat/ekg/buildlink2.mk @@ -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_PREFIX.ekg_DEFAULT= ${LOCALBASE} 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 --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile index c423e9a9777..19fcd844ae6 100644 --- a/chat/licq-gui-console/Makefile +++ b/chat/licq-gui-console/Makefile @@ -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 @@ WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/console} 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 --git a/chat/naim/Makefile b/chat/naim/Makefile index b481bfcbdf4..13bf3db25d9 100644 --- a/chat/naim/Makefile +++ b/chat/naim/Makefile @@ -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 @@ USE_LIBTOOL= YES 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 --git a/chat/tirc/Makefile b/chat/tirc/Makefile index bc0f414eafa..289c13c6415 100644 --- a/chat/tirc/Makefile +++ b/chat/tirc/Makefile @@ -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 @@ -30,5 +30,5 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/tirc ${INSTALL_DATA} ${WRKSRC}/dot.tircrc ${PREFIX}/share/tirc/tircrc -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/abook/Makefile b/databases/abook/Makefile index 00055afe7d1..20f3cf85888 100644 --- a/databases/abook/Makefile +++ b/databases/abook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= abook-0.5.0 @@ -13,6 +13,6 @@ USE_BUILDLINK2= yes USE_GNU_READLINE= yes GNU_CONFIGURE= yes -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index 405c18aac28..b30bb7aa050 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.22 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= latestCDK @@ -30,6 +30,6 @@ post-install: ${INSTALL_DATA} $${file} ${PREFIX}/share/examples/cdk/; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdk/buildlink2.mk b/devel/cdk/buildlink2.mk index 3173d706d12..928bbd85a58 100644 --- a/devel/cdk/buildlink2.mk +++ b/devel/cdk/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" BUILDLINK_TARGETS+= cdk-buildlink diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index df188966607..8d2af6a3a97 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.7 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index 55030de5873..a122eec3b84 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 de6d7527ade..0546b22c11e 100644 --- a/devel/coconut/buildlink2.mk +++ b/devel/coconut/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 24157e02c62..917b2c6306e 100644 --- a/devel/cscope/Makefile +++ b/devel/cscope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.29 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= cscope-15.4 @@ -27,5 +27,5 @@ LEX= ${LOCALBASE}/bin/flex CONFIGURE_ENV+= LEX=${LEX} -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 00803b7572e..de72b2e7b17 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.45 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +. include "../../devel/ncurses/buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/mk/curses.buildlink2.mk b/devel/ncurses/buildlink2.mk index cdf191e5a73..295c136e41f 100644 --- a/mk/curses.buildlink2.mk +++ b/devel/ncurses/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.buildlink2.mk,v 1.1 2003/09/27 17:07:34 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2003/09/28 09:13:55 jlam Exp $ # # Optionally define: # @@ -6,8 +6,8 @@ # INCOMPAT_CURSES specify MACHINE_PLATFORM versions that are missing # some needed functions. -.if !defined(CURSES_BUILDLINK2_MK) -CURSES_BUILDLINK2_MK= # defined +.if !defined(NCURSES_BUILDLINK2_MK) +NCURSES_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 # CURSES_BUILDLINK2_MK +.endif # NCURSES_BUILDLINK2_MK diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index 3cb0994dee6..802d96d223b 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 552298728a3..da956e98868 100644 --- a/devel/p5-Curses/Makefile +++ b/devel/p5-Curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 ca2ef4d5466..eebd8e48436 100644 --- a/devel/prc-tools/Makefile +++ b/devel/prc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index 7ec256d8d10..093832eb182 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/28 09:13:56 jlam Exp $ # PKGNAME= ${PYPKGPREFIX}-curses-0 @@ -33,5 +33,5 @@ do-patch: .include "../../lang/python/extension.mk" .include "../../lang/python/srcdist.mk" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-cursespanel/Makefile b/devel/py-cursespanel/Makefile index 6c881d57f75..acc271d33ae 100644 --- a/devel/py-cursespanel/Makefile +++ b/devel/py-cursespanel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile index 1ce484d2595..6dfe1ce94b8 100644 --- a/devel/tvision/Makefile +++ b/devel/tvision/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= tvision-0.7 @@ -14,5 +14,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile index c2f9f52c2a3..159693f78ae 100644 --- a/editors/bvi/Makefile +++ b/editors/bvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= bvi-1.3.0.src @@ -16,5 +16,5 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES MAKE_ENV+= SHELL=${SH} -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/ce-x11/Makefile b/editors/ce-x11/Makefile index 86f898265ab..b62b068fc96 100644 --- a/editors/ce-x11/Makefile +++ b/editors/ce-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam Exp $ # .include "../ce/Makefile.common" @@ -13,5 +13,5 @@ USE_X11= # defined ALL_TARGET= xce INSTALL_TARGET= install-x11 man-install-x11 -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/ce/Makefile b/editors/ce/Makefile index 9a057869026..40e34304b2d 100644 --- a/editors/ce/Makefile +++ b/editors/ce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:56 jlam Exp $ # .include "Makefile.common" @@ -11,5 +11,5 @@ USE_BUILDLINK2= # defined ALL_TARGET= ce INSTALL_TARGET= install man-install -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile index 56c14571acd..032e88d8007 100644 --- a/editors/hexedit/Makefile +++ b/editors/hexedit/Makefile @@ -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= hexedit-1.2.2 @@ -21,5 +21,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit .endfor -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile index 6a276649931..cf70a4dad9c 100644 --- a/editors/hnb/Makefile +++ b/editors/hnb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= hnb-1.8.1 @@ -16,6 +16,6 @@ GNU_CONFIGURE= yes USE_BUILDLINK2= yes USE_GMAKE= yes -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/mined/Makefile b/editors/mined/Makefile index fcb96044cc4..85694763bc1 100644 --- a/editors/mined/Makefile +++ b/editors/mined/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:56 jlam Exp $ # DISTNAME= mined-2000.7 @@ -15,5 +15,5 @@ USE_BUILDLINK2= yes MAKEFILE= makefile.bsd -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/nano/Makefile b/editors/nano/Makefile index e3fb6b8b95c..91ff37be73c 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/pico/Makefile b/editors/pico/Makefile index bffc8171ba9..07617522b61 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2003/09/27 17:07:35 grant Exp $ +# $NetBSD: Makefile,v 1.47 2003/09/28 09:13:56 jlam Exp $ DISTNAME= pine4.58 PKGNAME= pico-4.6 @@ -47,5 +47,5 @@ do-install: cd ${WRKSRC}/pico && \ ${INSTALL_DATA} *.h ${PREFIX}/include/pico -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/vile/Makefile b/editors/vile/Makefile index 09a9c2e0833..58c6b80e5c9 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.35 2003/09/28 09:13:56 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 d17748fe45e..51cb9a5d88d 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.39 2003/09/28 09:13:56 jlam Exp $ .include "../vim-share/Makefile.common" @@ -28,7 +28,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 cc6eda348b8..6a6f2253d84 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $ .include "../vim-share/Makefile.common" @@ -28,7 +28,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 089ff0864ac..845013f57fc 100644 --- a/editors/vim-kde/Makefile +++ b/editors/vim-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 c93b138561c..bde96131a9b 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:57 jlam Exp $ .include "../vim-share/Makefile.common" @@ -28,7 +28,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 fe04362d446..c3a75413cf2 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.28 2003/09/28 09:13:57 jlam Exp $ .include "../vim-share/Makefile.common" @@ -37,7 +37,7 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" .include "../../mk/xaw.buildlink2.mk" diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 1e707cb5175..96bc87b7df3 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.49 2003/09/28 09:13:56 jlam Exp $ .include "../vim-share/Makefile.common" @@ -24,5 +24,5 @@ post-install: ${LN} -s vim ${PREFIX}/bin/$$f; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 4ea917c5703..5a7416c0d16 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.11 2003/09/28 09:13:57 jlam Exp $ DISTNAME= zile-1.6.2 PKGREVISION= 1 @@ -15,5 +15,5 @@ USE_BUILDLINK2= yes USE_MAKEINFO= YES INFO_FILES= zile.info -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile index 1b8e03ccdc0..ba53de61231 100644 --- a/games/angband-x11/Makefile +++ b/games/angband-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.27 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 57add819b48..ffc55ce3bb6 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 9fe44bddddd..9bc73db009b 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/09/28 09:13:57 jlam Exp $ # DISTNAME= freesci-0.3.4a @@ -21,7 +21,7 @@ post-install: .include "../../devel/SDL/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 30a0d8a2647..25f058d2d8d 100644 --- a/games/frotz/Makefile +++ b/games/frotz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 716bd71a0c3..6f1fe70534c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.56 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 de31903217c..c5518bde3ff 100644 --- a/games/gnome-games/buildlink2.mk +++ b/games/gnome-games/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 31f500c18e4..b803a227e09 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 a756429d9a1..e7868c206a4 100644 --- a/games/gnome2-games/buildlink2.mk +++ b/games/gnome2-games/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../lang/guile14/buildlink2.mk" .include "../../x11/gnome-core/buildlink2.mk" diff --git a/games/level9/Makefile b/games/level9/Makefile index 95ecd658376..d84236ec661 100644 --- a/games/level9/Makefile +++ b/games/level9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/omega/Makefile b/games/omega/Makefile index 5bdbfe6cd8a..42965b3a9c0 100644 --- a/games/omega/Makefile +++ b/games/omega/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pag/Makefile b/games/pag/Makefile index 25601efb4ac..bda61301445 100644 --- a/games/pag/Makefile +++ b/games/pag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $ # DISTNAME= pag-0.91 @@ -16,6 +16,6 @@ USE_NCURSES= yes # missing function stdscr ALL_TARGET= compile -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 ad53136f3e2..09bb00a5cc0 100644 --- a/games/vms-empire/Makefile +++ b/games/vms-empire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index df738d72cf6..feae1cb3e0b 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 e12a808348b..f988485052f 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:57 jlam Exp $ # DISTNAME= libggi-2.0.3.src @@ -44,7 +44,7 @@ PLIST_SRC= ${PKGDIR}/PLIST.dga PLIST_SRC+= ${PKGDIR}/PLIST .endif -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../graphics/libgii/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index e8efc2f7067..825548855ff 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 ff441fed05c..d6665463aed 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.46 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile index 125c9dff2f3..8b702b5d3d6 100644 --- a/lang/guile14/Makefile +++ b/lang/guile14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.14 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 4eb368c927e..d1008a7d58c 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2003/09/27 17:07:36 grant Exp $ +# $NetBSD: Makefile,v 1.16 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 95951d177ed..c104c2cd62f 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile index 3560e807c4e..628a1339c53 100644 --- a/lang/ruby-base/Makefile +++ b/lang/ruby-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile index cadbc45b39a..1cdba144347 100644 --- a/lang/swi-prolog/Makefile +++ b/lang/swi-prolog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.24 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index 801cba98afa..7bbeb81e9d5 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $ DISTNAME= yabasic-2.722 PKGREVISION= 1 @@ -18,5 +18,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/yabasic.htm \ ${PREFIX}/share/doc/html/yabasic -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index c90d5e1104b..b903b86304e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.104 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} .endif diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 5626fa95939..aefd5152ad5 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.79 2003/09/28 09:13:57 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 702ef2bfa7d..22ad68677a8 100644 --- a/math/capc-calc/Makefile +++ b/math/capc-calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.19 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= calc-2.11.8 @@ -13,6 +13,6 @@ COMMENT= C arbitrary precision calculator USE_BUILDLINK2= # defined -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/Makefile b/math/pari/Makefile index 2f466d13cb1..7485e5f2200 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam Exp $ DISTNAME= pari-2.1.5 PKGREVISION= 1 @@ -26,7 +26,7 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} TEST_TARGET= test-compat bench -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 f7798e03404..516bc5a37de 100644 --- a/misc/dialog/Makefile +++ b/misc/dialog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:58 jlam Exp $ DISTNAME= dialog-0.6z PKGREVISION= 2 @@ -27,5 +27,5 @@ post-install: ${INSTALL_SCRIPT} $${file} ${EGDIR}; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile index 590ed568e7d..7d840ad990d 100644 --- a/misc/gnome-utils/Makefile +++ b/misc/gnome-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.65 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 8451134c364..670771a89d3 100644 --- a/misc/gnome2-utils/Makefile +++ b/misc/gnome2-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 6e73449fecd..146b9670c47 100644 --- a/misc/iselect/Makefile +++ b/misc/iselect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= iselect-1.2.0 @@ -16,5 +16,5 @@ GNU_CONFIGURE= # defined post-configure: touch ${WRKSRC}/config_ac.h.in -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile index 67aff1b876b..2ab9a531d57 100644 --- a/misc/multitail/Makefile +++ b/misc/multitail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 742b3bfbe47..d3b34098273 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.ncurses} .endif diff --git a/misc/reed/Makefile b/misc/reed/Makefile index 50429f5ea2a..83eb1ca019a 100644 --- a/misc/reed/Makefile +++ b/misc/reed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/siag/Makefile b/misc/siag/Makefile index 1e07c049660..7c8017a65d5 100644 --- a/misc/siag/Makefile +++ b/misc/siag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.38 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= siag-3.5.7 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw CONFIGURE_ARGS+=--with-xawm=Xaw .endif -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 07b12ab6463..9707ac62f91 100644 --- a/misc/vfu/Makefile +++ b/misc/vfu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.33 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= vfu-3.04 @@ -36,6 +36,6 @@ post-install: cd ${WRKSRC}; \ ${INSTALL_DATA} ${WRKSRC}/vfu.conf ${EGDIR}/vfu.conf -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/chrony/Makefile b/net/chrony/Makefile index ab2caf55d69..ba417ed3d78 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:58 jlam Exp $ DISTNAME= chrony-1.17 PKGREVISION= 1 @@ -33,5 +33,5 @@ post-install: done .include "../../devel/readline/buildlink2.mk" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 172b3bb483d..2606c9a5365 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 e33588e6778..531cab47163 100644 --- a/net/mtr-gtk/Makefile +++ b/net/mtr-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 3cc8a9f747a..d92bf33ec51 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.32 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nap/Makefile b/net/nap/Makefile index bd4f7710239..4434ac24304 100644 --- a/net/nap/Makefile +++ b/net/nap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.17 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile index c27e2f278ad..bb90bb230d0 100644 --- a/net/ncftp3/Makefile +++ b/net/ncftp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/09/27 22:57:32 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam Exp $ DISTNAME= ncftp-3.1.6-src PKGNAME= ncftp3-3.1.6 @@ -18,5 +18,5 @@ post-patch: @${SED} -e "s:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:" \ < ${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 0020a18ef17..0eb65a49974 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2003/09/27 17:07:37 grant Exp $ +# $NetBSD: Makefile,v 1.27 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/scli/Makefile b/net/scli/Makefile index b28babe87dd..8f17158217b 100644 --- a/net/scli/Makefile +++ b/net/scli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/slurm/Makefile b/net/slurm/Makefile index ea5f457d520..54bf529a006 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile index c25007f6d08..a14046a6bc8 100644 --- a/net/sniffit/Makefile +++ b/net/sniffit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.23 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile index e39d8171152..714e91d28d9 100644 --- a/net/tn5250/Makefile +++ b/net/tn5250/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/wap-utils/Makefile b/net/wap-utils/Makefile index 1576ac3a1bc..a675311ca00 100644 --- a/net/wap-utils/Makefile +++ b/net/wap-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= ap-utils-1.3.2 @@ -17,5 +17,5 @@ USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES USE_NCURSES= # redrawwin() -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/teTeX2-bin/Makefile.common b/print/teTeX2-bin/Makefile.common index 7275edeb1db..aa7d1546fea 100644 --- a/print/teTeX2-bin/Makefile.common +++ b/print/teTeX2-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile.common,v 1.5 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 1585482a94f..9fa115429f6 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.25 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +#.include "../../devel/ncurses/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 79825b41d40..cd5041d0602 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam Exp $ # DISTNAME= grub-0.93 @@ -42,5 +42,5 @@ CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} .endif .include "../../devel/binutils/buildlink2.mk" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile index b0b8f6f27ca..3d5c0853ff8 100644 --- a/sysutils/vifm/Makefile +++ b/sysutils/vifm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.6 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile index c1145833c7c..c5e2c51db1e 100644 --- a/sysutils/whowatch/Makefile +++ b/sysutils/whowatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:58 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile index ed53a74071b..57ae0513744 100644 --- a/sysutils/wtail/Makefile +++ b/sysutils/wtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.5 2003/09/28 09:13:59 jlam Exp $ # DISTNAME= wtail-0.2.2 @@ -14,5 +14,5 @@ USE_BUILDLINK2= YES MAKE_ENV+= SED="${SED}" -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 24c91dd5a04..123aecef80c 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.14 2003/09/28 09:13:59 jlam Exp $ # DISTNAME= aspell-0.50.3 @@ -32,5 +32,5 @@ REPLACE_PERL= scripts/aspell-import post-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/aspell -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 330ccb6079d..a933bbbd53e 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.10 2003/09/28 09:13:59 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 58e6a66fb4d..9fb1150b79f 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.47 2003/09/28 09:13:59 jlam 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 "../../mk/curses.buildlink2.mk" +. include "../../devel/ncurses/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 2251177a8ff..862a0ebb271 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.60 2003/09/28 09:13:59 jlam 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 "../../mk/curses.buildlink2.mk" +. include "../../devel/ncurses/buildlink2.mk" CONFIGURE_ARGS+= --enable-color-style .elif (${LYNX_SCREEN_LIB} != curses) pre-configure: diff --git a/www/wml/Makefile b/www/wml/Makefile index 82b99f39b43..3c5fce7c9d1 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:59 jlam Exp $ # DISTNAME= wml-2.0.3 @@ -42,6 +42,6 @@ post-install: ${MV} $${i}.7 $${i}.0 ; \ done -.include "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 0c6d29fe3f3..b32bf816e74 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: Makefile,v 1.93 2003/09/28 09:13:59 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/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 1b1fd616e71..400d410ee04 100644 --- a/x11/kdebase/buildlink2.mk +++ b/x11/kdebase/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/09/27 17:07:38 grant Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:59 jlam 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 "../../mk/curses.buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" |