diff options
| author | ryoon <ryoon@pkgsrc.org> | 2013-07-15 02:02:17 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2013-07-15 02:02:17 +0000 |
| commit | 35d62a5a16b773c189f9e1ead6ee28d9eb2a108b (patch) | |
| tree | 7082cd8bccd6e4c222c7d1017f6c4896abcadef6 | |
| parent | 6e1ab4c62d6ff5b957b64347c972634624775486 (diff) | |
| download | pkgsrc-35d62a5a16b773c189f9e1ead6ee28d9eb2a108b.tar.gz | |
* .include "../../devel/readline/buildlink3.mk" with USE_GNU_READLINE=yes
are replaced with .include "../../devel/readline/buildlink3.mk", and
USE_GNU_READLINE are removed,
* .include "../../devel/readline/buildlink3.mk" without USE_GNU_READLINE
are replaced with .include "../../mk/readline.buildlink3.mk".
177 files changed, 324 insertions, 418 deletions
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index 994492a60d5..27edaff6de7 100644 --- a/audio/fluidsynth/Makefile +++ b/audio/fluidsynth/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2012/09/15 10:03:34 obache Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:17 ryoon Exp $ DISTNAME= fluidsynth-1.1.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluidsynth/} EXTRACT_SUFX= .tar.bz2 @@ -29,7 +29,7 @@ LIBS.SunOS+= -lsocket .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile index a50119884d8..67cf3da386c 100644 --- a/audio/icecast1/Makefile +++ b/audio/icecast1/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2012/09/12 00:24:39 asau Exp $ +# $NetBSD: Makefile,v 1.30 2013/07/15 02:02:17 ryoon Exp $ # DISTNAME= icecast-1.3.12 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/icecast/ @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-readline \ --with-libwrap \ --with-python \ --sysconfdir=${PKG_SYSCONFDIR:Q} -CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline +CPPFLAGS+= -I${BUILDLINK_PREFIX.editlinereadline}/include/readline CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PYPACKAGE}} LDFLAGS+= ${BUILDLINK_LDFLAGS.${PYPACKAGE}} PTHREAD_OPTS+= require @@ -49,7 +49,7 @@ SUBST_FILES.ice= src/icetypes.h SUBST_SED.ice= -e 's/@SOURCE_BUFFSIZE@/${ICECAST_SOURCE_BUFFSIZE}/' SUBST_SED.ice+= -e 's/@CHUNKLEN@/${ICECAST_CHUNKLEN}/' -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../lang/python/application.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile index 2fa7a12b130..aa901277561 100644 --- a/audio/id3ed/Makefile +++ b/audio/id3ed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/09/12 00:24:39 asau Exp $ +# $NetBSD: Makefile,v 1.33 2013/07/15 02:02:17 ryoon Exp $ # DISTNAME= id3ed-1.10.4 @@ -19,7 +19,5 @@ GNU_CONFIGURE= YES USE_TOOLS+= gmake # uses rl_startup_hook -USE_GNU_READLINE= yes - .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 5d2e0e156e5..5cd1fa4c7c1 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/05/31 12:39:36 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:17 ryoon Exp $ # DISTNAME= jack-audio-connection-kit-${JACK_VERSION} @@ -119,7 +119,7 @@ post-extract: ${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd .include "../../audio/libsamplerate/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile index 68f08660c31..a0dbfbe04ca 100644 --- a/audio/libsmf/Makefile +++ b/audio/libsmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/09/15 10:03:40 obache Exp $ +# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:17 ryoon Exp $ # DISTNAME= libsmf-1.3 @@ -18,5 +18,5 @@ USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= smf.pc.in .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index 4a40a3b3923..3d3ef9980b3 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/02/06 23:21:35 jperkin Exp $ +# $NetBSD: Makefile,v 1.25 2013/07/15 02:02:17 ryoon Exp $ DISTNAME= libtunepimp-0.5.3 PKGREVISION= 11 @@ -35,7 +35,7 @@ pre-configure: .include "../../audio/taglib/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../multimedia/libmp4v2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 53f5d94299b..6da29acf0b4 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2013/04/06 20:27:16 rodent Exp $ +# $NetBSD: Makefile,v 1.64 2013/07/15 02:02:17 ryoon Exp $ # DISTNAME= rplay-3.3.2 @@ -36,7 +36,7 @@ post-install: .endfor .include "../../audio/gsm/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/rx/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/felt/Makefile b/cad/felt/Makefile index b235a33d1e2..067ed5fe70f 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2012/10/08 13:25:12 asau Exp $ +# $NetBSD: Makefile,v 1.37 2013/07/15 02:02:18 ryoon Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 -PKGREVISION= 4 +PKGREVISION= 4 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=felt/} DISTFILES= felt-3.05.src.tar.gz felt-3.05.ps.gz @@ -22,8 +22,6 @@ MAKE_ENV+= CCOPTS=${CFLAGS:M*:Q} MAKE_ENV+= LDOPTS=${LDFLAGS:M*:Q} MAKE_ENV+= SH=${SH:Q} -USE_GNU_READLINE= YES # uses remove_history() and history_list() - INSTALLATION_DIRS+= lib/X11/app-defaults share/doc/felt share/examples/felt INSTALLATION_DIRS+= share/examples/felt share/doc/felt @@ -36,6 +34,7 @@ post-install: COPYING CHANGELOG TODO ${DESTDIR}${PREFIX}/share/doc/felt ${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/felt +# uses remove_history() and history_list() .include "../../devel/readline/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index 4e08faf7176..64d7bc0cdc3 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2012/10/08 13:25:13 asau Exp $ +# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= gnucap-2006-07-08 @@ -21,7 +21,6 @@ CONFLICTS+= gnucap-2006-07-[0-9]* USE_LANGUAGES= c c++ USE_TOOLS+= gmake -USE_GNU_READLINE= YES GNU_CONFIGURE= YES INSTALLATION_DIRS= share/gnucap/manual/html diff --git a/cad/magic/Makefile b/cad/magic/Makefile index a2b3163b31c..9fe50d3a64b 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/06/06 12:54:07 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= magic-7.5.188 @@ -15,7 +15,6 @@ LICENSE= magic-license MAKE_JOBS_SAFE= no USE_TOOLS+= gmake printf csh -USE_GNU_READLINE=yes # uses rl_*_completion_function MAKE_ENV+= MAGIC_HOME=${PREFIX:Q} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} GNU_CONFIGURE= yes @@ -53,6 +52,7 @@ REPLACE.wish.old= .*wish REPLACE.wish.new= ${PREFIX}/bin/wish REPLACE_FILES.wish= tcltk/tkshell.tcl +# uses rl_*_completion_function .include "../../devel/readline/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../x11/blt/buildlink3.mk" diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index af6e800d31d..74e6a29c91a 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/04/06 20:27:16 rodent Exp $ +# $NetBSD: Makefile,v 1.42 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= ngspice-23 @@ -12,7 +12,6 @@ COMMENT= Next generation circuit simulation program USE_LIBTOOL= YES USE_TOOLS+= gmake makeinfo -USE_GNU_READLINE= uses rl_* interface GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug @@ -24,6 +23,7 @@ TEXINFO_REQD= 4.6 .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +# uses rl_* interface .include "../../devel/readline/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile index 6c4e4235f1e..df1fe56c354 100644 --- a/cad/verilog-current/Makefile +++ b/cad/verilog-current/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.58 2012/10/08 13:25:17 asau Exp $ +# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= verilog-${SNAPDATE} PKGNAME= verilog-current-${SNAPDATE} +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://icarus.com/pub/eda/verilog/snapshots/ @@ -28,5 +29,5 @@ TEST_TARGET= check .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile index 9a279f47c70..1e1c8e20df4 100644 --- a/cad/verilog/Makefile +++ b/cad/verilog/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2012/10/08 13:25:16 asau Exp $ +# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= verilog-0.9.4 +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://icarus.com/pub/eda/verilog/v0.9/ @@ -23,5 +24,5 @@ TEST_TARGET= check .include "../../devel/zlib/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index 7d31b89c5a1..243e1c82a52 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2013/02/06 23:20:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.51 2013/07/15 02:02:18 ryoon Exp $ DISTNAME= ekg-1.7 PKGREVISION= 7 @@ -10,7 +10,6 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://ekg.chmurka.net/ COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) -USE_GNU_READLINE= yes USE_LIBTOOL= yes USE_NCURSES= yes USE_TOOLS+= gmake pkg-config diff --git a/chat/gale/Makefile b/chat/gale/Makefile index 47fb4ce04d5..c3c2b40cd9e 100644 --- a/chat/gale/Makefile +++ b/chat/gale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2013/07/12 10:44:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.45 2013/07/15 02:02:18 ryoon Exp $ DISTNAME= gale-0.99fruit PKGNAME= gale-0.99f @@ -13,7 +13,6 @@ COMMENT= Secure instant messaging system MAKE_JOBS_SAFE= no -USE_GNU_READLINE= yes # needs rl_named_function() USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} @@ -49,6 +48,7 @@ post-install: .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" +# needs rl_named_function() .include "../../devel/readline/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../net/adns/buildlink3.mk" diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile index 5036f932057..3a5340c62f5 100644 --- a/chat/i2cb/Makefile +++ b/chat/i2cb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/03 00:02:37 asau Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= i2cb-6.0_ALPHA @@ -11,7 +11,6 @@ HOMEPAGE= http://www.draga.com/~jwise/i2cb/ COMMENT= Next generation Internet Citicen's Band chat client WRKSRC= ${WRKDIR}/icb -USE_GNU_READLINE= yes CFLAGS.SunOS+= -DBSD_COMP LIBS.SunOS+= -lsocket diff --git a/chat/ysm/Makefile b/chat/ysm/Makefile index 7c3245b83c7..1a329286250 100644 --- a/chat/ysm/Makefile +++ b/chat/ysm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/03 00:02:47 asau Exp $ +# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:18 ryoon Exp $ DISTNAME= ysmv7_2_9_9_1 PKGNAME= ysm-2.9.9.1 @@ -11,8 +11,8 @@ COMMENT= The 'You Sick Me' terminal based ICQ client LICENSE= gnu-gpl-v2 GNU_CONFIGURE= YES -USE_GNU_READLINE= YES # rl_delete_text +# rl_delete_text .include "../../devel/readline/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile index 62c9a999411..36bb9c56256 100644 --- a/chat/zephyr/Makefile +++ b/chat/zephyr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/03 00:02:47 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= zephyr-20010518 @@ -60,7 +60,7 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${ZEPHYR_DOCDIR} .endfor -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../net/hesiod/buildlink3.mk" .include "../../net/libares/buildlink3.mk" .include "../../security/kth-krb4/buildlink3.mk" diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile index f4b0f5bfcc1..505eee7a787 100644 --- a/comms/obexapp/Makefile +++ b/comms/obexapp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/03/15 08:23:05 plunky Exp $ +# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:18 ryoon Exp $ # DISTNAME= obexapp-1.4.15 @@ -48,6 +48,6 @@ post-extract: .include "../../comms/openobex/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile index 9cb9f19c37c..3be93053d6e 100644 --- a/comms/pilot-link-libs/Makefile +++ b/comms/pilot-link-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/03 11:24:43 asau Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:18 ryoon Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -19,5 +19,5 @@ BUILD_DIRS= include libpisock libpisync .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index e427d175ee0..eeaab2f1479 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/05/31 12:39:43 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:18 ryoon Exp $ .include "../../comms/pilot-link/Makefile.common" @@ -29,7 +29,7 @@ post-patch: .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile index 0348700eb15..d2efb9359c4 100644 --- a/cross/avrdude/Makefile +++ b/cross/avrdude/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2013/01/26 22:10:13 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:18 ryoon Exp $ DISTNAME= avrdude-5.11 PKGREVISION= 1 @@ -16,8 +16,6 @@ BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex MAKE_JOBS_SAFE= no -USE_GNU_READLINE= yes - .include "../../mk/bsd.prefs.mk" GNU_CONFIGURE= yes diff --git a/databases/abook/Makefile b/databases/abook/Makefile index 7f007038757..4ece65df41d 100644 --- a/databases/abook/Makefile +++ b/databases/abook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2012/10/02 21:25:15 asau Exp $ +# $NetBSD: Makefile,v 1.25 2013/07/15 02:02:19 ryoon Exp $ # DISTNAME= abook-0.6.0pre2 @@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt -USE_GNU_READLINE= yes GNU_CONFIGURE= yes .include "../../converters/libiconv/buildlink3.mk" diff --git a/databases/deforaos-libdatabase/Makefile b/databases/deforaos-libdatabase/Makefile index 2c828791d63..d9385fba2ba 100644 --- a/databases/deforaos-libdatabase/Makefile +++ b/databases/deforaos-libdatabase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/05/09 07:39:31 adam Exp $ +# $NetBSD: Makefile,v 1.3 2013/07/15 02:02:19 ryoon Exp $ DISTNAME= libDatabase-0.0.0 PKGNAME= deforaos-libdatabase-0.0.0 @@ -18,7 +18,7 @@ MAKE_FLAGS+= PREFIX=${PREFIX} .include "../../devel/deforaos-libsystem/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" # this one defines PGSQL_VERSION among others .include "../../databases/postgresql${PGSQL_VERSION}-client/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../databases/sqlite/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../textproc/gtk-doc/buildlink3.mk" diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index e72eb4cdf46..c299473c404 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/02/06 23:21:04 jperkin Exp $ +# $NetBSD: Makefile,v 1.50 2013/07/15 02:02:19 ryoon Exp $ DISTNAME= freetds-0.91 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.freetds.org/ COMMENT= Implementation of TDS protocol used by Sybase and MS-SQL servers LICENSE= gnu-lgpl-v2 -USE_GNU_READLINE= yes # rl_on_new_line, rl_reset_line_state USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -44,6 +43,7 @@ pre-build: .include "options.mk" .include "../../converters/libiconv/buildlink3.mk" +# rl_on_new_line, rl_reset_line_state .include "../../devel/readline/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ldapvi/Makefile b/databases/ldapvi/Makefile index 10416e5a7f6..c253ce2dbaa 100644 --- a/databases/ldapvi/Makefile +++ b/databases/ldapvi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/04/13 07:55:03 ghen Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:19 ryoon Exp $ DISTNAME= ldapvi-1.7 PKGREVISION= 9 @@ -11,7 +11,6 @@ COMMENT= Interactive LDAP client GNU_CONFIGURE= yes USE_NCURSES= yes -USE_GNU_READLINE= yes USE_TOOLS+= gmake pkg-config MAKE_FILE= GNUmakefile diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index 171e033449f..30d40376ec6 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2012/02/06 11:27:48 wiz Exp $ +# $NetBSD: Makefile.common,v 1.52 2013/07/15 02:02:19 ryoon Exp $ # # used by databases/libgda/Makefile # used by databases/libgda-mysql @@ -53,6 +53,6 @@ SUBST_SED.libs+= -e 's|$$(top_builddir)/libgda/libgda-3.0.la|${BUILDLINK_PREFIX. .include "../../databases/libgda/buildlink3.mk" .else .include "../../textproc/libxml2/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .endif diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile index 356c72fb7d7..41cb2d5ab0c 100644 --- a/databases/mysql5-client/Makefile +++ b/databases/mysql5-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/05/31 12:39:47 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} PKGREVISION= 3 @@ -38,5 +38,5 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf .endfor -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index bad1f675c5e..33a3c598e48 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.37 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 2 @@ -60,7 +60,7 @@ CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # a build-time dependency. # BUILDLINK_DEPMETHOD.readline= build -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" post-configure: cd ${WRKSRC}/include && cp -f config.h my_config.h diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index e95550257eb..65bd68b4904 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/05/31 12:39:47 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} PKGREVISION= 2 @@ -35,5 +35,5 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf .endfor -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index a39145ac8a1..cf104721bde 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/07/12 10:44:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 2 @@ -89,7 +89,7 @@ CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ # is enabled that option sets a full dependency on readline otherwise # make this only a build-time dependency. BUILDLINK_DEPMETHOD.readline?= build -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" post-configure: cd ${WRKSRC}/include && cp -f config.h my_config.h diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index b00cb10524d..ed5b08bb2e4 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/06/04 13:31:21 adam Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -35,5 +35,5 @@ post-install: . endfor .endif -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common index bfd9fa7b0b3..df2a79238cc 100644 --- a/databases/mysql56-client/Makefile.common +++ b/databases/mysql56-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2013/06/18 19:59:35 joerg Exp $ +# $NetBSD: Makefile.common,v 1.8 2013/07/15 02:02:19 ryoon Exp $ # # used by databases/mysql56-client/Makefile # used by databases/mysql56-server/Makefile @@ -111,14 +111,14 @@ SUBST_SED.scr= -e "s,chown,${CHOWN},g" SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" SUBST_MESSAGE.scr= Fixing scripts. -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" CMAKE_ARGS+= -DWITH_EDITLINE=system -.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) -CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so -.else -CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so +.if !empty(READLINE_TYPE:Meditline) +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.so +.elif !empty(READLINE_TYPE:Mreadline) +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libreadline.so .endif -CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline +CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 99c9e3d607d..509c1345262 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/07/12 10:44:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -86,6 +86,6 @@ CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ BUILDLINK_AUTO_DIRS.mysql-client= no .include "../../databases/mysql56-client/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile index f33ee0b02d6..fbd4dac2008 100644 --- a/databases/postgresql84-client/Makefile +++ b/databases/postgresql84-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/05/31 12:39:55 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:C/-/84-client-/} PKGREVISION= 1 @@ -42,8 +42,6 @@ CONF_FILES+= ${PREFIX}/share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} .endfor # XXX work around core dumps with the native libedit -USE_GNU_READLINE= yes - .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile index 550646fb2db..5227f04be17 100644 --- a/databases/postgresql90-client/Makefile +++ b/databases/postgresql90-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/02/09 11:19:12 adam Exp $ +# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:19 ryoon Exp $ PKGNAME= ${DISTNAME:C/-/90-client-/} COMMENT= PostgreSQL database client programs @@ -40,9 +40,7 @@ CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} .endfor # XXX work around core dumps with the native libedit -USE_GNU_READLINE= yes - -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile index 21eae7fd034..a642981fce2 100644 --- a/databases/postgresql91-client/Makefile +++ b/databases/postgresql91-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/02/09 11:19:15 adam Exp $ +# $NetBSD: Makefile,v 1.14 2013/07/15 02:02:20 ryoon Exp $ PKGNAME= ${DISTNAME:C/-/91-client-/} COMMENT= PostgreSQL database client programs @@ -40,8 +40,6 @@ CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} .endfor # XXX work around core dumps with the native libedit -USE_GNU_READLINE= yes - .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile index e26cab540a4..1f0bb389ff7 100644 --- a/databases/sqlite/Makefile +++ b/databases/sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2013/02/21 15:14:45 gdt Exp $ +# $NetBSD: Makefile,v 1.45 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= sqlite-2.8.17 PKGREVISION= 1 @@ -16,7 +16,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes OBJDIR= ../sqlite-build CONFIGURE_ARGS+= --without-tcl -CONFIGURE_ENV+= config_TARGET_READLINE_INC="-I${BUILDLINK_PREFIX.readline}/include" +CONFIGURE_ENV+= config_TARGET_READLINE_INC="-I${BUILDLINK_PREFIX.editlinereadline}/include" .include "../../mk/bsd.prefs.mk" @@ -38,5 +38,5 @@ post-extract: post-install: ${INSTALL_MAN} ${WRKSRC}/sqlite.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile index 05428e3fa77..cb68898feb4 100644 --- a/databases/sqlite3-tcl/Makefile +++ b/databases/sqlite3-tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/05/20 19:17:15 adam Exp $ +# $NetBSD: Makefile,v 1.48 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= sqlite-autoconf-3071700 PKGNAME= sqlite3-tcl-3.7.17 @@ -22,6 +22,6 @@ PLIST_SUBST+= TCL_TRIM_DOTS=${PKGVERSION_NOREV:S/.//g} BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.6.10 .include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index ba9262de77d..e231e9d7576 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2013/05/20 19:17:15 adam Exp $ +# $NetBSD: Makefile,v 1.67 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= sqlite-autoconf-3071700 PKGNAME= sqlite3-3.7.17 @@ -43,6 +43,6 @@ CFLAGS+= -DSQLITE_ENABLE_LOAD_EXTENSION # See http://www.sqlite.org/cvstrac/tktview?tn=3555 LIBS+= ${BUILDLINK_LDADD.dl} -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 4c438395c7e..4debb4c3c80 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/05/31 12:39:56 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= sqlrelay-0.43 PKGREVISION= 8 @@ -59,6 +59,6 @@ RCD_SCRIPT_SRC.sqlrelay= ${WRKSRC}/init/netbsd/rc.d/sqlrelay post-install: ${INSTALL_DATA} ${WRKSRC}/init/netbsd/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/rudiments/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index df65ad9280b..991fc602525 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/02/06 23:22:02 jperkin Exp $ +# $NetBSD: Makefile,v 1.35 2013/07/15 02:02:20 ryoon Exp $ # This section contains variables that might be overridden. PKGNAME?= ${PKGNAME_BASE} @@ -25,8 +25,8 @@ GNU_CONFIGURE= yes BUILD_TARGET= build CONFIGURE_ARGS+= --with-readline -CONFIGURE_ENV+= INCDIRS=${BUILDLINK_PREFIX.readline:Q}/include -CONFIGURE_ENV+= LIBDIRS=${BUILDLINK_PREFIX.readline:Q}/lib +CONFIGURE_ENV+= INCDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/include +CONFIGURE_ENV+= LIBDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib CHECK_HEADERS_SKIP= src/sqsh_config.h @@ -43,6 +43,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc \ ${DESTDIR}${PREFIX}/share/examples/sqsh -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ald/Makefile b/devel/ald/Makefile index 1687575e0d6..35ee57dbbfd 100644 --- a/devel/ald/Makefile +++ b/devel/ald/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/31 11:16:34 asau Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:20 ryoon Exp $ # DISTNAME= ald-0.1.7 @@ -15,5 +15,5 @@ ONLY_FOR_PLATFORM= *-*-i386 GNU_CONFIGURE= YES -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index 64f01b21181..bed2ccca2cf 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/31 11:16:44 asau Exp $ +# $NetBSD: Makefile,v 1.29 2013/07/15 02:02:20 ryoon Exp $ # DISTNAME= cdecl-2.5 @@ -11,8 +11,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Utility to explain and compose C and C++ declarations BUILD_TARGET= cdecl -# missing rl_completion_matches -USE_GNU_READLINE= yes USE_TOOLS+= lex yacc INSTALL_MAKE_FLAGS= PREFIX=${DESTDIR}${PREFIX} \ MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 @@ -23,5 +21,6 @@ INSTALLATION_DIRS= bin ${EGDIR} ${PKGMANDIR}/man1 post-install: ${INSTALL_DATA} ${WRKSRC}/testset* ${DESTDIR}${EGDIR} +# missing rl_completion_matches .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile index 3e5341fa831..f4cad59ef57 100644 --- a/devel/cgdb/Makefile +++ b/devel/cgdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/31 11:16:45 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= cgdb-0.6.5 CATEGORIES= devel @@ -14,7 +14,6 @@ MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_NCURSES= yes # tigetstr() -USE_GNU_READLINE= yes # rl_mark and others MAKE_ENV+= AM_LDFLAGS=-L${WRKSRC}/various/util/src @@ -24,6 +23,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cgdb/src/cgdb ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cgdb +# rl_mark and others .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/elf/Makefile b/devel/elf/Makefile index 124df73fe97..a7a5ed965dc 100644 --- a/devel/elf/Makefile +++ b/devel/elf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/04/06 15:46:35 rodent Exp $ +# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:20 ryoon Exp $ # DISTNAME= elf-0.5.3 @@ -23,6 +23,6 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/doc/elf.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1 .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile index dbd9855f4f3..d7ffbc9e1a4 100644 --- a/devel/elfsh/Makefile +++ b/devel/elfsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/31 11:16:55 asau Exp $ +# $NetBSD: Makefile,v 1.23 2013/07/15 02:02:20 ryoon Exp $ # VERS= 0.51b3 @@ -17,8 +17,6 @@ MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_GNU_READLINE= yes - SUBST_CLASSES+= elfsh SUBST_STAGE.elfsh= post-patch SUBST_MESSAGE.elfsh= Fixing hardcoded paths. diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index b0de2f14c06..fb7dcb312b8 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/06/30 06:04:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:20 ryoon Exp $ DISTNAME= fossil-src-20130618210923 PKGNAME= fossil-1.26 @@ -17,7 +17,7 @@ INSTALLATION_DIRS+= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fossil ${DESTDIR}${PREFIX}/bin -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gps/options.mk b/devel/gps/options.mk index 0925837c658..a29cc92da98 100644 --- a/devel/gps/options.mk +++ b/devel/gps/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2013/07/09 10:16:02 marino Exp $ +# $NetBSD: options.mk,v 1.6 2013/07/15 02:02:20 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gps PKG_SUPPORTED_OPTIONS= syslog sqlite readline python pgsql @@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS= syslog sqlite readline python .if !empty(PKG_OPTIONS:Mreadline) CONFIGURE_ARGS+= --enable-gpl -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-readline .endif diff --git a/devel/omake/Makefile b/devel/omake/Makefile index 1931d12a919..4c682d84a76 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/31 11:17:34 asau Exp $ +# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:20 ryoon Exp $ # DISTNAME= omake-${VERSION}-0.rc1 @@ -21,5 +21,5 @@ MAKE_ENV+= INSTALL_ROOT=${DESTDIR} VERSION= 0.9.8.6 .include "../../lang/ocaml/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index e3aada4f5da..b7b3ef3f544 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2013/02/06 23:22:09 jperkin Exp $ +# $NetBSD: Makefile,v 1.52 2013/07/15 02:02:20 ryoon Exp $ # DISTNAME= ${OPENCM_VERSION}-2-src @@ -35,7 +35,7 @@ post-install: .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/krb5.buildlink3.mk" diff --git a/devel/p5-Term-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile index 773e7cf7f37..584afaf8fe7 100644 --- a/devel/p5-Term-ReadLine/Makefile +++ b/devel/p5-Term-ReadLine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/05/31 12:40:46 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:21 ryoon Exp $ DISTNAME= Term-ReadLine-Gnu-1.20 PKGNAME= p5-${DISTNAME:S/-Gnu//} @@ -14,7 +14,6 @@ LICENSE= ${PERL5_LICENSE} # see README PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_GNU_READLINE= yes PERL5_PACKLIST= auto/Term/ReadLine/Gnu/.packlist MAKE_PARAMS+= --includedir=${PREFIX}/include --libdir=${PREFIX}/lib diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index 49f0c1da504..f202493a6e5 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/10/31 11:19:24 asau Exp $ +# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= physfs-1.0.1 @@ -22,7 +22,7 @@ PTHREAD_AUTO_VARS= yes CONFIGURE_ARGS+= --disable-cdrom .endif -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile index 953e9793ac5..627f47dd201 100644 --- a/devel/py-readline/Makefile +++ b/devel/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/04/20 09:38:04 obache Exp $ +# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:21 ryoon Exp $ # PKGNAME= ${PYPKGPREFIX}-readline-${PY_DISTVERSION} @@ -12,8 +12,6 @@ PYTHON_VERSIONS_INCLUDE_3X= yes EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/readline.c -USE_GNU_READLINE= # defined - PYDISTUTILSPKG= yes PY_PATCHPLIST= yes PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_PREFIX.readline} diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 0ad80a4dc0e..3d7b755026c 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/05/31 12:40:56 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= rpc2-2.10 @@ -23,6 +23,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES .include "../../devel/lwp/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile index 5c5ee8c290d..3e42bacf713 100644 --- a/devel/ruby-readline/Makefile +++ b/devel/ruby-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2013/06/27 16:37:16 taca Exp $ +# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -27,5 +27,4 @@ post-install: .include "options.mk" .include "../../lang/ruby/modules.mk" .include "../../lang/ruby/Makefile.common" -.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-readline/options.mk b/devel/ruby-readline/options.mk index ad771786cf4..9318349c9b0 100644 --- a/devel/ruby-readline/options.mk +++ b/devel/ruby-readline/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2013/04/08 11:17:12 rodent Exp $ +# $NetBSD: options.mk,v 1.5 2013/07/15 02:02:21 ryoon Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.ruby @@ -21,13 +21,6 @@ PKG_SUGGESTED_OPTIONS+= readline .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mreadline) -USE_BUILTIN.readline= no -CONFIGURE_ARGS+= --disable-libedit -.else -CHECK_BUILTIN.readline:= yes -. include "../../devel/readline/builtin.mk" -CHECK_BUILTIN.readline:= no -. if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) CONFIGURE_ARGS+= --enable-libedit -. endif +. include "../../mk/readline.buildlink3.mk" .endif diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile index 5d3aca6c024..f1f55c5c9b3 100644 --- a/devel/sdcc/Makefile +++ b/devel/sdcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/05/31 12:40:57 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:21 ryoon Exp $ DISTNAME= sdcc-src-2.8.0 PKGNAME= ${DISTNAME:S/-src//} @@ -27,7 +27,6 @@ BUILD_TARGET= dep all WRKSRC= ${WRKDIR}/sdcc/ GNU_CONFIGURE= YES -USE_GNU_READLINE= yes USE_TOOLS+= gmake lex perl:run CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index 849a3272702..2431a3b12f2 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/31 11:19:50 asau Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= tclreadline-2.1.0 @@ -35,5 +35,5 @@ post-install: .include "../../lang/tcl/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 846662e90da..9ba63301d19 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2012/01/09 17:31:56 drochner Exp $ +# $NetBSD: Makefile.common,v 1.43 2013/07/15 02:02:21 ryoon Exp $ # # used by editors/abiword-plugins/Makefile @@ -30,7 +30,7 @@ PATCHDIR= ${.CURDIR}/../../editors/abiword/patches .include "../../converters/wv/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index bf920e0c8fa..a7f3ad39386 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2013/05/19 07:35:56 adam Exp $ +# $NetBSD: Makefile,v 1.51 2013/07/15 02:02:21 ryoon Exp $ DISTNAME= atari800-3.0.0 CATEGORIES= emulators @@ -36,7 +36,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \ ${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/ -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile index 27453f17b7b..76c2916d78c 100644 --- a/emulators/gpsim-devel/Makefile +++ b/emulators/gpsim-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2013/06/06 12:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= gpsim-20050905 @@ -18,14 +18,12 @@ USE_LIBTOOL= YES GCC_REQD+= 3.0 -USE_GNU_READLINE= YES -# rl_callback_read_char, rl_copy_text, -# rl_callback_handler_remove, rl_forced_update_display, -# rl_callback_handler_install - CONFLICTS= eXdbm-[0-9]* gpsim-[0-9]* .include "../../devel/popt/buildlink3.mk" +# rl_callback_read_char, rl_copy_text, +# rl_callback_handler_remove, rl_forced_update_display, +# rl_callback_handler_install .include "../../devel/readline/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile index 5ddb26829c8..c5703d7beea 100644 --- a/emulators/gpsim/Makefile +++ b/emulators/gpsim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2013/06/11 12:58:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= gpsim-0.26.1 @@ -14,7 +14,6 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES -USE_GNU_READLINE= YES INSTALLATION_DIRS= share/doc/gpsim diff --git a/emulators/or1ksim/Makefile b/emulators/or1ksim/Makefile index b02820ebe34..c0f99cbec98 100644 --- a/emulators/or1ksim/Makefile +++ b/emulators/or1ksim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/10/03 12:55:16 asau Exp $ +# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= or1ksim-0.2.0rc2 @@ -12,7 +12,7 @@ COMMENT= OpenRISC emulator GNU_CONFIGURE= yes CONFIGURE_ARGS+= --target=or32 -USE_GNU_READLINE= YES # rl_event_hook +# rl_event_hook .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index ed04e89f15a..8062a51f367 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2013/06/06 12:54:19 wiz Exp $ +# $NetBSD: Makefile,v 1.109 2013/07/15 02:02:21 ryoon Exp $ DISTNAME= vice-2.4 PKGREVISION= 5 @@ -49,7 +49,7 @@ CPPFLAGS+= -DHAVE_STDINT_H CPPFLAGS+= -DHAVE_STDINT_H .endif -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile index 0cb96030818..f56667dc5d9 100644 --- a/emulators/xtrs/Makefile +++ b/emulators/xtrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $ +# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:21 ryoon Exp $ # DISTNAME= xtrs-4.9d @@ -48,6 +48,6 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/cassette ${DESTDIR}${PREFIX}/bin .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/filesystems/fuse-afpfs-ng/Makefile b/filesystems/fuse-afpfs-ng/Makefile index 4af9aee3db9..0666b8ccfb5 100644 --- a/filesystems/fuse-afpfs-ng/Makefile +++ b/filesystems/fuse-afpfs-ng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/03 16:08:30 asau Exp $ +# $NetBSD: Makefile,v 1.11 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= afpfs-ng-0.8.1 PKGNAME= fuse-${DISTNAME} @@ -20,7 +20,7 @@ REPLACE_SH+= fuse/afpfs .include "../../devel/gmp/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/libgpg-error/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/filesystems/fuse-djmount/Makefile b/filesystems/fuse-djmount/Makefile index 1a7ab873258..285912a9a74 100644 --- a/filesystems/fuse-djmount/Makefile +++ b/filesystems/fuse-djmount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/03 16:08:31 asau Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= djmount-0.71 PKGNAME= fuse-${DISTNAME} @@ -14,8 +14,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake -USE_GNU_READLINE= yes - CONFIGURE_ARGS+= --with-external-libupnp CONFIGURE_ARGS+= --with-libupnp-prefix=${BUILDLINK_PREFIX.libupnp} diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 453f5cb863d..09b4edcb1aa 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/05/23 15:02:53 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2013/07/15 02:02:22 ryoon Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -11,7 +11,6 @@ USE_TOOLS+= automake autoconf pre-configure: cd ${WRKSRC} && autoreconf -USE_GNU_READLINE= yes CONFIGURE_ARGS+= --disable-make-data CONFIGURE_ARGS+= --enable-client=no CONFIGURE_ARGS+= --disable-gtktest diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 1f6806ee34d..0d9edcb9b0f 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/06/06 12:54:21 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2013/07/15 02:02:22 ryoon Exp $ # DISTNAME= freesci-0.3.5 @@ -26,7 +26,7 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/config ${DESTDIR}${PREFIX}/share/examples/freesci .include "../../devel/SDL/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile index 235500a9fc0..683e935eceb 100644 --- a/games/gnuchess/Makefile +++ b/games/gnuchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/04/08 11:17:14 rodent Exp $ +# $NetBSD: Makefile,v 1.38 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= gnuchess-5.07 PKGREVISION= 4 @@ -35,6 +35,6 @@ INSTALLATION_DIRS= ${DOCDIR} post-install: ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/README ${DESTDIR}${DOCDIR} -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/minami/Makefile b/games/minami/Makefile index 8dbe9fbd188..ce34981a653 100644 --- a/games/minami/Makefile +++ b/games/minami/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/05/31 12:41:03 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:22 ryoon Exp $ # DISTNAME= minami-1.0.2 @@ -19,5 +19,5 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/minami ${DESTDIR}${PREFIX}/bin -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/teg/Makefile b/games/teg/Makefile index 4c90f80d524..dcb07bdf769 100644 --- a/games/teg/Makefile +++ b/games/teg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2013/06/06 12:54:26 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= teg-0.11.1 PKGREVISION= 37 @@ -18,5 +18,5 @@ GCONF_SCHEMAS+= teg.schemas .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/GConf/schemas.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index 622e1cf9de3..cd129a6e31f 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/05/31 12:41:03 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= xscorch-0.2.0 PKGREVISION= 8 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-gnome .include "../../audio/libmikmod/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile index c0bb221263d..e473d614eee 100644 --- a/geography/mapserver/Makefile +++ b/geography/mapserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/07/05 13:29:33 ryoon Exp $ +# $NetBSD: Makefile,v 1.48 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= mapserver-5.6.8 PKGREVISION= 12 @@ -42,7 +42,7 @@ do-install: .include "../../converters/fribidi/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../geography/gdal-lib/buildlink3.mk" .include "../../geography/geos/buildlink3.mk" diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index cc1c383ba34..c53805fce94 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2013/07/04 21:27:57 adam Exp $ +# $NetBSD: Makefile,v 1.81 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= gnuplot-4.6.3 PKGREVISION= 4 @@ -27,21 +27,9 @@ CONFIGURE_ARGS+= --without-tutorial CONFIGURE_ARGS+= ac_cv_prog_EMACS= INFO_FILES= yes -# Use BSD editline wherever possible: -.include "../../mk/bsd.prefs.mk" - -.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" -. if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[01234].*) -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -.include "../../devel/readline/buildlink3.mk" -. else CONFIGURE_ARGS+= --with-readline=bsd +.include "../../mk/readline.buildlink3.mk" .include "../../mk/curses.buildlink3.mk" -. endif -.else -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -.include "../../devel/readline/buildlink3.mk" -.endif LDFLAGS.SunOS+= -liconv diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 002f5fd6fa1..a3df2a4c89e 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2012/10/06 14:10:56 asau Exp $ +# $NetBSD: Makefile,v 1.58 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= gphoto2-2.4.14 CATEGORIES= graphics @@ -19,15 +19,13 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cdk-prefix=${BUILDLINK_PREFIX.cdk} CONFIGURE_ARGS+= --with-jpeg-prefix=${JPEGBASE} -# uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text() -USE_GNU_READLINE= yes - CFLAGS.Darwin+= -D_DARWIN_C_SOURCE .include "../../devel/cdk/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" +# uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text() .include "../../devel/readline/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index 9c0cecdb8af..ad990d86155 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/06/23 18:12:46 dholland Exp $ +# $NetBSD: Makefile,v 1.47 2013/07/15 02:02:22 ryoon Exp $ DISTNAME= gri-2.12.23 PKGREVISION= 4 @@ -27,5 +27,5 @@ pre-configure: .include "../../devel/netcdf/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 0f4a9e81355..1189bbc244f 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2013/06/06 12:54:35 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2013/07/15 02:02:22 ryoon Exp $ # DISTNAME= scigraphica-2.1.0 @@ -11,7 +11,6 @@ HOMEPAGE= http://scigraphica.sourceforge.net/ COMMENT= Data analysis and technical graphics USE_TOOLS+= gmake intltool pkg-config -USE_GNU_READLINE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-gnome @@ -27,6 +26,7 @@ PTHREAD_AUTO_VARS= yes pre-configure: ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python +.include "../../devel/readline/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../graphics/libscigraphica/buildlink3.mk" diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index c654d043eee..adbf5587e0b 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2013/07/05 13:29:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.81 2013/07/15 02:02:22 ryoon Exp $ # .include "../../inputmethod/uim/Makefile.common" @@ -27,9 +27,7 @@ CFLAGS.SunOS+= -std=c99 -D__EXTENSIONS__ .include "options.mk" PLIST_VARS+= editline -CHECK_BUILTIN.readline:= yes -.include "../../devel/readline/builtin.mk" -CHECK_BUILTIN.readline:= no +.include "../../mk/readline.builtin.mk" .if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) PLIST.editline= yes diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile index e67de6fac9c..b6c12b56b5f 100644 --- a/lang/algol68g/Makefile +++ b/lang/algol68g/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/06/30 09:43:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= algol68g-2.7 CATEGORIES= lang @@ -17,7 +17,7 @@ TEST_TARGET= check .include "options.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../math/gsl/buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk index c215265e169..844b4d40e0f 100644 --- a/lang/clisp/options.mk +++ b/lang/clisp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2011/04/20 18:50:00 hans Exp $ +# $NetBSD: options.mk,v 1.10 2013/07/15 02:02:23 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.clisp @@ -39,7 +39,6 @@ CONFIGURE_ARGS+= --with-dynamic-ffi .endif .if !empty(PKG_OPTIONS:Mreadline) -USE_GNU_READLINE= YES CONFIGURE_ARGS+= --with-readline .include "../../devel/readline/buildlink3.mk" .endif diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile index 3f0446fc8ad..c6c1445a5ab 100644 --- a/lang/gawk/Makefile +++ b/lang/gawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2013/05/15 11:55:20 adam Exp $ +# $NetBSD: Makefile,v 1.56 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= gawk-4.1.0 CATEGORIES= lang @@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_GNU_READLINE= yes USE_TOOLS+= msgfmt GNU_CONFIGURE= yes TEST_TARGET= check diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 7cfd6262e61..67daf697b4a 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/05/31 12:41:11 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= ghc-6.8.3 PKGREVISION= 4 @@ -28,7 +28,6 @@ CHECK_PORTABILITY_SKIP+= libraries/base/cbits/ubconfc GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ghc=${WRKDIR}/ghc-6.4.2/ghc/compiler/ghc-inplace CONFIGURE_ENV+= PerlCmd=${PERL5:Q} -USE_GNU_READLINE= yes # uses the UNDO_ constants USE_TOOLS+= gmake perl:run SUBST_CLASSES+= prefix @@ -56,6 +55,7 @@ pre-configure: pre-build: ${ECHO} "SplitObjs=NO" > ${WRKSRC}/mk/build.mk +# uses the UNDO_ constants .include "../../devel/readline/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index a194198d998..573298bbc21 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2013/05/31 12:41:11 wiz Exp $ +# $NetBSD: Makefile,v 1.101 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= guile-1.8.8 PKGREVISION= 3 @@ -15,7 +15,6 @@ CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]* GNU_CONFIGURE= YES USE_TOOLS+= gmake makeinfo USE_LIBTOOL= YES -USE_GNU_READLINE= YES PTHREAD_AUTO_VARS= YES INFO_FILES= YES PKGCONFIG_OVERRIDE= guile-1.8.pc.in diff --git a/lang/guile16/Makefile b/lang/guile16/Makefile index 291ef2a34d0..2169c886bf9 100644 --- a/lang/guile16/Makefile +++ b/lang/guile16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/04/06 20:27:22 rodent Exp $ +# $NetBSD: Makefile,v 1.11 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= guile-1.6.8 PKGREVISION= 5 @@ -17,7 +17,6 @@ GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/1.6 USE_TOOLS+= gmake makeinfo USE_LIBTOOL= YES -USE_GNU_READLINE= YES PTHREAD_AUTO_VARS= YES INFO_FILES= yes diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index d3967b78027..78e0e4a2cc1 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2013/06/18 19:58:48 joerg Exp $ +# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= hugs98-Sep2006 PKGNAME= hugs98-200609 @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= ice_cv_traditional_cpp=${PREFIX}/bin/tradcpp .endif .if !empty(PKG_OPTIONS:Mreadline) -. include "../../devel/readline/buildlink3.mk" +. include "../../mk/readline.buildlink3.mk" .else CONFIGURE_ARGS+= ac_cv_lib_readline_readline=no .endif diff --git a/lang/konoha/Makefile b/lang/konoha/Makefile index 1bdd2c06170..5361e3a90cf 100644 --- a/lang/konoha/Makefile +++ b/lang/konoha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/05/09 07:40:02 adam Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:23 ryoon Exp $ # DISTNAME= konoha-1.0.0-952 @@ -19,7 +19,7 @@ USE_LANGUAGES= c c++ .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 3f7a0feae84..1270a0d92cf 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/04/06 20:27:23 rodent Exp $ +# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= ksi-3.9.0 CATEGORIES= lang @@ -15,11 +15,11 @@ GNU_CONFIGURE= yes USE_TOOLS+= makeinfo INFO_FILES= yes MAKE_ENV+= GC_PREFIX=${BUILDLINK_PREFIX.boehm-gc:Q} -USE_GNU_READLINE= # uses rl_event_hook() interface USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes .include "../../devel/boehm-gc/buildlink3.mk" +# uses rl_event_hook() interface .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" diff --git a/lang/librep/Makefile b/lang/librep/Makefile index d6874420e07..0d48203c584 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2012/10/02 20:11:44 asau Exp $ +# $NetBSD: Makefile,v 1.60 2013/07/15 02:02:23 ryoon Exp $ # DISTNAME= librep-0.91.0 @@ -12,7 +12,6 @@ HOMEPAGE= http://librep.sourceforge.net/ COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM USE_TOOLS+= gmake makeinfo -USE_GNU_READLINE= yes # uses rl_basic_quote_characters USE_LIBTOOL= yes # we have a symlink to libtool DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base @@ -45,5 +44,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" +# uses rl_basic_quote_characters .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/lua/Makefile b/lang/lua/Makefile index d604e5da21d..3ecf16a2e28 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2013/07/04 18:04:42 adam Exp $ +# $NetBSD: Makefile,v 1.51 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= lua-${LUA_VERSION} CATEGORIES= lang @@ -52,6 +52,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.??? ${DESTDIR}${PREFIX}/share/doc/lua ${INSTALL_DATA} ${WRKSRC}/doc/*.???? ${DESTDIR}${PREFIX}/share/doc/lua -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk index 231dc9d8875..9dc17fc48a6 100644 --- a/lang/lua/buildlink3.mk +++ b/lang/lua/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2013/07/04 18:04:42 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2013/07/15 02:02:23 ryoon Exp $ BUILDLINK_TREE+= lua @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.lua+= lua>=5.2.0 BUILDLINK_ABI_DEPENDS.lua+= lua>=5.2.0 BUILDLINK_PKGSRCDIR.lua?= ../../lang/lua -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .endif # LUA_BUILDLINK3_MK BUILDLINK_TREE+= -lua diff --git a/lang/lush/Makefile b/lang/lush/Makefile index 280afc8716c..c61c5efe793 100644 --- a/lang/lush/Makefile +++ b/lang/lush/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/10/02 20:11:45 asau Exp $ +# $NetBSD: Makefile,v 1.10 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= lush-1.2.1 PKGREVISION= 2 @@ -12,7 +12,6 @@ COMMENT= Lisp interpreter/compiler with a seamless interface to C GNU_CONFIGURE= yes USE_TOOLS+= gmake USE_LIBTOOL= yes -USE_GNU_READLINE= yes # rl_getc, rl_basic_quote_characters, rl_insert_close CONFIGURE_ARGS+= --without-bfd @@ -25,6 +24,7 @@ post-install: .include "../../math/lapack/buildlink3.mk" .include "../../math/blas/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" +# rl_getc, rl_basic_quote_characters, rl_insert_close .include "../../devel/readline/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../audio/libaudiofile/buildlink3.mk" diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 980a59620cc..8eec68d22d0 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/07/03 14:34:32 jperkin Exp $ +# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:23 ryoon Exp $ DISTNAME= mercury-srcdist-13.05.1-beta-2013-05-28 PKGNAME= mercury-13.05.1beta @@ -15,7 +15,6 @@ COMMENT= Modern logic/functional programming language GNU_CONFIGURE= yes USE_TOOLS+= gmake pax bison flex USE_TOOLS+= perl # ? -USE_GNU_READLINE= yes # rl_prep_term_function INFO_FILES= yes # Some of the scripts test CC and use special settings for gcc. @@ -56,6 +55,7 @@ do-install: cd ${WRKSRC}/samples && \ pax -rw . ${DESTDIR}${PREFIX}/share/examples/mercury +# rl_prep_term_function .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 0c4ffc54ac6..075baac3c0f 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/07/12 13:37:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:23 ryoon Exp $ # DISTNAME= newlisp-10.5.3 @@ -25,5 +25,5 @@ SUBST_FILES.interpreter= guiserver/*lsp util/syntax.cgi util/newlispdoc SUBST_SED.interpreter= -e 's,/usr/bin/newlisp,${PREFIX}/bin/newlisp,' SUBST_SED.interpreter+= -e 's,/usr/bin/env newlisp,${PREFIX}/bin/newlisp,' -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ossp-js/Makefile b/lang/ossp-js/Makefile index a9eceb13a73..dd54caff370 100644 --- a/lang/ossp-js/Makefile +++ b/lang/ossp-js/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/05/31 12:41:11 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2013/07/15 02:02:23 ryoon Exp $ # DISTNAME= js-1.6.20070208 @@ -48,5 +48,5 @@ CONFIGURE_ENV+= LIBM="-lm" .endif .include "../../mk/dlopen.buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile index 5e74ba259c5..52ae6fbe80d 100644 --- a/lang/parrot/Makefile +++ b/lang/parrot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2013/05/31 12:41:12 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2013/07/15 02:02:24 ryoon Exp $ # VERSION= 4.8.0 @@ -92,5 +92,5 @@ pre-install: .include "../../textproc/icu/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/php53/Makefile.php b/lang/php53/Makefile.php index 5a7e4836b7a..c727c194911 100644 --- a/lang/php53/Makefile.php +++ b/lang/php53/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.35 2013/07/12 00:07:04 taca Exp $ +# $NetBSD: Makefile.php,v 1.36 2013/07/15 02:02:24 ryoon Exp $ # used by lang/php53/Makefile # used by www/ap-php/Makefile @@ -96,7 +96,6 @@ CONFIGURE_ARGS+= --enable-maintainer-zts .endif .if !empty(PKG_OPTIONS:Mreadline) -USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .else diff --git a/lang/php54/Makefile.php b/lang/php54/Makefile.php index 125268ae7b0..b03e67df47b 100644 --- a/lang/php54/Makefile.php +++ b/lang/php54/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.4 2012/07/27 00:21:03 obache Exp $ +# $NetBSD: Makefile.php,v 1.5 2013/07/15 02:02:24 ryoon Exp $ # used by lang/php54/Makefile # used by www/ap-php/Makefile @@ -99,7 +99,6 @@ CONFIGURE_ARGS+= --enable-maintainer-zts .endif .if !empty(PKG_OPTIONS:Mreadline) -USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .else diff --git a/lang/picoc/Makefile b/lang/picoc/Makefile index 61421b508af..83ba29bdcc4 100644 --- a/lang/picoc/Makefile +++ b/lang/picoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/02 20:11:49 asau Exp $ +# $NetBSD: Makefile,v 1.3 2013/07/15 02:02:24 ryoon Exp $ DISTNAME= picoc-2.1 CATEGORIES= lang @@ -17,6 +17,6 @@ AUTO_MKDIRS= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/picoc ${DESTDIR}${PREFIX}/bin/picoc -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 844de18bc01..4b82677192d 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2013/02/06 23:22:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.53 2013/07/15 02:02:24 ryoon Exp $ .include "dist.mk" @@ -175,7 +175,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython2.6.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk" diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 328cb215808..566f96018a8 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/04/17 10:00:57 sbd Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:24 ryoon Exp $ .include "dist.mk" @@ -173,7 +173,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython2.7.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk" diff --git a/lang/python32/Makefile b/lang/python32/Makefile index b6bb08bd1d3..d34f1e7bb8c 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/02/06 23:22:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:24 ryoon Exp $ .include "dist.mk" @@ -115,7 +115,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython3.2.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk" diff --git a/lang/python33/Makefile b/lang/python33/Makefile index aa5c61a173b..b0adf9380f6 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/05/26 17:56:09 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:24 ryoon Exp $ .include "dist.mk" @@ -107,7 +107,6 @@ post-install: ${DESTDIR}${PREFIX}/lib/libpython3.3.sl.1.0 .endif -USE_GNU_READLINE= yes BUILDLINK_DEPMETHOD.readline= build .include "../../archivers/bzip2/buildlink3.mk" diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 7b705c3c3b1..461b8429ad5 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/10/02 20:11:53 asau Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:24 ryoon Exp $ # # Convert the version number as follows 2d2 -> 2.4.2, where the d is # changed to a 4, representing the 4th letter. @@ -41,7 +41,7 @@ INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ INSTALLATION_DIRS= ${PKGINFODIR} share/scm -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" post-extract: ${SED} -e "s|@SLIB_PREFIX@|"${SLIB_PREFIX:Q}"|g" \ diff --git a/lang/see/Makefile b/lang/see/Makefile index 40eda4addb6..3ac1c61b3e4 100644 --- a/lang/see/Makefile +++ b/lang/see/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/05/31 12:41:12 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:24 ryoon Exp $ # DISTNAME= see-3.0.1376 @@ -30,5 +30,5 @@ post-install: .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/boehm-gc/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/see/buildlink3.mk b/lang/see/buildlink3.mk index 816d42b45b3..07a10faff3b 100644 --- a/lang/see/buildlink3.mk +++ b/lang/see/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2012/05/07 01:53:42 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2013/07/15 02:02:24 ryoon Exp $ BUILDLINK_TREE+= see @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.see+= see>=3.0.1376 BUILDLINK_ABI_DEPENDS.see+= see>=3.0.1376nb2 BUILDLINK_PKGSRCDIR.see?= ../../lang/see -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .endif # SEE_BUILDLINK3_MK BUILDLINK_TREE+= -see diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index f694e5ed647..e0b010eab6c 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2013/06/06 12:54:40 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2013/07/15 02:02:24 ryoon Exp $ DISTNAME= smalltalk-3.2.4 PKGREVISION= 15 @@ -14,7 +14,6 @@ ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc MAKE_JOBS_SAFE= no USE_TOOLS+= gawk gmake makeinfo pkg-config zip -USE_GNU_READLINE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-system-ltdl diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 41c819dd8e5..19600551d31 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2012/10/21 21:07:11 cheusov Exp $ +# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:24 ryoon Exp $ DISTNAME= js-1.8.0-rc1 PKGNAME= spidermonkey-1.8.0rc1 @@ -64,5 +64,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.h ${DESTDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/*.tbl ${DESTDIR}${PREFIX}/include -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/spidermonkey/buildlink3.mk b/lang/spidermonkey/buildlink3.mk index b0cf09fcc08..1d4b9b85227 100644 --- a/lang/spidermonkey/buildlink3.mk +++ b/lang/spidermonkey/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2012/05/07 01:53:42 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2013/07/15 02:02:24 ryoon Exp $ BUILDLINK_TREE+= spidermonkey @@ -15,7 +15,7 @@ BUILDLINK_ABI_DEPENDS.spidermonkey+= spidermonkey>=1.5nb8 .endif BUILDLINK_PKGSRCDIR.spidermonkey?= ../../lang/spidermonkey -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" pkgbase := spidermonkey .include "../../mk/pkg-build-options.mk" diff --git a/lang/spl/Makefile b/lang/spl/Makefile index 01cf27ec53a..b319af59b48 100644 --- a/lang/spl/Makefile +++ b/lang/spl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/05/09 07:40:02 adam Exp $ +# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:24 ryoon Exp $ # DISTNAME= spl-1.0pre3 @@ -46,5 +46,5 @@ post-install: .include "../../devel/ncurses/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/swi-prolog-lite/Makefile b/lang/swi-prolog-lite/Makefile index 57769ed1c7f..874713ebb55 100644 --- a/lang/swi-prolog-lite/Makefile +++ b/lang/swi-prolog-lite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/02 20:11:55 asau Exp $ +# $NetBSD: Makefile,v 1.21 2013/07/15 02:02:24 ryoon Exp $ .include "Makefile.common" @@ -10,7 +10,6 @@ COMMENT= ISO/Edinburgh-style Prolog compiler GNU_CONFIGURE= yes CONFIGURE_DIRS= src -USE_GNU_READLINE= yes # uses rl_event_hook() interface CONFIGURE_ENV+= PL=swi-prolog CONFIGURE_ENV+= ARCH=${MACHINE_GNU_PLATFORM} # make PLIST consistent @@ -38,6 +37,7 @@ post-install: ${DESTDIR}${PREFIX}/lib/swi-prolog-${SWIPLVERS}/library/shlib.pl .include "../../devel/ncurses/buildlink3.mk" +# uses rl_event_hook() interface .include "../../devel/readline/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile index 4f9a9622e83..1e0a13fc9f6 100644 --- a/lang/swi-prolog-packages/Makefile +++ b/lang/swi-prolog-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/06/06 12:54:40 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2013/07/15 02:02:25 ryoon Exp $ .include "../../lang/swi-prolog-lite/Makefile.common" @@ -9,7 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Packages for SWI Prolog GNU_CONFIGURE= yes -USE_GNU_READLINE= yes # uses rl_event_hook() interface USE_TOOLS+= gmake pkg-config MAKE_JOBS_SAFE= no @@ -88,6 +87,7 @@ CHECK_WRKREF_SKIP= lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/lib/${MACHIN .include "../../mk/jpeg.buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +# uses rl_event_hook() interface .include "../../devel/readline/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/lang/yap/Makefile b/lang/yap/Makefile index 77d980dc7d1..a342ed3c5d0 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/06/12 20:28:41 asau Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= yap-6.3.3 CATEGORIES= lang @@ -17,8 +17,6 @@ USE_TOOLS= gmake CONFIGURE_ENV+= INDENT=${TRUE:Q} -USE_GNU_READLINE= yes - # debug option: #CONFIGURE_ARGS+= --enable-debug-yap diff --git a/mail/exim/options.mk b/mail/exim/options.mk index ead29471417..2e22595e2f6 100644 --- a/mail/exim/options.mk +++ b/mail/exim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2012/06/12 15:45:57 wiz Exp $ +# $NetBSD: options.mk,v 1.20 2013/07/15 02:02:25 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.exim PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore @@ -152,6 +152,5 @@ LOOKUP_LIBS+= -lspf2 .if !empty(PKG_OPTIONS:Mreadline) LOCAL_MAKEFILE_OPTIONS+=USE_READLINE=yes LOOKUP_LIBS+= -lreadline -USE_GNU_READLINE= yes . include "../../devel/readline/buildlink3.mk" .endif diff --git a/math/R/Makefile b/math/R/Makefile index c05ff05588d..a6a2e21fc0e 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2013/06/06 12:54:42 wiz Exp $ +# $NetBSD: Makefile,v 1.141 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= R-2.15.1 PKGREVISION= 7 @@ -21,7 +21,6 @@ INSTALL_TARGET= install install-info TEST_TARGET= check USE_TOOLS+= gmake gzip:run makeinfo perl:run sed unzip:run xmkmf USE_TOOLS+= pkg-config -USE_GNU_READLINE= yes # uses callback interface USE_GNU_ICONV= yes # latin1 support, iconvlist USE_LANGUAGES= c c++ fortran USE_LIBTOOL= yes @@ -129,6 +128,7 @@ CONFIGURE_ARGS+= --enable-mbcs=no .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" +# uses callback interface .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" diff --git a/math/aamath/Makefile b/math/aamath/Makefile index 0a7189ba3d1..eea9cec5d2f 100644 --- a/math/aamath/Makefile +++ b/math/aamath/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2012/09/11 23:04:16 asau Exp $ +# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:25 ryoon Exp $ # DISTNAME= aamath-0.3 @@ -24,5 +24,5 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/aamath ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/aamath.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/algae/Makefile b/math/algae/Makefile index 10368de264e..444c40b1c44 100644 --- a/math/algae/Makefile +++ b/math/algae/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/09/11 23:04:16 asau Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= algae-4.3.6 PKGREVISION= 2 @@ -15,12 +15,12 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dlmalloc CONFIGURE_ENV= ac_cv_path_XTERM=xterm USE_LANGUAGES= c fortran77 -USE_GNU_READLINE= yes # uses history_truncate_file INFO_FILES= yes INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \ mandir=${PREFIX}/${PKGMANDIR}/man1 \ infodir=${PREFIX}/${PKGINFODIR} \ htmldir=${PREFIX}/share/doc/algae +# uses history_truncate_file .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/analitza/Makefile b/math/analitza/Makefile index 24f7a93f9ce..c7c61b46a26 100644 --- a/math/analitza/Makefile +++ b/math/analitza/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/07/05 13:29:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= analitza-${_KDE_VERSION} PKGREVISION= 4 @@ -7,7 +7,6 @@ COMMENT= KDE library for mathematical features .include "../../meta-pkgs/kde4/Makefile.kde4" -USE_GNU_READLINE= yes BROKEN_READLINE_DETECTION= yes .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/math/bc/Makefile b/math/bc/Makefile index c003bcc8b80..f3c6ef755b4 100644 --- a/math/bc/Makefile +++ b/math/bc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/04/06 20:27:24 rodent Exp $ +# $NetBSD: Makefile,v 1.12 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= bc-1.06 PKGREVISION= 3 @@ -14,5 +14,5 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-readline INFO_FILES= yes -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile index caceaea01c7..055f45521cb 100644 --- a/math/capc-calc/Makefile +++ b/math/capc-calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2012/09/11 23:04:17 asau Exp $ +# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:25 ryoon Exp $ # DISTNAME= calc-2.12.4.1 @@ -23,5 +23,5 @@ INSTALL_MAKE_FLAGS+= T=${DESTDIR} TEST_TARGET= check .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile index 2a7d13d4059..abd96ac751c 100644 --- a/math/eukleides/Makefile +++ b/math/eukleides/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/06/26 15:50:30 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= eukleides-1.5.4 PKGREVISION= 1 @@ -39,7 +39,7 @@ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} \ pre-install: ${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \; -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../print/kpathsea/texmf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 26aeddd78e2..dbc115bc06a 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/06/06 12:54:43 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= fityk-0.9.7 PKGREVISION= 14 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-xyconvert .include "../../devel/boost-headers/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../math/xylib/buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/math/genius/Makefile b/math/genius/Makefile index 7dc7c6748f8..94ec2c80322 100644 --- a/math/genius/Makefile +++ b/math/genius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2013/06/06 12:54:43 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2013/07/15 02:02:25 ryoon Exp $ # DISTNAME= genius-1.0.16 @@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config gmake intltool msgfmt -USE_GNU_READLINE= yes .include "options.mk" diff --git a/math/nickle/Makefile b/math/nickle/Makefile index 3807f1e1e71..293eaf35f76 100644 --- a/math/nickle/Makefile +++ b/math/nickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/05/30 16:58:01 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= nickle-2.77 CATEGORIES= math lang @@ -15,10 +15,6 @@ TEST_TARGET= check .include "../../mk/bsd.prefs.mk" -.if (${OPSYS} == NetBSD) && empty(OS_VERSION:M6.99.2[1-9]*) && empty(OS_VERSION:M6.99.[345679][0-9]*) && empty(OS_VERSION:M[789].*) || (${OPSYS} == "DragonFly") # lex.l:131:5: error: 'rl_catch_signals' undeclared (first use in this function) -USE_GNU_READLINE= yes -.endif - .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/octave/Makefile b/math/octave/Makefile index f39d88e036d..0152d8dae7e 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.116 2013/06/04 22:16:38 tron Exp $ +# $NetBSD: Makefile,v 1.117 2013/07/15 02:02:25 ryoon Exp $ DISTNAME= octave-${OCTAVE_VER} PKGREVISION= 3 @@ -22,7 +22,6 @@ OCTAVE_VER= 3.6.4 BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3) .endif -USE_GNU_READLINE= yes USE_LIBTOOL= yes USE_TOOLS+= autoconf gsed gmake:run makeinfo perl pkg-config bison GNU_CONFIGURE= yes diff --git a/math/ordCalc/Makefile b/math/ordCalc/Makefile index 2bec1c23e41..54251c52b51 100644 --- a/math/ordCalc/Makefile +++ b/math/ordCalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/09/11 23:04:25 asau Exp $ +# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:26 ryoon Exp $ # ORDCALCVER= 0.2 @@ -35,6 +35,6 @@ do-install: .include "../../devel/gmp/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/Makefile b/math/pari/Makefile index 24392fbb219..211819db82a 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/05/31 12:41:24 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:26 ryoon Exp $ DISTNAME= pari-2.3.5 PKGREVISION= 13 @@ -15,7 +15,6 @@ MAKE_JOBS_SAFE= no USE_LIBTOOL= yes USE_TOOLS+= perl:run USE_LANGUAGES+= c c++ -USE_GNU_READLINE= yes # rl_save_prompt() HAS_CONFIGURE= yes CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} CONFIGURE_ENV+= PERL5=${PERL5:Q} @@ -40,5 +39,6 @@ SUBST_SED.fix-cfg= -e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g' .include "options.mk" .include "../../devel/ncurses/buildlink3.mk" +# rl_save_prompt() .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 94aa78ce3db..47869ba87a2 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2013/06/06 12:54:44 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= pspp-0.6.2 @@ -30,7 +30,7 @@ USE_NCURSES= yes # we only want the charset.alias file, so no buildlinkery for libiconv DEPENDS+= libiconv-[0-9]*:../../converters/libiconv .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile index 9e42234dd66..e5bf1e59431 100644 --- a/math/qalculate/Makefile +++ b/math/qalculate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2012/09/15 10:05:32 obache Exp $ +# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:26 ryoon Exp $ DISTNAME= libqalculate-0.9.7 PKGNAME= qalculate-0.9.7 @@ -10,7 +10,6 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://qalculate.sourceforge.net/ COMMENT= Modern multi-purpose desktop calculator (console version) -USE_GNU_READLINE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/math/units/Makefile b/math/units/Makefile index 88c8d7c522b..23b86ff717c 100644 --- a/math/units/Makefile +++ b/math/units/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/12/06 11:42:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:26 ryoon Exp $ DISTNAME= units-2.01 CATEGORIES= math @@ -22,6 +22,6 @@ REPLACE_PYTHON= units_cur post-install: ${LN} -sf ${PREFIX}/bin/gunits ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/units -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile index 580a1f6ebcf..37247fe19ca 100644 --- a/misc/chipmunk/Makefile +++ b/misc/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/08 09:57:17 asau Exp $ +# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= chipmunk-1.4 @@ -21,5 +21,5 @@ INSTALLATION_DIRS= sbin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${DESTDIR}${PREFIX}/sbin/chipmunk -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/rlwrap/Makefile b/misc/rlwrap/Makefile index 97ef1f8dba3..0eb98b40682 100644 --- a/misc/rlwrap/Makefile +++ b/misc/rlwrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/05/31 12:41:29 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= rlwrap-0.37 @@ -17,7 +17,6 @@ GNU_CONFIGURE= yes .include "options.mk" -USE_GNU_READLINE= yes USE_LANGUAGES= c USE_TOOLS+= gmake perl:run diff --git a/misc/urjtag/Makefile b/misc/urjtag/Makefile index 640eb17e42d..ff86ae0cd17 100644 --- a/misc/urjtag/Makefile +++ b/misc/urjtag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 09:57:39 asau Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= urjtag-0.10 @@ -19,7 +19,7 @@ REPLACE_SH= src/bsdl2jtag post-extract: ${CP} ${FILESDIR}/usbprog.c ${WRKSRC}/src/tap/cable -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" .include "../../devel/libftdi/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/misc/usbprog/Makefile b/misc/usbprog/Makefile index 9aa6816fb6b..f5fdd0e2393 100644 --- a/misc/usbprog/Makefile +++ b/misc/usbprog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/06/06 12:54:50 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= usbprog-0.2.0 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes .include "../../www/curl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../x11/wxGTK28/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/ccxstream/Makefile b/multimedia/ccxstream/Makefile index 2f21e7eadac..519852bdbad 100644 --- a/multimedia/ccxstream/Makefile +++ b/multimedia/ccxstream/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/08 09:20:58 asau Exp $ +# $NetBSD: Makefile,v 1.3 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= ccxstream-1.0.15 @@ -26,5 +26,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/PORTING ${DESTDIR}${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/TODO ${DESTDIR}${PREFIX}/${DOCDIR} -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile index a1be33dd376..45b98991025 100644 --- a/multimedia/xine-ui/Makefile +++ b/multimedia/xine-ui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2013/06/06 12:54:54 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= xine-ui-0.99.7 @@ -15,7 +15,6 @@ USE_PKGLOCALEDIR= YES USE_TOOLS+= msgfmt pkg-config gmake USE_LIBTOOL= YES GNU_CONFIGURE= YES -USE_GNU_READLINE= yes CONFIGURE_ARGS+= --disable-lirc BUILDLINK_DEPMETHOD.libXt?= build diff --git a/net/bind99/options.mk b/net/bind99/options.mk index 8bb5fdf028e..1b862be6387 100644 --- a/net/bind99/options.mk +++ b/net/bind99/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2013/06/06 02:55:03 taca Exp $ +# $NetBSD: options.mk,v 1.8 2013/07/15 02:02:26 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bind99 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server @@ -92,7 +92,7 @@ CONFIGURE_ARGS+= --disable-threads ### readline support in dig(1) and nsupdate(1). ### .if !empty(PKG_OPTIONS:Mreadline) -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" CONFIGURE_ARGS+= --with-readline .else CONFIGURE_ARGS+= --without-readline diff --git a/net/bird/Makefile.common b/net/bird/Makefile.common index 89ad3259e1c..2290dbcd0ec 100644 --- a/net/bird/Makefile.common +++ b/net/bird/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2012/10/23 17:18:11 asau Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/07/15 02:02:26 ryoon Exp $ # used by net/bird/Makefile # used by net/bird6/Makefile @@ -15,7 +15,6 @@ LICENSE= gnu-gpl-v2 USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake flex bison -USE_GNU_READLINE= yes CONFIGURE_ARGS+= --localstatedir=/var BIRD6?= # empty diff --git a/net/chrony/Makefile b/net/chrony/Makefile index d65421a9424..761f47f9555 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/10/23 17:18:14 asau Exp $ +# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:26 ryoon Exp $ DISTNAME= chrony-1.24 CATEGORIES= net @@ -35,6 +35,6 @@ post-install: ${DESTDIR}${EGDIR}/$${file}; \ done -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/coda/Makefile b/net/coda/Makefile index cb2e4dfc941..47e2d249c5a 100644 --- a/net/coda/Makefile +++ b/net/coda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/05/31 12:41:32 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:26 ryoon Exp $ # DISTNAME= coda-6.9.5 @@ -25,7 +25,7 @@ REPLACE_PERL= coda-src/scripts/tape.pl coda-src/scripts/volmunge .include "../../devel/lwp/buildlink3.mk" .include "../../devel/rpc2/buildlink3.mk" .include "../../devel/rvm/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/net/irrtoolset5/Makefile b/net/irrtoolset5/Makefile index bc5868c308a..dd9fc6737e3 100644 --- a/net/irrtoolset5/Makefile +++ b/net/irrtoolset5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:29 asau Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $ # VERSION= 5.0.1 @@ -33,5 +33,5 @@ CONFIGURE_ENV+= LEX="${PREFIX}/bin/flex" .include "../../devel/flex/buildlink3.mk" .endif -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/lftp/Makefile b/net/lftp/Makefile index a416c37140e..24fa41ccfd3 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2013/05/31 12:41:34 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= lftp-4.4.6 PKGREVISION= 1 @@ -17,7 +17,6 @@ LICENSE= gnu-gpl-v3 PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_GNU_READLINE= yes # uses _rl_mark_modified_lines USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -50,6 +49,7 @@ post-install: post-install-perl .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +# uses _rl_mark_modified_lines .include "../../devel/readline/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/microdc2/Makefile b/net/microdc2/Makefile index ecc46b5b8be..6a2579734c7 100644 --- a/net/microdc2/Makefile +++ b/net/microdc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:36 asau Exp $ +# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $ # DISTNAME= microdc2-0.15.6 @@ -15,7 +15,6 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.16 GNU_CONFIGURE= yes -USE_GNU_READLINE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= ln msgfmt msgmerge diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 9fc5a91abc8..2b491b18d63 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2013/05/31 12:41:35 wiz Exp $ +# $NetBSD: Makefile,v 1.74 2013/07/15 02:02:27 ryoon Exp $ # DISTNAME= ntp-4.2.4p8 @@ -67,5 +67,5 @@ CONFIGURE_ARGS+= --with-openssl-incdir=${SSLBASE}/include CONFIGURE_ARGS+= --with-openssl-libdir=${SSLBASE}/lib CONFIGURE_ARGS+= --with-crypto=openssl -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/quagga/options.mk b/net/quagga/options.mk index 3ab2ceba852..b91149b66d2 100644 --- a/net/quagga/options.mk +++ b/net/quagga/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2012/06/13 14:45:19 gdt Exp $ +# $NetBSD: options.mk,v 1.7 2013/07/15 02:02:27 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.quagga PKG_SUPPORTED_OPTIONS= inet6 @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-ripngd ### Include 'vtysh' program. ### .if !empty(PKG_OPTIONS:Mquagga-vtysh) -USE_GNU_READLINE= # uses rl_pending_input +# uses rl_pending_input . include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --enable-vtysh PLIST_CAT+= ${PKGDIR}/PLIST.vtysh diff --git a/net/samba/Makefile b/net/samba/Makefile index f62df2f932c..476fe8a9d0e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.235 2013/07/03 20:00:47 adam Exp $ +# $NetBSD: Makefile,v 1.236 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= samba-${VERSION} CATEGORIES= net @@ -47,7 +47,6 @@ USE_TOOLS+= gmake mktemp perl:run pkg-config REPLACE_PERL= script/findsmb.in BROKEN_GETTEXT_DETECTION=yes -USE_GNU_READLINE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} diff --git a/net/samba35/Makefile b/net/samba35/Makefile index 8404b31a025..7a55a2006d5 100644 --- a/net/samba35/Makefile +++ b/net/samba35/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/06/12 12:35:35 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2013/07/15 02:02:27 ryoon Exp $ .include "../../net/samba/Makefile.mirrors" @@ -51,7 +51,6 @@ USE_TOOLS+= gmake mktemp perl:run REPLACE_PERL= script/findsmb.in BROKEN_GETTEXT_DETECTION=yes -USE_GNU_READLINE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${SAMBA_LIBDIR} CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} diff --git a/net/scli/Makefile b/net/scli/Makefile index 32c991d9879..453bc6d06a9 100644 --- a/net/scli/Makefile +++ b/net/scli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2012/10/23 17:19:07 asau Exp $ +# $NetBSD: Makefile,v 1.31 2013/07/15 02:02:27 ryoon Exp $ # DISTNAME= scli-0.3.1 @@ -13,13 +13,13 @@ COMMENT= SNMP command line interface GNU_CONFIGURE= yes USE_TOOLS+= pkg-config gmake -USE_GNU_READLINE= yes # history_list BUILDLINK_API_DEPENDS.readline+= readline>=4.0 INFO_FILES= yes .include "../../devel/glib2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" +# history_list .include "../../devel/readline/buildlink3.mk" .include "../../net/gnet/buildlink3.mk" .include "../../net/gsnmp/buildlink3.mk" diff --git a/net/socat/Makefile b/net/socat/Makefile index 1b890429d02..f87b016a5ef 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/05/10 00:46:53 riastradh Exp $ +# $NetBSD: Makefile,v 1.29 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= socat-1.7.2.1 CATEGORIES= net @@ -10,7 +10,6 @@ COMMENT= "netcat++" (extended design, new implementation) LICENSE= gnu-gpl-v2 GNU_CONFIGURE= YES -USE_GNU_READLINE= YES ONLY_FOR_COMPILER= gcc # uses -Werror in the configure script .include "../../mk/bsd.prefs.mk" diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index c6d7df6eb70..d8614fdb1ad 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/02/16 09:34:38 obache Exp $ +# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= tnftp-20070806 SVR4_PKGNAME= tnftp @@ -31,12 +31,12 @@ do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} @${RM} -f ${WRKSRC}/INSTALL -# Use readline/builtin.mk to check for an editline library on the +# Use mk/readline.builtin.mk to check for an editline library on the # system. If we use the system editline library, then use the built-in # termcap library. # CHECK_BUILTIN.readline:= yes -.include "../../devel/readline/builtin.mk" +.include "../../mk/readline.builtin.mk" CHECK_BUILTIN.readline:= no .if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) diff --git a/net/yafc/Makefile b/net/yafc/Makefile index fe5e0e3308f..f374fcf9647 100644 --- a/net/yafc/Makefile +++ b/net/yafc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/04/06 20:27:27 rodent Exp $ +# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= yafc-0.7.10 PKGREVISION= 3 @@ -11,7 +11,6 @@ HOMEPAGE= http://yafc.sourceforge.net/ COMMENT= Yet another FTP client GNU_CONFIGURE= yes -USE_GNU_READLINE= yes CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} INFO_FILES= yes diff --git a/net/yaz/Makefile b/net/yaz/Makefile index 2fc8c7689d9..b0b42520ec2 100644 --- a/net/yaz/Makefile +++ b/net/yaz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2013/05/09 07:39:18 adam Exp $ +# $NetBSD: Makefile,v 1.53 2013/07/15 02:02:27 ryoon Exp $ # DISTNAME= yaz-4.1.6 @@ -28,7 +28,7 @@ REPLACE.tclsh.new= ${TCLSH} REPLACE_FILES.tclsh= util/yaz-asncomp .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index 39cb1bb7526..49bb4211172 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2013/01/07 12:26:56 wiz Exp $ +# $NetBSD: options.mk,v 1.17 2013/07/15 02:02:27 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= curl ldap readline @@ -42,7 +42,6 @@ CFLAGS+= -m68060 .endif .if !empty(PKG_OPTIONS:Mreadline) -USE_GNU_READLINE= yes .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} .else diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index d4d31d0654d..eeb18e63ea7 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/05/29 22:53:36 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:27 ryoon Exp $ DISTNAME= gnupg-2.0.20 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} @@ -41,7 +41,7 @@ BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2 .include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pth/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/libassuan2/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 7bff2e2a43d..55cbf7626c9 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2013/07/09 11:11:11 wiz Exp $ +# $NetBSD: Makefile,v 1.129 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= gnutls-3.2.1 CATEGORIES= security devel @@ -46,7 +46,7 @@ post-install: .include "../../archivers/lzo/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libcfg+/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile index e46027f7c94..bd89a6399a2 100644 --- a/security/gsasl/Makefile +++ b/security/gsasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/02/06 23:23:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.38 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= gsasl-1.8.0 PKGREVISION= 2 @@ -28,7 +28,7 @@ TEST_TARGET= check .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../devel/libntlm/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 685bf134c96..9486c2f154c 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2013/05/09 07:39:19 adam Exp $ +# $NetBSD: Makefile,v 1.99 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= heimdal-1.5.2 PKGREVISION= 8 @@ -51,8 +51,8 @@ CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no # Heimdal's configure script expects to find the readline.h header as # <readline.h>. -CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} -CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} +CPPFLAGS+= -I${BUILDLINK_PREFIX.editlinereadline}/include/readline PLIST_VARS+= afskauth hcrypto .if ${OPSYS} == "IRIX" @@ -91,7 +91,7 @@ pre-build: ${TOUCH} ${WRKSRC}/po/localefiles .include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" .include "../../mk/curses.buildlink3.mk" diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile index 140819e2b3b..4e640d77ba2 100644 --- a/security/honeyd/Makefile +++ b/security/honeyd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2013/06/06 12:55:01 wiz Exp $ +# $NetBSD: Makefile,v 1.50 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= honeyd-1.5b @@ -35,7 +35,7 @@ BUILDLINK_API_DEPENDS.libevent+= libevent>=1.0 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libdnsres/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../net/libdnet/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 6ac056ec3e0..fe70bb9f4e4 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2013/02/06 23:23:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.60 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= krb4-1.2.2 @@ -59,12 +59,12 @@ PLIST.glob= yes .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-readline=yes \ - --with-readline-lib=${BUILDLINK_PREFIX.readline}/lib \ - --with-readline-include=${BUILDLINK_PREFIX.readline}/include/readline \ + --with-readline-lib=${BUILDLINK_PREFIX.editlinereadline}/lib \ + --with-readline-include=${BUILDLINK_PREFIX.editlinereadline}/include/readline \ ac_cv_funclib_bswap16=yes \ ac_cv_funclib_bswap32=yes -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .endif PLIST_VARS+= glob wantdes diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 65bd9fe8a29..bd640f58e80 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/02/06 23:23:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:28 ryoon Exp $ OPENSC_PKG_VERSION= 0.12.2 DISTNAME= opensc-${OPENSC_PKG_VERSION} @@ -44,7 +44,7 @@ post-install: .include "../../textproc/docbook-xsl/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 .include "../../security/openssl/buildlink3.mk" diff --git a/security/pwsafe/options.mk b/security/pwsafe/options.mk index 6dd300112b8..210c76212ee 100644 --- a/security/pwsafe/options.mk +++ b/security/pwsafe/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/30 20:53:24 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2013/07/15 02:02:28 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pwsafe PKG_SUPPORTED_OPTIONS= readline x11 @@ -7,10 +7,6 @@ PKG_SUPPORTED_OPTIONS= readline x11 .if !empty(PKG_OPTIONS:Mreadline) CONFIGURE_ARGS+= --with-readline -. if ${OPSYS} == "NetBSD" -# The NetBSD readline implementation isn't GNU compatible -USE_GNU_READLINE= yes -. endif . include "../../devel/readline/buildlink3.mk" . include "../../devel/ncurses/buildlink3.mk" .else diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 80ca41ae0c9..85adb087aa1 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/06/09 18:12:14 bsiegert Exp $ +# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:28 ryoon Exp $ BASH_VERSION= 4.2 @@ -79,9 +79,7 @@ CONFIGURE_ARGS+= --enable-job-control .if ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --with-installed-readline -USE_GNU_READLINE= yes BUILDLINK_API_DEPENDS.readline+= readline>=6.0 - .include "../../devel/readline/buildlink3.mk" .endif diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 1a8cfd942b6..ae1ac930752 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2013/02/12 23:27:24 tcort Exp $ +# $NetBSD: Makefile,v 1.84 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= bash-2.05b @@ -20,7 +20,6 @@ CONFLICTS= static-bash-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_GNU_READLINE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-installed-readline MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} diff --git a/shells/rc/Makefile b/shells/rc/Makefile index 94a44287947..e15026cd1a6 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/09/11 23:25:09 asau Exp $ +# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= rc-1.7 PKGREVISION= 1 @@ -22,7 +22,6 @@ PKG_SUPPORTED_OPTIONS= readline .if !empty(PKG_OPTIONS:Mreadline) .include "../../devel/readline/buildlink3.mk" CONFIGURE_ARGS+= --with-readline -USE_GNU_READLINE= YES .endif .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index 25fdd60dee2..e95cebd26bb 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2012/10/23 19:50:51 asau Exp $ +# $NetBSD: Makefile,v 1.58 2013/07/15 02:02:28 ryoon Exp $ # PKGNAME= amanda-client-${AMANDA_VERSION} @@ -57,5 +57,5 @@ post-install: ${DESTDIR}${PREFIX}/libexec/amanda .include "../../sysutils/amanda-common/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index c0916a07921..8aee85860d3 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.61 2013/03/04 21:57:21 wiz Exp $ +# $NetBSD: Makefile.common,v 1.62 2013/07/15 02:02:28 ryoon Exp $ # # used by sysutils/bacula-clientonly/Makefile # used by sysutils/bacula-tray-monitor/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula CONFIGURE_ARGS+= --with-sbin-perm=0755 CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR} CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR} -CONFIGURE_ARGS+= --with-readline=${PREFIX}/include/readline +CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline .if ${OPSYS} == "Linux" CONFIGURE_ARGS+= --enable-smartalloc @@ -77,6 +77,6 @@ EXAMPLESDIR= ${PREFIX}/share/examples/bacula pre-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR} -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index c99521d6af7..c1652efaad9 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/03/02 10:44:43 tron Exp $ +# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:28 ryoon Exp $ # DISTNAME= ipmitool-1.8.11 @@ -13,7 +13,6 @@ COMMENT= Command-line utility for managing IPMI devices PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -USE_GNU_READLINE= yes # ipmitool uses rl_event_hook INSTALLATION_DIRS+= share/examples/ipmitool share/doc/ipmitool OPSYSVARS+= CONFIGURE_ARGS @@ -21,6 +20,7 @@ CONFIGURE_ARGS.NetBSD+= --disable-intf-open --disable-intf-imb CONFIGURE_ARGS.DragonFly+= --disable-intf-open --disable-intf-imb CONFIGURE_ARGS.SunOS+= --enable-solaris-opt +# ipmitool uses rl_event_hook .include "../../devel/readline/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index 4da4eb6c51a..1ca18dcc120 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/02/06 23:23:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:28 ryoon Exp $ DISTNAME= libvirt-0.9.3 PKGREVISION= 9 @@ -68,7 +68,7 @@ RCD_SCRIPTS= libvirtd .include "../../lang/python/extension.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" .include "../../security/cyrus-sasl/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile index 1f2ad8c9feb..8d35a638091 100644 --- a/sysutils/xfsprogs/Makefile +++ b/sysutils/xfsprogs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:38 asau Exp $ +# $NetBSD: Makefile,v 1.12 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= xfsprogs-2.7.3.src PKGNAME= ${DISTNAME:S/.src//} @@ -23,6 +23,6 @@ INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} BUILD_TARGET= -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile index 82f27b5c8cc..3ffb080e101 100644 --- a/time/devtodo/Makefile +++ b/time/devtodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/04/06 13:24:20 rodent Exp $ +# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= devtodo-0.1.20 PKGREVISION= 3 @@ -11,7 +11,6 @@ COMMENT= Display and manage a list of items that are outstanding USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_GNU_READLINE= # uses rl_startup_hook() GNU_CONFIGURE= yes EGDIR= ${PREFIX}/share/examples/devtodo @@ -30,5 +29,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/contrib/${cfile} ${DESTDIR}${EGDIR} .endfor +# uses rl_startup_hook() .include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/tdl/Makefile b/time/tdl/Makefile index ba33b1fd439..2ad1c6b45a3 100644 --- a/time/tdl/Makefile +++ b/time/tdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/08 13:04:29 asau Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= tdl-1.5.2 PKGREVISION= 1 @@ -10,7 +10,6 @@ HOMEPAGE= http://www.rpcurnow.force9.co.uk/tdl/ COMMENT= Todo list manager with tons of features HAS_CONFIGURE= YES -USE_GNU_READLINE= YES CONFIGURE_ARGS= --prefix=${PREFIX} .include "../../mk/bsd.prefs.mk" diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile index f537f07019a..cb877a2a245 100644 --- a/wm/fvwm-devel/Makefile +++ b/wm/fvwm-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/06/06 12:55:09 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= fvwm-${FVWM_VER} PKGREVISION= 8 @@ -18,7 +18,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -USE_GNU_READLINE= YES USE_TOOLS+= perl:run PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q} diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 7e3567afec8..39461412946 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/06/06 12:55:09 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= fvwm-${FVWM_VER} PKGREVISION= 4 @@ -20,7 +20,6 @@ FVWM_VER= 2.6.5 USE_X11BASE= YES GNU_CONFIGURE= YES -USE_GNU_READLINE= YES USE_TOOLS+= perl:run tar PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q} diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile index 70b87d8b121..ec38a9fb188 100644 --- a/wm/ratpoison/Makefile +++ b/wm/ratpoison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2013/06/06 12:55:09 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2013/07/15 02:02:29 ryoon Exp $ # DISTNAME= ratpoison-1.4.5 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.nongnu.org/ratpoison/ COMMENT= Simple window manager with no fat library dependencies GNU_CONFIGURE= YES -USE_GNU_READLINE= YES INFO_FILES= yes USE_TOOLS+= perl:run pkg-config autoconf diff --git a/www/apachetop/Makefile b/www/apachetop/Makefile index f71ee02c7cf..9179badb211 100644 --- a/www/apachetop/Makefile +++ b/www/apachetop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/28 06:30:10 asau Exp $ +# $NetBSD: Makefile,v 1.15 2013/07/15 02:02:29 ryoon Exp $ # DISTNAME= apachetop-0.12.5 @@ -19,6 +19,6 @@ INCOMPAT_CURSES= NetBSD-1.5*-* INCOMPAT_CURSES= NetBSD-1.6-* NetBSD-1.6.*-* NetBSD-1.6[A-Q]-* .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 7036b1366de..220de6c552f 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2013/02/06 23:23:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:29 ryoon Exp $ DISTNAME= cadaver-0.23.3 PKGREVISION= 2 @@ -21,7 +21,7 @@ LIBS+= ${BUILDLINK_LDADD.termcap} #INSTALL_MAKE_FLAGS+= bindir=${DESTDIR:Q}${PREFIX:Q}/bin \ # mandir=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q} -.include "../../devel/readline/buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../www/neon/buildlink3.mk" |