On 11/13/17 13:16, Brian Callahan wrote:
On 11/13/2017 12:30 PM, Kirill Bychkov wrote:
On Mon, November 13, 2017 20:28, Brian Callahan wrote:
On 11/13/2017 12:26 PM, Kirill Bychkov wrote:
On Mon, November 13, 2017 19:49, Brian Callahan wrote:
Now looking for oks.
On 11/13/17 11:05, Brian Callahan wrote:
On 11/13/17 10:36, Kirill Bychkov wrote:
On Sun, November 12, 2017 22:27, Brian Callahan wrote:
On 11/12/17 14:08, Kirill Bychkov wrote:
On Sun, November 12, 2017 20:12, Edd Barrett wrote:
Hi,
On Sun, Nov 12, 2017 at 11:49:20AM -0500, Brian Callahan wrote:
devel/luabitop is a BDEP of editors/neovim. devel/lua-bitop is
not used by
anything (at least, as far as `make search key=lua-bitop`
suggests).
devel/luabitop also appears to be the more comprehensive port.
OK to remove devel/lua-bitop?
Ugh. IIRC, I imported lua-bitop for neovim, probably missing
luabitop
becuase it wasn't prefixed 'lua-'. Somehow I then managed to
depend on
the existing luabitop.
I've checked using sqlports that there are no other
dependents, so
your
plan seems sensible to me. OK edd@, but perhaps wait a bit
and see if
anyone else chimes in.
Thanks
Hi!
lua- prefix is a standard. IMHO you should remove luabitop and
add
lua-bitop
as a dependency to neovim.
Just my 2 cents.
Or should luabitop be moved to lua-bitop?
I think you need to merge all the tweaks from both ports in
lua-bitop
and
remove luabitop directory with all quirks and @pkgpath dance.
Right. That's what I was thinking.
Merging diff attached. Missing from this diff is the bump and depends
switch in editors/neovim, but that comes after.
~Brian
Some comments:
- you're missing REVISION bump after changing PLIST and COMMENT
Yup, I sent a new diff with the bump.
- you need @conflict marker for luabitop because you're shipping
docs now
I'm going to remove luabitop before changing lua-bitop.
It doesn't matter for already installed packages.
Nevermind, I misread what you said. Yes, it needs a @conflict marker.
- and you can switch to https while here.
Sure.
Updated diff just for lua-bitop.
Tell me if this makes sense to you as a plan of action:
1. update lua-bitop
2. switch neovim to lua-bitop
3. unlink & remove luabitop
4. register luabitop removal with quirks
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/lua-bitop/Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 Makefile
--- Makefile 7 Mar 2017 18:33:27 -0000 1.2
+++ Makefile 14 Nov 2017 01:57:30 -0000
@@ -1,32 +1,39 @@
# $OpenBSD: Makefile,v 1.2 2017/03/07 18:33:27 espie Exp $
-COMMENT = numeric bit operations for Lua
-
V = 1.0.2
+COMMENT = library for bitwise operations in Lua
DISTNAME = LuaBitOp-${V}
PKGNAME = lua-bitop-${V}
-
+REVISION = 0
CATEGORIES = devel
-HOMEPAGE = http://bitop.luajit.org/
-
-# "Lua BitOp is a C extension module for Lua 5.1/5.2"
-FLAVORS = lua52
+HOMEPAGE = https://bitop.luajit.org/
+MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = ${HOMEPAGE}/download/
+MASTER_SITES = https://bitop.luajit.org/download/
+
+# "Lua BitOp is a C extension module for Lua 5.1/5.2"
+FLAVORS = lua52
+FLAVOR ?=
+
+MODULES = lang/lua
-MODULES = lang/lua
-USE_GMAKE = Yes
+USE_GMAKE = Yes
+MAKE_FLAGS += INCLUDES=-I${MODLUA_INCL_DIR} CCOPT= \
+ LUA=${MODLUA_BIN} CC="${CC}"
-MAKE_FLAGS += INCLUDES=-I${MODLUA_INCL_DIR} CCOPT= \
- LUA=${MODLUA_BIN} CC="${CC}"
+TEST_DEPENDS = ${BASE_PKGPATH}
-INSTALL_DIR = ${MODLUA_LIBDIR}
do-install:
- ${INSTALL_DATA_DIR} ${INSTALL_DIR}
- cd ${WRKSRC} && ${INSTALL_DATA} bit.so ${INSTALL_DIR}
+ ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DOCDIR}
+ ${INSTALL_DATA} ${WRKBUILD}/bit.so ${MODLUA_LIBDIR}
+ cd ${WRKSRC}/doc && \
+ find . -type d \
+ -exec ${INSTALL_DATA_DIR} ${MODLUA_DOCDIR}/{} \; && \
+ find . ! -type d \
+ -exec ${INSTALL_DATA} -m 644 {} ${MODLUA_DOCDIR}/{} \;
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/lua-bitop/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 4 Mar 2017 17:11:09 -0000 1.1.1.1
+++ pkg/PLIST 14 Nov 2017 01:57:30 -0000
@@ -1,2 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/03/04 17:11:09 edd Exp $
+@conflict luabitop-*
+@pkgpath devel/luabitop
lib/lua/${MODLUA_VERSION}/bit.so
+share/doc/${FULLPKGNAME}/
+share/doc/${FULLPKGNAME}/api.html
+share/doc/${FULLPKGNAME}/bluequad-print.css
+share/doc/${FULLPKGNAME}/bluequad.css
+share/doc/${FULLPKGNAME}/changes.html
+share/doc/${FULLPKGNAME}/contact.html
+share/doc/${FULLPKGNAME}/img/
+share/doc/${FULLPKGNAME}/img/contact.png
+share/doc/${FULLPKGNAME}/index.html
+share/doc/${FULLPKGNAME}/install.html
+share/doc/${FULLPKGNAME}/semantics.html
