pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
eureka-devel: Import git revision 25b14606cd896f30c19a6793b51732f60ba7bd92
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Fri Sep 27 14:24:04 2019 +0200
Changeset: 270325e3b9b681b6a128cc3e2f93392653401680
Added Files:
eureka-devel/DESCR
eureka-devel/Makefile
eureka-devel/PLIST
eureka-devel/TODO
eureka-devel/distinfo
eureka-devel/options.mk
eureka-devel/patches/patch-Makefile
eureka-devel/patches/patch-src_e__commands.cc
eureka-devel/patches/patch-src_m__files.cc
eureka-devel/patches/patch-src_main.cc
eureka-devel/patches/patch-src_main.h
Log Message:
eureka-devel: Import git revision 25b14606cd896f30c19a6793b51732f60ba7bd92
- Two pkgsrc patches has been merged upstream
- Builds are now reproducible (based on Debian patch)
- xdg-utils are now an optional dependency
Please enter the commit message for your changes. Lines starting
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=270325e3b9b681b6a128cc3e2f93392653401680
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
eureka-devel/DESCR | 5 +++
eureka-devel/Makefile | 50 +++++++++++++++++++++++++++
eureka-devel/PLIST | 39 +++++++++++++++++++++
eureka-devel/TODO | 21 +++++++++++
eureka-devel/distinfo | 11 ++++++
eureka-devel/options.mk | 14 ++++++++
eureka-devel/patches/patch-Makefile | 35 +++++++++++++++++++
eureka-devel/patches/patch-src_e__commands.cc | 21 +++++++++++
eureka-devel/patches/patch-src_m__files.cc | 14 ++++++++
eureka-devel/patches/patch-src_main.cc | 24 +++++++++++++
eureka-devel/patches/patch-src_main.h | 15 ++++++++
11 files changed, 249 insertions(+)
diffs:
diff --git a/eureka-devel/DESCR b/eureka-devel/DESCR
new file mode 100644
index 0000000000..7aa4a28727
--- /dev/null
+++ b/eureka-devel/DESCR
@@ -0,0 +1,5 @@
+Eureka is a map editor for the classic DOOM games, and a few related games
+such as Heretic and Hexen. It supports Linux, Windows and OS X.
+
+There is a 2D mode to create the layout and a 3D mode to check e.g. texture
+alignment.
diff --git a/eureka-devel/Makefile b/eureka-devel/Makefile
new file mode 100644
index 0000000000..03d98e5f1f
--- /dev/null
+++ b/eureka-devel/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD$
+
+GIT_REVISION= 25b14606cd896f30c19a6793b51732f60ba7bd92
+PKGNAME= eureka-devel-0
+GIT_REPO= https://git.code.sf.net/p/eureka-editor/git
+#GIT_EXTRACTDIR= eureka-124-source
+
+#DISTNAME= eureka-124-source
+#PKGNAME= ${DISTNAME:S/eureka/eureka-devel/:S/-source//:S/-1/-1./}
+CATEGORIES= games
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eureka-editor}
+
+MAINTAINER= micha%NetBSD.org@localhost
+HOMEPAGE= https://sourceforge.net/projects/eureka-editor/
+COMMENT= Doom/Heretic/Hexen map editor
+LICENSE= gnu-gpl-v2
+
+USE_LANGUAGES= c++
+USE_TOOLS+= gmake
+
+#WRKSRC= ${WRKDIR}/eureka-1.24-source
+WRKSRC= ${WRKDIR}/git
+
+# 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},'
+
+.include "options.mk"
+
+BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
+# FLTK version 1.4 is supported too
+#.include "../../wip/fltk13/buildlink3.mk"
+.include "../../wip/fltk14-devel/buildlink3.mk"
+
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/eureka-devel/PLIST b/eureka-devel/PLIST
new file mode 100644
index 0000000000..dc3d955eb0
--- /dev/null
+++ b/eureka-devel/PLIST
@@ -0,0 +1,39 @@
+@comment $NetBSD$
+bin/eureka
+share/eureka/about_logo.png
+share/eureka/bindings.cfg
+share/eureka/common/doom_colors.ugh
+share/eureka/common/doom_groups.ugh
+share/eureka/common/doom_lines.ugh
+share/eureka/common/doom_sectors.ugh
+share/eureka/common/doom_tex.ugh
+share/eureka/common/doom_things.ugh
+share/eureka/common/gen_types.ugh
+share/eureka/common/hexen_groups.ugh
+share/eureka/common/hexen_lines.ugh
+share/eureka/common/hexen_sectors.ugh
+share/eureka/common/plutonia_tex.ugh
+share/eureka/common/tnt_tex.ugh
+share/eureka/defaults.cfg
+share/eureka/games/doom.ugh
+share/eureka/games/doom2.ugh
+share/eureka/games/freedm.ugh
+share/eureka/games/freedoom1.ugh
+share/eureka/games/freedoom2.ugh
+share/eureka/games/hacx.ugh
+share/eureka/games/harm1.ugh
+share/eureka/games/heretic.ugh
+share/eureka/games/hexen.ugh
+share/eureka/games/plutonia.ugh
+share/eureka/games/strife1.ugh
+share/eureka/games/tnt.ugh
+share/eureka/operations.cfg
+share/eureka/ports/boom.ugh
+share/eureka/ports/edge.ugh
+share/eureka/ports/eternity.ugh
+share/eureka/ports/legacy.ugh
+share/eureka/ports/mbf.ugh
+share/eureka/ports/odamex.ugh
+share/eureka/ports/vanilla.ugh
+share/eureka/ports/xdoom.ugh
+share/eureka/ports/zdoom.ugh
diff --git a/eureka-devel/TODO b/eureka-devel/TODO
new file mode 100644
index 0000000000..47f4717753
--- /dev/null
+++ b/eureka-devel/TODO
@@ -0,0 +1,21 @@
+[X] Patch make install to work with nonpriviledged user
+[X] Patch internal search path for program files to include ${PREFIX}/share
+[X] Patch internal search path for IWADs to include ${PREFIX}/${DOOMWADDIR}
+[X] Menu entry "Help->Online Docs" doesn't work
+ => pkgsrc patch added
+[X] Test with FLTK 1.3.5
+ => Good
+[X] Test with FLTK 1.4 development snapshot
+ => pkgsrc patch added (otherwise only 1.3.x is accepted)
+ => Good
+[X] Sent pkgsrc patches to upstream
+ => Tickets #34 (Online Docs) and #35 (FLTK 1.4)
+ => Patches merged by upstream
+[X] Test Git revision 25b14606cd896f30c19a6793b51732f60ba7bd92
+ => pkgsrc patches removed/updated
+ => PLIST updated
+[X] Import patch for reproducible builds from Debian
+ => This patch was rejected by upstream
+[X] Make xdg-utils an option (Default=on)
+ => An option "xdg-utils" already exists in pkgsrc
+[ ] Import final eureka 1.25 release
diff --git a/eureka-devel/distinfo b/eureka-devel/distinfo
new file mode 100644
index 0000000000..f6c8cebd67
--- /dev/null
+++ b/eureka-devel/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+SHA1 (doomlegacy__common.zip) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+RMD160 (doomlegacy__common.zip) = 9c1185a5c5e9fc54612808977ee8f548b2258d31
+SHA512 (doomlegacy__common.zip) = cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+Size (doomlegacy__common.zip) = 0 bytes
+SHA1 (patch-Makefile) = c2e83da7c2f67466be3acff3309266a78ef7262f
+SHA1 (patch-src_e__commands.cc) = 7b5c9bcd4db15462335ac988acc42609ee3c4c07
+SHA1 (patch-src_m__files.cc) = a294c303fab3a37183bf33469af7c40d72f4f756
+SHA1 (patch-src_main.cc) = 8e94a98350d91c3eb92242126db08abd4f01849f
+SHA1 (patch-src_main.h) = 102f21bd36dfc87e0e61a22bd3002676a808ed7a
diff --git a/eureka-devel/options.mk b/eureka-devel/options.mk
new file mode 100644
index 0000000000..ce531e3f9c
--- /dev/null
+++ b/eureka-devel/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.eureka-devel
+PKG_SUPPORTED_OPTIONS= xdg-utils
+PKG_SUGGESTED_OPTIONS= xdg-utils
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+# xdg-utils: Create dependency for xdg-utils (Portland project)
+# xdg-utils are used for WWW-Browser and eMail redirection
+.if !empty(PKG_OPTIONS:Mxdg-utils)
+DEPENDS+= xdg-utils>=1.1:../../misc/xdg-utils
+.endif
diff --git a/eureka-devel/patches/patch-Makefile b/eureka-devel/patches/patch-Makefile
new file mode 100644
index 0000000000..93b16d0943
--- /dev/null
+++ b/eureka-devel/patches/patch-Makefile
@@ -0,0 +1,35 @@
+$NetBSD$
+
+Create ${PREFIX}/bin for installation.
+Do not force user root, to allow installation with non-root account.
+
+--- Makefile.orig 2019-09-27 11:13:24.000000000 +0000
++++ Makefile
+@@ -141,18 +141,19 @@ stripped: all
+ INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka
+
+ install: all
+- install -o root -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/
++ install -d $(DESTDIR)$(PREFIX)/bin
++ install -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
+ install -d $(INSTALL_DIR)/games
+ install -d $(INSTALL_DIR)/common
+ install -d $(INSTALL_DIR)/ports
+ rm -f $(INSTALL_DIR)/games/freedoom.ugh
+- install -o root -m 644 bindings.cfg $(INSTALL_DIR)/bindings.cfg
+- install -o root -m 644 defaults.cfg $(INSTALL_DIR)/defaults.cfg
+- install -o root -m 644 operations.cfg $(INSTALL_DIR)/operations.cfg
+- install -o root -m 644 misc/about_logo.png $(INSTALL_DIR)/about_logo.png
+- install -o root -m 644 games/*.* $(INSTALL_DIR)/games
+- install -o root -m 644 common/*.* $(INSTALL_DIR)/common
+- install -o root -m 644 ports/*.* $(INSTALL_DIR)/ports
++ install -m 644 bindings.cfg $(INSTALL_DIR)/bindings.cfg
++ install -m 644 defaults.cfg $(INSTALL_DIR)/defaults.cfg
++ install -m 644 operations.cfg $(INSTALL_DIR)/operations.cfg
++ install -m 644 misc/about_logo.png $(INSTALL_DIR)/about_logo.png
++ install -m 644 games/*.* $(INSTALL_DIR)/games
++ install -m 644 common/*.* $(INSTALL_DIR)/common
++ install -m 644 ports/*.* $(INSTALL_DIR)/ports
+
+ full-install: install
+ xdg-desktop-menu install --novendor misc/eureka.desktop
diff --git a/eureka-devel/patches/patch-src_e__commands.cc b/eureka-devel/patches/patch-src_e__commands.cc
new file mode 100644
index 0000000000..f7577c52cb
--- /dev/null
+++ b/eureka-devel/patches/patch-src_e__commands.cc
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Show error message if function fl_open_uri() fails.
+
+--- src/e_commands.cc.orig 2018-08-03 04:22:13.000000000 +0000
++++ src/e_commands.cc
+@@ -1180,7 +1180,13 @@ void CMD_LogViewer()
+
+ void CMD_OnlineDocs()
+ {
+- fl_open_uri("http://eureka-editor.sourceforge.net/?n=Docs.Index";);
++ int rv;
++
++ rv = fl_open_uri("http://eureka-editor.sourceforge.net/?n=Docs.Index";);
++ if (1 != rv)
++ {
++ Beep("Failed to open WWW browser");
++ }
+ }
+
+
diff --git a/eureka-devel/patches/patch-src_m__files.cc b/eureka-devel/patches/patch-src_m__files.cc
new file mode 100644
index 0000000000..5c93161664
--- /dev/null
+++ b/eureka-devel/patches/patch-src_m__files.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add placeholder for pkgsrc DOOMWADDIR to beginning of search list.
+
+--- src/m_files.cc.orig 2018-06-23 11:29:07.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-devel/patches/patch-src_main.cc b/eureka-devel/patches/patch-src_main.cc
new file mode 100644
index 0000000000..c8d5a21f10
--- /dev/null
+++ b/eureka-devel/patches/patch-src_main.cc
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Add placeholder for pkgsrc PREFIX to beginning of search list.
+Remove date to make builds reproducible (based on Debian patch).
+
+--- src/main.cc.orig 2019-09-27 11:13:24.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",
+@@ -947,7 +948,7 @@ static void ShowHelp()
+
+ static void ShowVersion()
+ {
+- printf("Eureka version " EUREKA_VERSION " (" __DATE__ ")\n");
++ printf("Eureka version " EUREKA_VERSION " (Reproducible build)\n");
+
+ fflush(stdout);
+ }
diff --git a/eureka-devel/patches/patch-src_main.h b/eureka-devel/patches/patch-src_main.h
new file mode 100644
index 0000000000..e8f4842391
--- /dev/null
+++ b/eureka-devel/patches/patch-src_main.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add suffix "git" to version (this is a development snapshot).
+
+--- src/main.h.orig 2019-09-27 11:13:24.000000000 +0000
++++ src/main.h
+@@ -30,7 +30,7 @@
+
+ #define EUREKA_TITLE "Eureka DOOM Editor"
+
+-#define EUREKA_VERSION "1.24"
++#define EUREKA_VERSION "1.24git"
+
+ #define EUREKA_LUMP "__EUREKA"
+
Home |
Main Index |
Thread Index |
Old Index