Index: Mk/Uses/readline.mk =================================================================== --- Mk/Uses/readline.mk (revision 547504) +++ Mk/Uses/readline.mk (working copy) @@ -4,7 +4,6 @@ # # Feature: readline # Usage: USES=readline -# Valid ARGS: port # # MAINTAINER: portmgr@FreeBSD.org @@ -11,14 +10,12 @@ .if !defined(_INCLUDE_USES_READLINE_MK) _INCLUDE_USES_READLINE_MK= yes -.if !exists(/usr/lib/libreadline.so) -readline_ARGS= port +.if !empty(readline_ARGS) +IGNORE= Incorrect 'USES+= readline:${readline_ARGS}' readline takes no arguments .endif -.if ${readline_ARGS} == port LIB_DEPENDS+= libreadline.so.8:devel/readline CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.endif .endif Index: audio/ardour5/Makefile =================================================================== --- audio/ardour5/Makefile (revision 547504) +++ audio/ardour5/Makefile (working copy) @@ -44,7 +44,7 @@ libFLAC.so:audio/flac USES= compiler:c++11-lang desktop-file-utils gettext gnome \ - libarchive pkgconfig python:2.7,build readline:port tar:bzip2 \ + libarchive pkgconfig python:2.7,build readline tar:bzip2 \ waf xorg USE_CXXSTD= c++11 USE_XORG= x11 Index: audio/ardour6/Makefile =================================================================== --- audio/ardour6/Makefile (revision 547504) +++ audio/ardour6/Makefile (working copy) @@ -41,7 +41,7 @@ libwebsockets.so:net/libwebsockets USES= compiler:c++11-lang desktop-file-utils gettext gnome \ - libarchive pkgconfig python:3.7,build readline:port tar:bzip2 \ + libarchive pkgconfig python:3.7,build readline tar:bzip2 \ waf xorg USE_CXXSTD= c++11 USE_XORG= x11 Index: audio/ecasound/Makefile =================================================================== --- audio/ecasound/Makefile (revision 547504) +++ audio/ecasound/Makefile (working copy) @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa -USES= gmake libtool localbase:ldflags pkgconfig readline:port shebangfix +USES= gmake libtool localbase:ldflags pkgconfig readline shebangfix SHEBANG_FILES= ecatools/ecamonitor GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-liblilv \ Index: audio/libsmf/Makefile =================================================================== --- audio/libsmf/Makefile (revision 547504) +++ audio/libsmf/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= gnome libtool pathfix pkgconfig readline:port +USES= gnome libtool pathfix pkgconfig readline USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: audio/yoshimi/Makefile =================================================================== --- audio/yoshimi/Makefile (revision 547504) +++ audio/yoshimi/Makefile (working copy) @@ -19,7 +19,7 @@ libjack.so:audio/jack \ libmxml.so:textproc/mxml -USES= cmake compiler:c++11-lang gnome ncurses pkgconfig readline:port +USES= cmake compiler:c++11-lang gnome ncurses pkgconfig readline USE_GITHUB= yes GH_ACCOUNT= Yoshimi USE_GNOME= cairo Index: biology/mrbayes/Makefile =================================================================== --- biology/mrbayes/Makefile (revision 547504) +++ biology/mrbayes/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= readline:port +USES= readline USE_GITHUB= yes GH_ACCOUNT= NBISweden GH_PROJECT= MrBayes Index: devel/gdb/Makefile =================================================================== --- devel/gdb/Makefile (revision 547504) +++ devel/gdb/Makefile (working copy) @@ -44,21 +44,18 @@ VER= ${PORTVERSION:S/.//g} PLIST_SUB= VER=${VER} -OPTIONS_DEFINE= DEBUG GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI +OPTIONS_DEFINE= DEBUG GDB_LINK GUILE KGDB NLS PYTHON READLINE SOURCE_HIGHLIGHT TUI OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI -OPTIONS_DEFAULT+= PORT_READLINE PORT_ICONV SYSTEM_ZLIB +OPTIONS_DEFAULT+= READLINE PORT_ICONV SYSTEM_ZLIB -OPTIONS_SINGLE= READLINE ICONV ZLIB -OPTIONS_SINGLE_READLINE= BUNDLED_READLINE PORT_READLINE +OPTIONS_SINGLE= ICONV ZLIB OPTIONS_SINGLE_ICONV= PORT_ICONV SYSTEM_ICONV OPTIONS_SINGLE_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink KGDB_DESC= Kernel Debugging Support -BUNDLED_READLINE_DESC= from gdb distfile BUNDLED_ZLIB_DESC= from gdb distfile -PORT_READLINE_DESC= from devel/readline port PORT_ICONV_DESC= use libiconv, with wider charset support SOURCE_HIGHLIGHT_DESC= Source Code Styling SYSTEM_ICONV_DESC= use libc iconv, with no wchar support @@ -67,17 +64,16 @@ OPTIONS_SUB= yes -BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline DEBUG_CFLAGS= -g GUILE_CONFIGURE_WITH= guile GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2 GUILE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-guile22 NLS_USES= gettext-runtime -PORT_READLINE_USES= readline:port PORT_ICONV_USES= iconv:wchar_t PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD} PYTHON_CONFIGURE_OFF= --without-python PYTHON_USES= python +READLINE_USES= readline SOURCE_HIGHLIGHT_WITH= source-highlight SOURCE_HIGHLIGHT_LIB_DEPENDS= \ libsource-highlight.so:textproc/source-highlight Index: devel/grv/Makefile =================================================================== --- devel/grv/Makefile (revision 547504) +++ devel/grv/Makefile (working copy) @@ -14,7 +14,7 @@ LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= go ncurses pkgconfig readline:port +USES= go ncurses pkgconfig readline USE_GITHUB= yes GH_ACCOUNT= rgburke GH_SUBDIR= src/github.com/rgburke/grv Index: devel/opendht/Makefile =================================================================== --- devel/opendht/Makefile (revision 547504) +++ devel/opendht/Makefile (working copy) @@ -18,7 +18,7 @@ libnettle.so:security/nettle \ libgnutls.so:security/gnutls -USES= cmake compiler:c++11-lib pathfix pkgconfig readline:port +USES= cmake compiler:c++11-lib pathfix pkgconfig readline USE_GITHUB= yes GH_ACCOUNT= savoirfairelinux USE_LDCONFIG= yes Index: devel/tclreadline/Makefile =================================================================== --- devel/tclreadline/Makefile (revision 547504) +++ devel/tclreadline/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES= autoreconf libtool tcl readline:port +USES= autoreconf libtool tcl readline GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \ Index: devel/tig/Makefile =================================================================== --- devel/tig/Makefile (revision 547504) +++ devel/tig/Makefile (working copy) @@ -14,7 +14,7 @@ TEST_DEPENDS= git:devel/git -USES= iconv gmake ncurses readline:port +USES= iconv gmake ncurses readline GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} MAKE_ARGS= V=1 Index: games/wesnoth/Makefile =================================================================== --- games/wesnoth/Makefile (revision 547504) +++ games/wesnoth/Makefile (working copy) @@ -26,7 +26,7 @@ PORTSCOUT= limitw:1,even USES= cmake compiler:c++11-lang cpe gnome pkgconfig \ - python:3.6+,run readline:port shebangfix ssl sdl tar:bzip2 xorg + python:3.6+,run readline shebangfix ssl sdl tar:bzip2 xorg USE_SDL= image2 mixer2 ttf2 USE_LDCONFIG= yes USE_GNOME= cairo pango Index: lang/io/Makefile.addons =================================================================== --- lang/io/Makefile.addons (revision 547504) +++ lang/io/Makefile.addons (working copy) @@ -101,7 +101,7 @@ POSTGRESQL_USES= pgsql PYTHON_USES= python:3.3+ QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm -READLINE_USES= readline:port +READLINE_USES= readline REGEX_LIB_DEPENDS= libpcre.so:devel/pcre SQLITE3_USES= sqlite:3 SAMPLERATECONVERTER_LIB_DEPENDS=\ Index: lang/mdk/Makefile =================================================================== --- lang/mdk/Makefile (revision 547504) +++ lang/mdk/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= GPLv3 -USES= gettext gmake gnome ncurses pkgconfig readline:port +USES= gettext gmake gnome ncurses pkgconfig readline USE_GNOME= glib20 intltool GNU_CONFIGURE= yes TEST_TARGET= check Index: lang/newlisp/Makefile =================================================================== --- lang/newlisp/Makefile (revision 547504) +++ lang/newlisp/Makefile (working copy) @@ -16,7 +16,7 @@ CONFLICTS= newlisp-devel-[0-9]* -USES= readline:port tar:tgz +USES= readline tar:tgz OPTIONS_SUB= yes HAS_CONFIGURE= yes Index: lang/python27/Makefile =================================================================== --- lang/python27/Makefile (revision 547504) +++ lang/python27/Makefile (working copy) @@ -17,7 +17,7 @@ DEPRECATED= EOLed upstream EXPIRATION_DATE= 2020-12-31 -USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: lang/python35/Makefile =================================================================== --- lang/python35/Makefile (revision 547504) +++ lang/python35/Makefile (working copy) @@ -24,7 +24,7 @@ DEPRECATED= Deprecated upstream EXPIRATION_DATE= 2020-09-13 -USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz USE_CSTD= c99 PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes Index: lang/python36/Makefile =================================================================== --- lang/python36/Makefile (revision 547504) +++ lang/python36/Makefile (working copy) @@ -20,7 +20,7 @@ LICENSE= PSFL -USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: lang/python37/Makefile =================================================================== --- lang/python37/Makefile (revision 547504) +++ lang/python37/Makefile (working copy) @@ -16,7 +16,7 @@ LIB_DEPENDS= libffi.so:devel/libffi -USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: lang/python38/Makefile =================================================================== --- lang/python38/Makefile (revision 547504) +++ lang/python38/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= PSFL -USES= cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: lang/ruby25/Makefile =================================================================== --- lang/ruby25/Makefile (revision 547504) +++ lang/ruby25/Makefile (working copy) @@ -66,7 +66,7 @@ LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE} -READLINE_USES= readline:port +READLINE_USES= readline CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} Index: lang/ruby26/Makefile =================================================================== --- lang/ruby26/Makefile (revision 547504) +++ lang/ruby26/Makefile (working copy) @@ -67,7 +67,7 @@ LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE} -READLINE_USES= readline:port +READLINE_USES= readline CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} Index: lang/ruby27/Makefile =================================================================== --- lang/ruby27/Makefile (revision 547504) +++ lang/ruby27/Makefile (working copy) @@ -67,7 +67,7 @@ LIBEDIT_USES= libedit RDOC_CONFIGURE_ENABLE= install-rdoc READLINE_CONFIGURE_ON= --disable-libedit --with-readline-dir=${LOCALBASE} -READLINE_USES= readline:port +READLINE_USES= readline CPE_VENDOR= ruby-lang CPE_VERSION= ${RUBY_RELVERSION} Index: lang/scm/Makefile =================================================================== --- lang/scm/Makefile (revision 547504) +++ lang/scm/Makefile (working copy) @@ -66,12 +66,8 @@ ARCHOBJS= continue-ia64.S .endif -.if "${readline_ARGS}" == "port" LIBEDIT_SUB1= ${CPPFLAGS}" "${LDFLAGS:M-L*} LIBEDIT_SUB2= ${LDFLAGS:M-L*} -.else -LIBEDIT_SUB1= -I/usr/include/edit" " -.endif post-patch: @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include| ; \ Index: lang/sdcc/Makefile =================================================================== --- lang/sdcc/Makefile (revision 547504) +++ lang/sdcc/Makefile (working copy) @@ -19,7 +19,7 @@ CONFLICTS_INSTALL= sdcc-[0-9]* sdcc-devel-[0-9]* GNU_CONFIGURE= yes USES= autoreconf:build bison compiler:c++11-lang gmake \ - readline:port python shebangfix tar:bzip2 + readline python shebangfix tar:bzip2 SHEBANG_FILES= support/scripts/as2gbmap.py TEST_WRKSRC= ${WRKSRC}/support/regression TEST_ARGS= --no-print-directory # tons of them, way too annoying Index: math/R/Makefile =================================================================== --- math/R/Makefile (revision 547504) +++ math/R/Makefile (working copy) @@ -25,7 +25,7 @@ # - Create a meta-port for the recommended packages USES= compiler:c++11-lang gmake iconv libtool localbase pathfix perl5 \ - readline:port + readline USE_LDCONFIG= ${PREFIX}/lib/R/lib USE_PERL5= build Index: math/asymptote/Makefile =================================================================== --- math/asymptote/Makefile (revision 547504) +++ math/asymptote/Makefile (working copy) @@ -70,7 +70,7 @@ OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa READLINE_CONFIGURE_ENABLE= readline -READLINE_USES= readline:port +READLINE_USES= readline post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure Index: math/cvc4/Makefile =================================================================== --- math/cvc4/Makefile (revision 547504) +++ math/cvc4/Makefile (working copy) @@ -62,7 +62,7 @@ PYTHON_BUILD_DEPENDS= swig:devel/swig READLINE_CMAKE_BOOL= USE_READLINE -READLINE_USES= readline:port +READLINE_USES= readline GMP_CMAKE_BOOL= ENABLE_PORTFOLIO GMP_CMAKE_ON= -DENABLE_DUMPING=OFF Index: math/eukleides/Makefile =================================================================== --- math/eukleides/Makefile (revision 547504) +++ math/eukleides/Makefile (working copy) @@ -17,7 +17,7 @@ getopt>=0:misc/getopt USE_TEX= latex -USES= bison gettext iconv gmake readline:port tar:bzip2 +USES= bison gettext iconv gmake readline tar:bzip2 INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} PORTDOCS= de.pdf fr.pdf Index: math/libqalculate/Makefile =================================================================== --- math/libqalculate/Makefile (revision 547504) +++ math/libqalculate/Makefile (working copy) @@ -18,7 +18,7 @@ libmpfr.so:math/mpfr USES= compiler:c++14-lang gettext gmake gnome iconv libtool \ - localbase ncurses pathfix pkgconfig readline:port + localbase ncurses pathfix pkgconfig readline USE_GNOME= intltool libxml2 USE_LDCONFIG= yes Index: math/units/Makefile =================================================================== --- math/units/Makefile (revision 547504) +++ math/units/Makefile (working copy) @@ -20,7 +20,7 @@ OPTIONS_DEFINE= READLINE OPTIONS_DEFAULT= READLINE -READLINE_USES= readline:port +READLINE_USES= readline post-patch: @${REINPLACE_CMD} -e \ Index: print/fontforge/Makefile =================================================================== --- print/fontforge/Makefile (revision 547504) +++ print/fontforge/Makefile (working copy) @@ -67,7 +67,7 @@ PYTHON_USES_OFF=python:3.5-3.7,build PYTHON_CONFIGURE_ENABLE= python-scripting python-extension -READLINE_USES= readline:port +READLINE_USES= readline READLINE_CONFIGURE_WITH= libreadline SPIRO_DESC= Use libspiro to edit with clothoid splines Index: security/krb5-116/Makefile =================================================================== --- security/krb5-116/Makefile (revision 547504) +++ security/krb5-116/Makefile (working copy) @@ -57,7 +57,7 @@ NLS_USES= gettext READLINE_USES= readline READLINE_PORT_DESC= Command line editing via devel/readline -READLINE_PORT_USES= readline:port +READLINE_PORT_USES= readline LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit Index: security/krb5-117/Makefile =================================================================== --- security/krb5-117/Makefile (revision 547504) +++ security/krb5-117/Makefile (working copy) @@ -58,7 +58,7 @@ NLS_USES= gettext READLINE_USES= readline READLINE_PORT_DESC= Command line editing via devel/readline -READLINE_PORT_USES= readline:port +READLINE_PORT_USES= readline LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit Index: security/krb5-118/Makefile =================================================================== --- security/krb5-118/Makefile (revision 547504) +++ security/krb5-118/Makefile (working copy) @@ -58,7 +58,7 @@ NLS_USES= gettext READLINE_USES= readline READLINE_PORT_DESC= Command line editing via devel/readline -READLINE_PORT_USES= readline:port +READLINE_PORT_USES= readline LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit Index: security/krb5-devel/Makefile =================================================================== --- security/krb5-devel/Makefile (revision 547504) +++ security/krb5-devel/Makefile (working copy) @@ -57,7 +57,7 @@ NLS_USES= gettext READLINE_USES= readline READLINE_PORT_DESC= Command line editing via devel/readline -READLINE_PORT_USES= readline:port +READLINE_PORT_USES= readline LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_WITH= libedit Index: sysutils/bareos-server/Makefile =================================================================== --- sysutils/bareos-server/Makefile (revision 547504) +++ sysutils/bareos-server/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake compiler:c++11-lang localbase pkgconfig readline:port \ +USES+= cmake compiler:c++11-lang localbase pkgconfig readline \ shebangfix USE_GITHUB= yes Index: sysutils/bareos16-server/Makefile =================================================================== --- sysutils/bareos16-server/Makefile (revision 547504) +++ sysutils/bareos16-server/Makefile (working copy) @@ -17,7 +17,7 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= libtool:keepla pkgconfig readline:port shebangfix +USES+= libtool:keepla pkgconfig readline shebangfix USE_GITHUB= yes CONFLICTS?= bacula*-server-* bareos-server-* Index: sysutils/bareos17-server/Makefile =================================================================== --- sysutils/bareos17-server/Makefile (revision 547504) +++ sysutils/bareos17-server/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= libtool:keepla pkgconfig readline:port shebangfix +USES+= libtool:keepla pkgconfig readline shebangfix USE_GITHUB= yes USERS= bareos Index: sysutils/bareos18-server/Makefile =================================================================== --- sysutils/bareos18-server/Makefile (revision 547504) +++ sysutils/bareos18-server/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake:insource compiler:c++11-lang pkgconfig readline:port \ +USES+= cmake:insource compiler:c++11-lang pkgconfig readline \ shebangfix USE_GITHUB= yes Index: sysutils/slurm-wlm/Makefile =================================================================== --- sysutils/slurm-wlm/Makefile (revision 547504) +++ sysutils/slurm-wlm/Makefile (working copy) @@ -22,7 +22,7 @@ liblz4.so:archivers/liblz4 USES= compiler:c11 gmake gnome libtool lua pkgconfig python:build \ - readline:port shebangfix ssl tar:bz2 + readline shebangfix ssl tar:bz2 USE_LDCONFIG= yes USE_PERL5= configure USE_RC_SUBR= slurmctld slurmd