libretro-np2kai: Update to 0.12 - patches upstreamed, library renamed

[Nia Alarie <nia.alarie%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Fri Sep 15 10:19:10 2017 +0100
Changeset:	c7ed1c4ce51ac784c46fa184c0e98b36e5136f25

Modified Files:
	libretro-np2kai/Makefile
	libretro-np2kai/PLIST
	libretro-np2kai/distinfo
Removed Files:
	libretro-np2kai/patches/patch-sdl2_Makefile.common
	libretro-np2kai/patches/patch-sdl2_Makefile.libretro

Log Message:
libretro-np2kai: Update to 0.12 - patches upstreamed, library renamed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c7ed1c4ce51ac784c46fa184c0e98b36e5136f25

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

diffstat:
 libretro-np2kai/Makefile                           |  9 ++++---
 libretro-np2kai/PLIST                              |  2 +-
 libretro-np2kai/distinfo                           | 10 +++-----
 libretro-np2kai/patches/patch-sdl2_Makefile.common | 30 ----------------------
 .../patches/patch-sdl2_Makefile.libretro           | 27 -------------------
 5 files changed, 10 insertions(+), 68 deletions(-)

diffs:
diff --git a/libretro-np2kai/Makefile b/libretro-np2kai/Makefile
index 0f8088cc65..d328a4c7b1 100644
--- a/libretro-np2kai/Makefile
+++ b/libretro-np2kai/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-NP2KAI_REV=	11
+NP2KAI_REV=	12
 DISTNAME=	libretro-np2kai-0.${NP2KAI_REV}
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=AZO234/}
@@ -12,7 +12,8 @@ LICENSE=	mit
 GITHUB_PROJECT=	NP2kai
 GITHUB_TAG=	rev.${NP2KAI_REV}
 
-MAKE_FILE=	sdl2/Makefile.libretro
+BUILD_DIRS=	sdl2
+MAKE_FILE=	Makefile.libretro
 
 USE_TOOLS=	gmake
 USE_LANGUAGES=	c c++
@@ -27,7 +28,7 @@ MAKE_FLAGS=	SUPPORT_NET=0
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/NP2kai_libretro.so \
-	    ${DESTDIR}${PREFIX}/lib/libretro/NP2kai_libretro.so
+	${INSTALL_LIB} ${WRKSRC}/sdl2/np2kai_libretro.so \
+	    ${DESTDIR}${PREFIX}/lib/libretro/np2kai_libretro.so
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libretro-np2kai/PLIST b/libretro-np2kai/PLIST
index 73ff73d856..58462f683c 100644
--- a/libretro-np2kai/PLIST
+++ b/libretro-np2kai/PLIST
@@ -1,2 +1,2 @@
 @comment $NetBSD$
