CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul  9 15:03:35 UTC 2020

Modified Files:
        pkgsrc/devel/lua-loadkit: Makefile PLIST
        pkgsrc/devel/lua-mimetypes: Makefile PLIST
        pkgsrc/devel/lua-sdl2: Makefile PLIST

Log Message:
Use LUA_DOCDIR


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lua-loadkit/Makefile \
    pkgsrc/devel/lua-loadkit/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lua-mimetypes/Makefile \
    pkgsrc/devel/lua-mimetypes/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/lua-sdl2/Makefile \
    pkgsrc/devel/lua-sdl2/PLIST

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

Modified files:

Index: pkgsrc/devel/lua-loadkit/Makefile
diff -u pkgsrc/devel/lua-loadkit/Makefile:1.1 pkgsrc/devel/lua-loadkit/Makefile:1.2
--- pkgsrc/devel/lua-loadkit/Makefile:1.1       Thu Jul  9 13:34:02 2020
+++ pkgsrc/devel/lua-loadkit/Makefile   Thu Jul  9 15:03:35 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/07/09 13:34:02 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/09 15:03:35 nia Exp $
 
 DISTNAME=      loadkit-1.1.0
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel lua
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=leafo/}
 GITHUB_PROJECT=        loadkit
@@ -16,11 +17,11 @@ USE_LANGUAGES=      # none
 NO_BUILD=      yes
 
 INSTALLATION_DIRS+=    ${LUA_LDIR}
-INSTALLATION_DIRS+=    share/doc/${PKGNAME_NOREV}
+INSTALLATION_DIRS+=    ${LUA_DOCDIR}
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md \
-               ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+               ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/loadkit.lua \
                ${DESTDIR}${PREFIX}/${LUA_LDIR}/loadkit.lua
 
Index: pkgsrc/devel/lua-loadkit/PLIST
diff -u pkgsrc/devel/lua-loadkit/PLIST:1.1 pkgsrc/devel/lua-loadkit/PLIST:1.2
--- pkgsrc/devel/lua-loadkit/PLIST:1.1  Thu Jul  9 13:34:02 2020
+++ pkgsrc/devel/lua-loadkit/PLIST      Thu Jul  9 15:03:35 2020
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2020/07/09 13:34:02 nia Exp $
-share/doc/${PKGNAME}/README.md
+@comment $NetBSD: PLIST,v 1.2 2020/07/09 15:03:35 nia Exp $
+${LUA_DOCDIR}/README.md
 ${LUA_LDIR}/loadkit.lua

Index: pkgsrc/devel/lua-mimetypes/Makefile
diff -u pkgsrc/devel/lua-mimetypes/Makefile:1.1 pkgsrc/devel/lua-mimetypes/Makefile:1.2
--- pkgsrc/devel/lua-mimetypes/Makefile:1.1     Thu Jul  9 13:15:45 2020
+++ pkgsrc/devel/lua-mimetypes/Makefile Thu Jul  9 15:03:35 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/07/09 13:15:45 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/09 15:03:35 nia Exp $
 
 DISTNAME=      lua-mimetypes-1.0.0
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/lua-//1}
+PKGREVISION=   1
 CATEGORIES=    devel lua
 MASTER_SITES=  -https://bitbucket.org/leafstorm/lua-mimetypes/get/v${PKGVERSION_NOREV}.tar.gz
 
@@ -15,11 +16,11 @@ USE_LANGUAGES=      # none
 NO_BUILD=      yes
 
 INSTALLATION_DIRS+=    ${LUA_LDIR}
