From owner-svn-ports-head@freebsd.org Sat Jul 11 20:50:37 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 939C5370AD1; Sat, 11 Jul 2020 20:50:37 +0000 (UTC) (envelope-from pi@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4B429n3S5Dz4ZW0; Sat, 11 Jul 2020 20:50:37 +0000 (UTC) (envelope-from pi@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 5B00019143; Sat, 11 Jul 2020 20:50:37 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06BKobSL042862; Sat, 11 Jul 2020 20:50:37 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06BKobwY042861; Sat, 11 Jul 2020 20:50:37 GMT (envelope-from pi@FreeBSD.org) Message-Id: <202007112050.06BKobwY042861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 11 Jul 2020 20:50:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542053 - head/devel/lua-cqueues X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/devel/lua-cqueues X-SVN-Commit-Revision: 542053 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jul 2020 20:50:37 -0000 Author: pi Date: Sat Jul 11 20:50:36 2020 New Revision: 542053 URL: https://svnweb.freebsd.org/changeset/ports/542053 Log: devel/lua-cqueues: adapt to the needs of dns/knot-resolver - PORTDOCS / PORTEXAMPLES obviate the need to put docs and examples in the plist. - There should be no messing with ldconfig and soname, since the .so exists only to be dynamically loaded at runtime, not actually linked to. - Fixed name in the COMMENT - Does not build on lua 5.4, note this in USES - Force the port to build exactly the version it's supposed to build, rather than let it autodetect things. Hence MAKE_ENV and CPPFLAGS - shebangfix on the examples is not strictly necessary but is cleaner. PR: 247739 Submitted by: andrew@tao11.riddles.org.uk Approved by: Leo Vandewoestijne (maintainer) Modified: head/devel/lua-cqueues/Makefile head/devel/lua-cqueues/pkg-plist Modified: head/devel/lua-cqueues/Makefile ============================================================================== --- head/devel/lua-cqueues/Makefile Sat Jul 11 20:45:27 2020 (r542052) +++ head/devel/lua-cqueues/Makefile Sat Jul 11 20:50:36 2020 (r542053) @@ -4,27 +4,47 @@ PORTNAME= cqueues DISTVERSIONPREFIX= rel- DISTVERSION= 20200603 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} MAINTAINER= freebsd@dns.company -COMMENT= Constant queues lib +COMMENT= Continuation queues module for Lua LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake lua:51+,module ssl -USE_LDCONFIG= {LUA_MODLIBDIR} -LDFLAGS+= -Wl,-soname,liblua-${PORTNAME}.so.${LUA_VER_STR} +USES= gmake lua:51-53,module ssl USE_GITHUB= yes GH_ACCOUNT= wahern -SONAME= ${STAGEDIR}${PREFIX}/lib/liblua-${PORTNAME}.so +MAKE_ENV+= LUA_APIS="${LUA_VER}" +CPPFLAGS+= "-I${LUA_INCDIR}" +DOCSDIR= ${LUA_DOCSDIR} +EXAMPLESDIR= ${LUA_EXAMPLESDIR} +PORTDOCS= cqueues.pdf +PORTEXAMPLES= * + +OPTIONS_DEFINE= DOCS EXAMPLES + +EXAMPLES_USES= shebangfix +EXAMPLES_VARS= shebang_files="examples/*" + +# Some of the shebangs in examples/* are formatted like this. +lua_OLD_CMD+= /usr/local/lua[0-9]*/bin/lua + post-install: - ${MV} ${STAGEDIR}${LUA_MODLIBDIR}/_${PORTNAME}.so ${SONAME}.${LUA_VER_STR} - ${STRIP_CMD} ${SONAME}.${LUA_VER_STR} - ${RLN} ${SONAME}.${LUA_VER_STR} ${SONAME} + ${STRIP_CMD} ${STAGEDIR}${LUA_MODLIBDIR}/_${PORTNAME}.so + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${BUILD_WRKSRC}/doc/cqueues.pdf ${STAGEDIR}${DOCSDIR} + +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${BUILD_WRKSRC}/examples && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .include Modified: head/devel/lua-cqueues/pkg-plist ============================================================================== --- head/devel/lua-cqueues/pkg-plist Sat Jul 11 20:45:27 2020 (r542052) +++ head/devel/lua-cqueues/pkg-plist Sat Jul 11 20:50:36 2020 (r542053) @@ -1,5 +1,4 @@ -lib/liblua-cqueues.so.%%LUA_VER_STR%% -lib/liblua-cqueues.so +%%LUA_MODLIBDIR%%/_cqueues.so %%LUA_MODSHAREDIR%%/cqueues.lua %%LUA_MODSHAREDIR%%/cqueues/auxlib.lua %%LUA_MODSHAREDIR%%/cqueues/condition.lua @@ -17,4 +16,3 @@ lib/liblua-cqueues.so %%LUA_MODSHAREDIR%%/cqueues/signal.lua %%LUA_MODSHAREDIR%%/cqueues/socket.lua %%LUA_MODSHAREDIR%%/cqueues/thread.lua -@dir %%LUA_MODLIBDIR%%