From owner-svn-ports-all@freebsd.org Wed Dec 19 19:53:18 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D483C1342687; Wed, 19 Dec 2018 19:53:17 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 77E836AD9F; Wed, 19 Dec 2018 19:53:17 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67DC81AA78; Wed, 19 Dec 2018 19:53:17 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBJJrHdo058171; Wed, 19 Dec 2018 19:53:17 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBJJrHiZ058170; Wed, 19 Dec 2018 19:53:17 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201812191953.wBJJrHiZ058170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Wed, 19 Dec 2018 19:53:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487812 - head/lang/scm X-SVN-Group: ports-head X-SVN-Commit-Author: mi X-SVN-Commit-Paths: head/lang/scm X-SVN-Commit-Revision: 487812 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 77E836AD9F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Dec 2018 19:53:18 -0000 Author: mi Date: Wed Dec 19 19:53:17 2018 New Revision: 487812 URL: https://svnweb.freebsd.org/changeset/ports/487812 Log: Unbreak by providing handling for readline from base as well as from port. PR: 232936 Modified: head/lang/scm/Makefile Modified: head/lang/scm/Makefile ============================================================================== --- head/lang/scm/Makefile Wed Dec 19 19:31:08 2018 (r487811) +++ head/lang/scm/Makefile Wed Dec 19 19:53:17 2018 (r487812) @@ -15,8 +15,6 @@ COMMENT= Scheme interpreter LICENSE= LGPL21 -BROKEN= fails to stage - WRKSRC= ${WRKDIR}/${PORTNAME} USES= readline zip @@ -52,7 +50,7 @@ SCM_MODULES= byte.so bytenumb.so crs.so differ.so edli socket.so unix.so SCM_MODULES_X11=x.so -.include +.include .if ${PORT_OPTIONS:MX11} SCM_MODULES+= ${SCM_MODULES_X11} @@ -64,12 +62,21 @@ EXTRA_PATCHES+= ${FILESDIR}/ia64-patch 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| ; \ /strip/s|^|#|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%ARCHOBJS%%|${ARCHOBJS}|g ; \ + s|editline freebsd "" "|editline freebsd "${LIBEDIT_SUB1}| ; \ + s|-lreadline")$$|${LIBEDIT_SUB2} -lreadline")| ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm @${REINPLACE_CMD} -e 's|__osf__|__FreeBSD__|' ${WRKSRC}/gmalloc.c @${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c @@ -77,6 +84,7 @@ post-patch: ${WRKSRC}/xgen.scm @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ ${WRKSRC}/*.info ${WRKSRC}/*.texi + ${TOUCH} ${WRKSRC}/scm.core do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scm ${WRKSRC}/scmlit \ @@ -91,4 +99,4 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${STAGEDIR}${PREFIX}/lib/scm/slib/ ${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH} -.include +.include