-INSTALLATION_DIRS+=    share/doc/${PKGNAME_NOREV}
+INSTALLATION_DIRS+=    ${LUA_DOCDIR}
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/README \
-               ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+               ${DESTDIR}${PREFIX}/${LUA_DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/mimetypes.lua \
                ${DESTDIR}${PREFIX}/${LUA_LDIR}/mimetypes.lua
 
Index: pkgsrc/devel/lua-mimetypes/PLIST
diff -u pkgsrc/devel/lua-mimetypes/PLIST:1.1 pkgsrc/devel/lua-mimetypes/PLIST:1.2
--- pkgsrc/devel/lua-mimetypes/PLIST:1.1        Thu Jul  9 13:15:45 2020
+++ pkgsrc/devel/lua-mimetypes/PLIST    Thu Jul  9 15:03:35 2020
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2020/07/09 13:15:45 nia Exp $
-share/doc/${PKGNAME}/README
+@comment $NetBSD: PLIST,v 1.2 2020/07/09 15:03:35 nia Exp $
+${LUA_DOCDIR}/README
 ${LUA_LDIR}/mimetypes.lua

Index: pkgsrc/devel/lua-sdl2/Makefile
diff -u pkgsrc/devel/lua-sdl2/Makefile:1.1 pkgsrc/devel/lua-sdl2/Makefile:1.2
--- pkgsrc/devel/lua-sdl2/Makefile:1.1  Thu Jul  9 10:04:25 2020
+++ pkgsrc/devel/lua-sdl2/Makefile      Thu Jul  9 15:03:35 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/07/09 10:04:25 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/09 15:03:35 nia Exp $
 
 DISTNAME=      luasdl2-2.0.5.6.0
 PKGNAME=       ${LUA_PKGPREFIX}-${DISTNAME:S/^lua//1}
+PKGREVISION=   1
 CATEGORIES=    devel lua
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Tangent128/}
 GITHUB_PROJECT=        luasdl2
@@ -15,7 +16,7 @@ LICENSE=      isc
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-CMAKE_ARGS+=   -DWITH_DOCSDIR="share/doc/${PKGNAME_NOREV}"
+CMAKE_ARGS+=   -DWITH_DOCSDIR=${LUA_DOCDIR}
 CMAKE_ARGS+=   -DWITH_LUAVER="user"
 CMAKE_ARGS+=   -DLUA_LIBDIR=${LUA_CDIR}
 
Index: pkgsrc/devel/lua-sdl2/PLIST
diff -u pkgsrc/devel/lua-sdl2/PLIST:1.1 pkgsrc/devel/lua-sdl2/PLIST:1.2
--- pkgsrc/devel/lua-sdl2/PLIST:1.1     Thu Jul  9 10:04:25 2020
+++ pkgsrc/devel/lua-sdl2/PLIST Thu Jul  9 15:03:35 2020
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1 2020/07/09 10:04:25 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/07/09 15:03:35 nia Exp $
 ${LUA_CDIR}/SDL.so
 ${LUA_CDIR}/SDL/image.so
 ${LUA_CDIR}/SDL/mixer.so
 ${LUA_CDIR}/SDL/net.so
 ${LUA_CDIR}/SDL/ttf.so
-share/doc/${PKGNAME}/examples/audio/audio-processor.lua
-share/doc/${PKGNAME}/examples/audio/audio.lua
-share/doc/${PKGNAME}/examples/audio/gun.wav
-share/doc/${PKGNAME}/examples/font/DejaVuSans.ttf
-share/doc/${PKGNAME}/examples/font/font.lua
-share/doc/${PKGNAME}/examples/image/Lua-SDL2.png
-share/doc/${PKGNAME}/examples/image/image.lua
-share/doc/${PKGNAME}/examples/joystick/joystick.lua
-share/doc/${PKGNAME}/examples/keyboard/keyboard.lua
-share/doc/${PKGNAME}/examples/paths/paths.lua
-share/doc/${PKGNAME}/examples/rwops/rwops.lua
-share/doc/${PKGNAME}/examples/tcp/client.lua
-share/doc/${PKGNAME}/examples/tcp/server.lua
-share/doc/${PKGNAME}/examples/threads/channel.lua
-share/doc/${PKGNAME}/examples/udp/client.lua
-share/doc/${PKGNAME}/examples/udp/server.lua
-share/doc/${PKGNAME}/tutorials/01-initialization/tutorial.lua
-share/doc/${PKGNAME}/tutorials/02-window/tutorial.lua
-share/doc/${PKGNAME}/tutorials/03-events/tutorial.lua
-share/doc/${PKGNAME}/tutorials/04-drawing/Lua-SDL2.png
-share/doc/${PKGNAME}/tutorials/04-drawing/tutorial.lua
-share/doc/${PKGNAME}/tutorials/05-sound/gun.wav
-share/doc/${PKGNAME}/tutorials/05-sound/tutorial.lua
-share/doc/${PKGNAME}/tutorials/06-text/DejaVuSans.ttf
-share/doc/${PKGNAME}/tutorials/06-text/tutorial.lua
-share/doc/${PKGNAME}/tutorials/07-bouncing/Lua-SDL2.png
-share/doc/${PKGNAME}/tutorials/07-bouncing/tutorial.lua
+${LUA_DOCDIR}/examples/audio/audio-processor.lua
+${LUA_DOCDIR}/examples/audio/audio.lua
+${LUA_DOCDIR}/examples/audio/gun.wav
+${LUA_DOCDIR}/examples/font/DejaVuSans.ttf
+${LUA_DOCDIR}/examples/font/font.lua
+${LUA_DOCDIR}/examples/image/Lua-SDL2.png
+${LUA_DOCDIR}/examples/image/image.lua
+${LUA_DOCDIR}/examples/joystick/joystick.lua
+${LUA_DOCDIR}/examples/keyboard/keyboard.lua
+${LUA_DOCDIR}/examples/paths/paths.lua
+${LUA_DOCDIR}/examples/rwops/rwops.lua
+${LUA_DOCDIR}/examples/tcp/client.lua
+${LUA_DOCDIR}/examples/tcp/server.lua
+${LUA_DOCDIR}/examples/threads/channel.lua
+${LUA_DOCDIR}/examples/udp/client.lua
+${LUA_DOCDIR}/examples/udp/server.lua
+${LUA_DOCDIR}/tutorials/01-initialization/tutorial.lua
+${LUA_DOCDIR}/tutorials/02-window/tutorial.lua
+${LUA_DOCDIR}/tutorials/03-events/tutorial.lua
+${LUA_DOCDIR}/tutorials/04-drawing/Lua-SDL2.png
+${LUA_DOCDIR}/tutorials/04-drawing/tutorial.lua
+${LUA_DOCDIR}/tutorials/05-sound/gun.wav
+${LUA_DOCDIR}/tutorials/05-sound/tutorial.lua
+${LUA_DOCDIR}/tutorials/06-text/DejaVuSans.ttf
+${LUA_DOCDIR}/tutorials/06-text/tutorial.lua
+${LUA_DOCDIR}/tutorials/07-bouncing/Lua-SDL2.png
+${LUA_DOCDIR}/tutorials/07-bouncing/tutorial.lua