pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

eureka: Make it work



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Aug 30 18:17:24 2019 +0200
Changeset:	71b864677da1caace2395fc8348787eb9370cd2c

Modified Files:
	eureka/Makefile
	eureka/distinfo
Added Files:
	eureka/patches/patch-src_m__files.cc
	eureka/patches/patch-src_main.cc

Log Message:
eureka: Make it work

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

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

diffstat:
 eureka/Makefile                      | 17 +++++++++++++++++
 eureka/distinfo                      |  2 ++
 eureka/patches/patch-src_m__files.cc | 12 ++++++++++++
 eureka/patches/patch-src_main.cc     | 14 ++++++++++++++
 4 files changed, 45 insertions(+)

diffs:
diff --git a/eureka/Makefile b/eureka/Makefile
index c2bf67efc0..99a8f2823b 100644
--- a/eureka/Makefile
+++ b/eureka/Makefile
@@ -15,6 +15,23 @@ USE_TOOLS+=	gmake
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}-source
 
+# DOOMWADDIR is intentionally shared with other Doom packages
+DOOMWADDIR=	share/doom
+
+# Modify internal search path to check ${PREFIX}/share hierarchy first
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	do-configure
+SUBST_MESSAGE.prefix=	Preparing main.cc file ...
+SUBST_FILES.prefix=	src/main.cc
+SUBST_SED.prefix=	-e 's,PKGSRC_PREFIX,${PREFIX},'
+
+# Modify internal search path for DOOMWADDIR (if environment variable not set)
+SUBST_CLASSES+=		dwd
+SUBST_STAGE.dwd=	do-configure
+SUBST_MESSAGE.dwd=	Preparing m_files.cc file ...
+SUBST_FILES.dwd=	src/m_files.cc
+SUBST_SED.dwd=		-e 's,PKGSRC_DOOMWADDIR,${PREFIX}/DOOMWADDIR,'
+
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/fltk14-devel/buildlink3.mk"
diff --git a/eureka/distinfo b/eureka/distinfo
index da4fbe7ac0..384aed7789 100644
--- a/eureka/distinfo
+++ b/eureka/distinfo
@@ -5,4 +5,6 @@ RMD160 (eureka-124-source.tar.gz) = 9e6ea0f207d9445c64fca31531112adad6d0299d
 SHA512 (eureka-124-source.tar.gz) = 27f858ac0ea366932777830dca289db456ba68a90bbfa507dcf734f4aa0b0b72fd5654ab8cb0305c9a51793e97fb7b686a5860cc00d37304eab5db1cecbb3c05
 Size (eureka-124-source.tar.gz) = 1111598 bytes
 SHA1 (patch-Makefile) = 0f0930e3fae528b6bb72a7c841ffab6f6da071e7
+SHA1 (patch-src_m__files.cc) = 3a428c0da9c39c3e35a674bf362cf5e4da51d05f
+SHA1 (patch-src_main.cc) = 7e3a1db40d055f04622ac7cd6ae3997ed77e66ea
 SHA1 (patch-src_ui__window.cc) = c058e793e57b8208d3287c658ec2e2c7457380f9
diff --git a/eureka/patches/patch-src_m__files.cc b/eureka/patches/patch-src_m__files.cc
new file mode 100644
index 0000000000..94bc0e76b5
--- /dev/null
+++ b/eureka/patches/patch-src_m__files.cc
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/m_files.cc.orig	2019-08-30 15:58:23.000000000 +0000
++++ src/m_files.cc
+@@ -721,6 +721,7 @@ static const char * SearchForIWAD(const 
+ 		"c:/doom2",
+ 		"c:/doom95",
+ #else
++		"PKGSRC_DOOMWADDIR",
+ 		"/usr/share/games/doom",
+ 		"/usr/share/doom",
+ 		"/usr/local/share/games/doom",
diff --git a/eureka/patches/patch-src_main.cc b/eureka/patches/patch-src_main.cc
new file mode 100644
index 0000000000..b5dca8cd58
--- /dev/null
+++ b/eureka/patches/patch-src_main.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add placeholder for pkgsrc PREFIX to beginning of search list.
+
+--- src/main.cc.orig	2018-08-05 08:20:26.000000000 +0000
++++ src/main.cc
+@@ -301,6 +301,7 @@ static void Determine_InstallPath(const 
+ #else
+ 	static const char *prefixes[] =
+ 	{
++		"PKGSRC_PREFIX",
+ 		"/usr/local",
+ 		"/usr",
+ 		"/opt",


Home | Main Index | Thread Index | Old Index