-lib/libretro/NP2kai_libretro.so
+lib/libretro/np2kai_libretro.so
diff --git a/libretro-np2kai/distinfo b/libretro-np2kai/distinfo
index 24b0de8b3e..7f12bf9add 100644
--- a/libretro-np2kai/distinfo
+++ b/libretro-np2kai/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (libretro-np2kai-0.11.tar.gz) = 2e2d9ee153749410dfc890a2231e929774a82358
-RMD160 (libretro-np2kai-0.11.tar.gz) = 96696a739e5cdc36bd1844f375f8696f78311086
-SHA512 (libretro-np2kai-0.11.tar.gz) = 6e6ea30cf670d5ad3a98b30896180ad8353c62e8adc5e57e655bf807a8a481b45681ea7fba52fcf39c755eead92f5db311a4ccc3201faf5d4a5a1057b15e3cc2
-Size (libretro-np2kai-0.11.tar.gz) = 1894874 bytes
-SHA1 (patch-sdl2_Makefile.common) = bdaa2ef42e3fe6a287d516f2135ccb2d30652810
-SHA1 (patch-sdl2_Makefile.libretro) = 66bbbe8b0691055af6df18c9df06fff81cb484d1
+SHA1 (libretro-np2kai-0.12.tar.gz) = c1f2b2dfd25798af5751af06c418b46480910618
+RMD160 (libretro-np2kai-0.12.tar.gz) = b5c94ec5b69b0520d36ad93c94ab49173f04bfa7
+SHA512 (libretro-np2kai-0.12.tar.gz) = f799550d2bb83807da45a97a845e7a85213b2fd6918c5b7e57159e756d01441f6c93546711ec016c5dfbd9289dc23c50fb34907779c80c79ee5992281780e8d4
+Size (libretro-np2kai-0.12.tar.gz) = 1895266 bytes
diff --git a/libretro-np2kai/patches/patch-sdl2_Makefile.common b/libretro-np2kai/patches/patch-sdl2_Makefile.common
deleted file mode 100644
index 1375bab08a..0000000000
--- a/libretro-np2kai/patches/patch-sdl2_Makefile.common
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-https://github.com/AZO234/NP2kai/pull/7
-
---- sdl2/Makefile.common.orig	2017-08-26 19:45:16.000000000 +0000
-+++ sdl2/Makefile.common
-@@ -15,7 +15,6 @@ INCFLAGS := -I$(NP2_PATH) \
- 	-I$(NP2_PATH)/generic \
- 	-I$(NP2_PATH)/io \
- 	-I$(NP2_PATH)/mem \
--	-I$(NP2_PATH)/network \
- 	-I$(NP2_PATH)/sound \
- 	-I$(NP2_PATH)/sound/vermouth \
- 	-I$(NP2_PATH)/sound/fmgen \
-@@ -47,7 +46,6 @@ SOURCES_C := 		$(NP2_PATH)/calendar.c \
- 		$(wildcard $(NP2_PATH)/io/*.c) \
- 		$(wildcard $(NP2_PATH)/lio/*.c) \
- 		$(wildcard $(NP2_PATH)/mem/*.c) \
--		$(wildcard $(NP2_PATH)/network/*.c) \
- 		$(NP2_PATH)/sdl2/commng.c \
- 		$(NP2_PATH)/sdl2/dosio.c \
- 		$(NP2_PATH)/sdl2/fontmng.c \
-@@ -73,3 +71,7 @@ SOURCES_C := 		$(NP2_PATH)/calendar.c \
- SOURCES_CXX := $(NP2_PATH)/sdl2/soundmng.cpp \
- 		$(wildcard $(NP2_PATH)/sound/fmgen/*.cpp)
- 
-+ifeq ($(SUPPORT_NET), 1)
-+	INCFLAGS+=	-I$(NP2_PATH)/network
-+	SOURCES_C+=	$(wildcard $(NP2_PATH)/network/*.c)
-+endif
diff --git a/libretro-np2kai/patches/patch-sdl2_Makefile.libretro b/libretro-np2kai/patches/patch-sdl2_Makefile.libretro
deleted file mode 100644
index 0f4c2f1604..0000000000
--- a/libretro-np2kai/patches/patch-sdl2_Makefile.libretro
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-https://github.com/AZO234/NP2kai/pull/7
-
---- sdl2/Makefile.libretro.orig	2017-08-26 19:45:16.000000000 +0000
-+++ sdl2/Makefile.libretro
-@@ -1,4 +1,5 @@
- DEBUG=0
-+SUPPORT_NET?=1
- GIT_VERSION := " $(shell git rev-parse --short HEAD)"
- 
- UNAME=$(shell uname -a)
-@@ -218,11 +219,13 @@ OBJECTS  = $(SOURCES_CXX:.cpp=.o) $(SOUR
- CXXFLAGS += -D__LIBRETRO__ $(fpic) $(INCFLAGS) $(COMMONFLAGS) -DSUPPORT_LARGE_HDD -DSUPPORT_VPCVHD -DSUPPORT_KAI_IMAGES -DHOOK_SYSKEY -DALLOW_MULTIRUN
- CFLAGS   += -D__LIBRETRO__ $(fpic) $(INCFLAGS) $(COMMONFLAGS) -DSUPPORT_LARGE_HDD -DSUPPORT_VPCVHD -DSUPPORT_KAI_IMAGES -DHOOK_SYSKEY -DALLOW_MULTIRUN
- LDFLAGS  += -lm -lpthread $(fpic)
-+
- ifeq ($(platform), unix)
-+ifeq ($(SUPPORT_NET), 1)
- CXXFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
- CFLAGS   += -DSUPPORT_NET -DSUPPORT_LGY98
- endif
--
-+endif
- 
- ifeq ($(platform), theos_ios)
- COMMON_FLAGS := -DIOS -DARM $(COMMON_DEFINES) $(INCFLAGS) -I$(THEOS_INCLUDE_PATH) -Wno-error