CVS commit: pkgsrc/devel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul  2 10:59:24 UTC 2020

Modified Files:
        pkgsrc/devel: Makefile
Added Files:
        pkgsrc/devel/lua-term: DESCR Makefile PLIST distinfo
        pkgsrc/devel/lua-term/patches: patch-Makefile

Log Message:
devel: Add lua-term. Based partially on work by Jonathan Buschmann in wip.

lua-term is a Lua module for manipulating a terminal.


To generate a diff of this commit:
cvs rdiff -u -r1.3149 -r1.3150 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lua-term/DESCR \
    pkgsrc/devel/lua-term/Makefile pkgsrc/devel/lua-term/PLIST \
    pkgsrc/devel/lua-term/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lua-term/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.3149 pkgsrc/devel/Makefile:1.3150
--- pkgsrc/devel/Makefile:1.3149        Wed Jul  1 07:02:59 2020
+++ pkgsrc/devel/Makefile       Thu Jul  2 10:59:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3149 2020/07/01 07:02:59 adam Exp $
+# $NetBSD: Makefile,v 1.3150 2020/07/02 10:59:24 nia Exp $
 #
 
 COMMENT=       Development utilities
@@ -864,6 +864,7 @@ SUBDIR+=    lua-rocks
 SUBDIR+=       lua-std-_debug
 SUBDIR+=       lua-std-normalize
 SUBDIR+=       lua-stdlib
+SUBDIR+=       lua-term
 SUBDIR+=       lua-thrift
 SUBDIR+=       lutok
 SUBDIR+=       lwp

Added files:

Index: pkgsrc/devel/lua-term/DESCR
diff -u /dev/null pkgsrc/devel/lua-term/DESCR:1.1
--- /dev/null   Thu Jul  2 10:59:24 2020
+++ pkgsrc/devel/lua-term/DESCR Thu Jul  2 10:59:24 2020
@@ -0,0 +1 @@
+lua-term is a Lua module for manipulating a terminal.
Index: pkgsrc/devel/lua-term/Makefile
diff -u /dev/null pkgsrc/devel/lua-term/Makefile:1.1
--- /dev/null   Thu Jul  2 10:59:24 2020
+++ pkgsrc/devel/lua-term/Makefile      Thu Jul  2 10:59:24 2020
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2020/07/02 10:59:24 nia Exp $
+
+DISTNAME=      lua-term-0.07
+PKGNAME=       ${DISTNAME:S/lua/${LUA_PKGPREFIX}/}
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=hoelzro/}
+GITHUB_PROJECT=        lua-term
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/hoelzro/lua-term
+COMMENT=       Lua module for manipulating a terminal
+LICENSE=       mit
+
+USE_TOOLS+=    gmake pkg-config
+
+MAKE_FLAGS+=   LUA_DIR=${PREFIX}
+MAKE_FLAGS+=   LUA_VER=${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+MAKE_FLAGS+=   LUA_INC=${PREFIX}/${LUA_INCDIR}
+MAKE_FLAGS+=   LUA_LIBDIR=${PREFIX}/${LUA_CDIR}/term
+MAKE_FLAGS+=   LUA_SHARE=${PREFIX}/${LUA_LDIR}/term
+
+.include "../../lang/lua/module.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/lua-term/PLIST
diff -u /dev/null pkgsrc/devel/lua-term/PLIST:1.1
--- /dev/null   Thu Jul  2 10:59:24 2020
+++ pkgsrc/devel/lua-term/PLIST Thu Jul  2 10:59:24 2020
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2020/07/02 10:59:24 nia Exp $
+${LUA_CDIR}/term/core.so
+${LUA_LDIR}/term/colors.lua
+${LUA_LDIR}/term/cursor.lua
+${LUA_LDIR}/term/init.lua
Index: pkgsrc/devel/lua-term/distinfo
diff -u /dev/null pkgsrc/devel/lua-term/distinfo:1.1
--- /dev/null   Thu Jul  2 10:59:24 2020
+++ pkgsrc/devel/lua-term/distinfo      Thu Jul  2 10:59:24 2020
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/07/02 10:59:24 nia Exp $
+
+SHA1 (lua-term-0.07.tar.gz) = c0e8fc9054e784fb10af9dca015f713442402833
+RMD160 (lua-term-0.07.tar.gz) = 796ca95784ad56a8a1e035a5bccd96efde019ba9
+SHA512 (lua-term-0.07.tar.gz) = 2046ba1861ff590c191bb651941c45eb8b6e9a1252b05e78daaeb31837ce1fc7da9ba124aec34dc7842fd304e945754c463ffd75941125ff952e911ba66efa31
+Size (lua-term-0.07.tar.gz) = 4365 bytes
+SHA1 (patch-Makefile) = de8eec3174a4ebb81af1a1df890a92f408bf1fc8

Index: pkgsrc/devel/lua-term/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/lua-term/patches/patch-Makefile:1.1
--- /dev/null   Thu Jul  2 10:59:24 2020
+++ pkgsrc/devel/lua-term/patches/patch-Makefile        Thu Jul  2 10:59:24 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-Makefile,v 1.1 2020/07/02 10:59:24 nia Exp $
+
+- Don't pass -O3.
+- Use LDFLAGS when linking.
+- DESTDIR support.
+
+--- Makefile.orig      2016-04-06 03:11:44.000000000 +0000
++++ Makefile
+@@ -6,7 +6,7 @@ LUA_LIBDIR      := $(LUA_DIR)/lib/lua/$(
+ LUA_INC         := $(LUA_DIR)/include/lua$(LUA_VER)
+ LUA_SHARE       := $(LUA_DIR)/share/lua/$(LUA_VER)/term
+ CWARNS          := -Wall -pedantic
+-CFLAGS          += $(CWARNS) -O3 -I$(LUA_INC) -fPIC
++CFLAGS          += $(CWARNS) -I$(LUA_INC) -fPIC
+ LIB_OPTION      := -shared
+ 
+ SONAME          := core.so
+@@ -26,13 +26,13 @@ $(SONAME):
+       ln -s $(SONAMEV) $@
+ 
+ $(LIBRARY): $(OBJ)
+-      $(CC) $(CFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc
++      $(CC) $(LDFLAGS) $(LIB_OPTION) -o $(LIBRARY) $(OBJ) -lc
+ 
+ install:
+-      mkdir -p $(LUA_LIBDIR)
+-      cp $(SONAME) $(LUA_LIBDIR)
+-      mkdir -p $(LUA_SHARE)
+-      cp $(FILES) $(LUA_SHARE)
++      mkdir -p $(DESTDIR)$(LUA_LIBDIR)
++      cp $(SONAME) $(DESTDIR)$(LUA_LIBDIR)
++      mkdir -p $(DESTDIR)$(LUA_SHARE)
++      cp $(FILES) $(DESTDIR)$(LUA_SHARE)
+ 
+ clean:
+       $(RM) $(LIBRARY) $(SONAMEV) $(SONAME) *.o