Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0740C7A494 for ; Tue, 21 Jun 2016 16:40:12 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7474F85EAA; Tue, 21 Jun 2016 16:40:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 06C4B85EA9 for ; Tue, 21 Jun 2016 16:40:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 7dN8Y1lzTkxD for ; Tue, 21 Jun 2016 16:40:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 86F9785E00 for ; Tue, 21 Jun 2016 16:40:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 82236FBB5; Tue, 21 Jun 2016 16:40:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146652721068200" MIME-Version: 1.0 Date: Tue, 21 Jun 2016 16:40:10 +0000 From: "Filip Hajny" Subject: CVS commit: pkgsrc/lang/LuaJIT2 To: pkgsrc-changes@NetBSD.org Reply-To: fhajny@netbsd.org X-Mailer: log_accum Message-Id: <20160621164010.82236FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146652721068200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fhajny Date: Tue Jun 21 16:40:10 UTC 2016 Modified Files: pkgsrc/lang/LuaJIT2: Makefile PLIST Log Message: Fix PLIST for SunOS. Upstream intentionally doesn't build the shared lib on SunOS, we accept it. Packages that depends on the shared lib may fail. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/LuaJIT2/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/LuaJIT2/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146652721068200 Content-Disposition: inline Content-Length: 1743 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/LuaJIT2/Makefile diff -u pkgsrc/lang/LuaJIT2/Makefile:1.7 pkgsrc/lang/LuaJIT2/Makefile:1.8 --- pkgsrc/lang/LuaJIT2/Makefile:1.7 Sun Dec 13 18:19:05 2015 +++ pkgsrc/lang/LuaJIT2/Makefile Tue Jun 21 16:40:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/12/13 18:19:05 alnsn Exp $ +# $NetBSD: Makefile,v 1.8 2016/06/21 16:40:10 fhajny Exp $ # DISTNAME= LuaJIT-2.0.4 @@ -18,5 +18,15 @@ USE_TOOLS+= gmake PTHREAD_OPTS+= native PTHREAD_AUTO_VARS= yes +.include "../../mk/bsd.prefs.mk" + +# Upstream doesn't support building shared libs on SunOS +# http://www.freelists.org/post/luajit/LuaJIT-on-solaris-64 +PLIST_VARS+= shared +.if ${OPSYS} != "SunOS" +PLIST.shared= yes +.endif +PRINT_PLIST_AWK+= {if ($$0 ~ /\.so/) {$$0 = "$${PLIST.shared}" $$0;}} + .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/lang/LuaJIT2/PLIST diff -u pkgsrc/lang/LuaJIT2/PLIST:1.2 pkgsrc/lang/LuaJIT2/PLIST:1.3 --- pkgsrc/lang/LuaJIT2/PLIST:1.2 Wed Mar 26 13:29:53 2014 +++ pkgsrc/lang/LuaJIT2/PLIST Tue Jun 21 16:40:10 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/03/26 13:29:53 imil Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/06/21 16:40:10 fhajny Exp $ bin/luajit bin/luajit-${PKGVERSION} include/luajit-2.0/lauxlib.h @@ -8,9 +8,9 @@ include/luajit-2.0/luaconf.h include/luajit-2.0/luajit.h include/luajit-2.0/lualib.h lib/libluajit-5.1.a -lib/libluajit-5.1.so -lib/libluajit-5.1.so.2 -lib/libluajit-5.1.so.${PKGVERSION} +${PLIST.shared}lib/libluajit-5.1.so +${PLIST.shared}lib/libluajit-5.1.so.2 +${PLIST.shared}lib/libluajit-5.1.so.${PKGVERSION} lib/pkgconfig/luajit.pc share/luajit-${PKGVERSION}/jit/bc.lua share/luajit-${PKGVERSION}/jit/bcsave.lua --_----------=_146652721068200--