sdlpop: some Makefile improvements from wiz@

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Tue Mar 7 21:14:39 2017 +0200
Changeset:	ad434548fb156d59ec1f4d84ad18f3ce810fbb60

Modified Files:
	sdlpop/Makefile
	sdlpop/distinfo
	sdlpop/patches/patch-options.c
	sdlpop/patches/patch-seg009.c

Log Message:
sdlpop: some Makefile improvements from wiz@

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

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

diffstat:
 sdlpop/Makefile                | 20 +++++++++-----------
 sdlpop/distinfo                | 12 ++++++------
 sdlpop/patches/patch-options.c |  4 ++--
 sdlpop/patches/patch-seg009.c  |  4 ++--
 4 files changed, 19 insertions(+), 21 deletions(-)

diffs:
diff --git a/sdlpop/Makefile b/sdlpop/Makefile
index b36164b2cb..f6483a1ef2 100644
--- a/sdlpop/Makefile
+++ b/sdlpop/Makefile
@@ -1,11 +1,8 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	SDLPoP
-DISTNAME=	${GITHUB_TAG}
-PKGNAME=	sdlpop-1.17
+DISTNAME=	SDLPoP-1.17
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=NagyD/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,23 +10,24 @@ HOMEPAGE=	https://github.com/NagyD/SDLPoP/
 COMMENT=	Open-source port of Prince of Persia
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/SDLPoP-${PKGVERSION_NOREV}/src
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config
 
+BUILD_DIRS=	src
+
 CFLAGS+=	-D PKGSRC_DATA_PATH="\"${PREFIX}/share/sdlpop/\""
 
 INSTALLATION_DIRS+=	bin share/sdlpop share/doc/sdlpop
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../prince ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/../SDLPoP.ini ${DESTDIR}${PREFIX}/share/sdlpop
-	${INSTALL_DATA} ${WRKSRC}/../doc/ChangeLog.txt ${DESTDIR}${PREFIX}/share/doc/sdlpop
-	${INSTALL_DATA} ${WRKSRC}/../doc/Readme.txt ${DESTDIR}${PREFIX}/share/doc/sdlpop
-	cd ${WRKSRC}/../ && find data -type d | while read dir; do \
+	${INSTALL_PROGRAM} ${WRKSRC}/prince ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/SDLPoP.ini ${DESTDIR}${PREFIX}/share/sdlpop
+	${INSTALL_DATA} ${WRKSRC}/doc/ChangeLog.txt ${DESTDIR}${PREFIX}/share/doc/sdlpop
+	${INSTALL_DATA} ${WRKSRC}/doc/Readme.txt ${DESTDIR}${PREFIX}/share/doc/sdlpop
+	cd ${WRKSRC} && find data -type d | while read dir; do \
 		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/sdlpop/$$dir; \
 	done
-	cd ${WRKSRC}/../ && find data -type f | while read file; do \
+	cd ${WRKSRC} && find data -type f | while read file; do \
 		${INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/share/sdlpop/$$file; \
 	done
 
diff --git a/sdlpop/distinfo b/sdlpop/distinfo
index fb3036f615..80a168e28d 100644
--- a/sdlpop/distinfo
+++ b/sdlpop/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (SDLPoP/v1.17.tar.gz) = 9d59aa14d65f1785705501bb6b2b3e47b77d35f8
-RMD160 (SDLPoP/v1.17.tar.gz) = 5eb96831418bf95db75d095984a3674620b6fc94
-SHA512 (SDLPoP/v1.17.tar.gz) = d5b401501bdb9e8e0c22cd25793a5e10bfe4788b2579d6a7d04b2fdca09e44de92290a1041856fa4b26940e1fc869e17a0bec434eba8a8122b5d0066bd6edf35
-Size (SDLPoP/v1.17.tar.gz) = 3713129 bytes
-SHA1 (patch-options.c) = db81033072047bb878cedb71f6c86bdca98f9f46
-SHA1 (patch-seg009.c) = b4009d1a9a0715ae182bd950754b50f478d603f6
+SHA1 (SDLPoP-1.17.tar.gz) = 9d59aa14d65f1785705501bb6b2b3e47b77d35f8
+RMD160 (SDLPoP-1.17.tar.gz) = 5eb96831418bf95db75d095984a3674620b6fc94
+SHA512 (SDLPoP-1.17.tar.gz) = d5b401501bdb9e8e0c22cd25793a5e10bfe4788b2579d6a7d04b2fdca09e44de92290a1041856fa4b26940e1fc869e17a0bec434eba8a8122b5d0066bd6edf35
+Size (SDLPoP-1.17.tar.gz) = 3713129 bytes
+SHA1 (patch-options.c) = 900a69e65dce262a0635c1ea98b9432e069750d6
+SHA1 (patch-seg009.c) = 08f1bc7e897432174d91dcc7ea2a1c9fe3b35f58
diff --git a/sdlpop/patches/patch-options.c b/sdlpop/patches/patch-options.c
index d93da6115a..2856e4c9ac 100644
--- a/sdlpop/patches/patch-options.c
+++ b/sdlpop/patches/patch-options.c
@@ -3,8 +3,8 @@ $NetBSD$
 Use installed data path.
 Disable rumble/haptic support.
 
---- options.c.orig	2017-02-05 07:38:56.000000000 +0000
-+++ options.c
+--- src/options.c.orig	2017-02-05 07:38:56.000000000 +0000
++++ src/options.c
 @@ -207,7 +207,8 @@ static int global_ini_callback(const cha
  		process_word("pop_window_width", &pop_window_width, NULL);
  		process_word("pop_window_height", &pop_window_height, NULL);
diff --git a/sdlpop/patches/patch-seg009.c b/sdlpop/patches/patch-seg009.c
index 56527c753f..3dd243a931 100644
--- a/sdlpop/patches/patch-seg009.c
+++ b/sdlpop/patches/patch-seg009.c
@@ -3,8 +3,8 @@ $NetBSD$
 Use installed data path.
 Disable rumble/haptic support.
 
---- seg009.c.orig	2017-02-05 07:38:56.000000000 +0000
-+++ seg009.c
+--- src/seg009.c.orig	2017-02-05 07:38:56.000000000 +0000
++++ src/seg009.c
 @@ -152,7 +152,7 @@ static FILE* open_dat_from_root_or_data_
  	// if failed, try if the DAT file can be opened in the data/ directory, instead of the main folder
  	if (fp == NULL) {