From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 1 14:10:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5113D1065670 for ; Thu, 1 Dec 2011 14:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2550D8FC1F for ; Thu, 1 Dec 2011 14:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB1EAAKE089257 for ; Thu, 1 Dec 2011 14:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB1EAAiP089256; Thu, 1 Dec 2011 14:10:10 GMT (envelope-from gnats) Resent-Date: Thu, 1 Dec 2011 14:10:10 GMT Resent-Message-Id: <201112011410.pB1EAAiP089256@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Khon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F5D41065677 for ; Thu, 1 Dec 2011 14:00:46 +0000 (UTC) (envelope-from fjoe@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1EDBC8FC12 for ; Thu, 1 Dec 2011 14:00:46 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id pB1E0jwV081704 for ; Thu, 1 Dec 2011 14:00:45 GMT (envelope-from fjoe@freefall.freebsd.org) Received: (from fjoe@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id pB1E0jr0081703; Thu, 1 Dec 2011 14:00:45 GMT (envelope-from fjoe) Message-Id: <201112011400.pB1E0jr0081703@freefall.freebsd.org> Date: Thu, 1 Dec 2011 14:00:45 GMT From: Max Khon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/162995: Add USE_READLINE knob X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Max Khon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 14:10:10 -0000 >Number: 162995 >Category: ports >Synopsis: Add USE_READLINE knob >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 01 14:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Max Khon >Release: FreeBSD 8.2-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #5 r227907: Wed Nov 23 21:55:50 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: Attached patch adds USE_READLINE support with the support for upcoming removal of libreadline from 10.0. Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.699 diff -u -p -r1.699 bsd.port.mk --- Mk/bsd.port.mk 9 Nov 2011 08:53:12 -0000 1.699 +++ Mk/bsd.port.mk 1 Dec 2011 13:57:23 -0000 @@ -375,6 +375,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. ## +# USE_READLINE - If set, this port uses libreadline. +# Legal values are: yes, base, port +# yes, base: use base system libreadline on FreeBSD 9 or earlier, +# use ports/devel/readline on FreeBSD 10.0+ +# port: always use ports/devel/readline +## # USE_OPENAL - If set, this port relies on the OpenAL package. # Legal values are: al, soft, si, alut. # If set to an unknown value, the port is marked broken. @@ -1705,6 +1711,15 @@ MAKE_ENV+= ${b}="${${b}}" .include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif +.if defined(USE_READLINE) +.if ${USE_READLINE} == "port" || ${OSVERSION} > 900000 #1000000 +LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -lreadline +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +.endif +.endif + .if defined(USE_OPENAL) _OPENAL_ALL= al si soft alut _OPENAL_LIBS= si soft >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: