pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
doomlegacy: Update to SVN revision 1448
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By: micha
Date: Wed Aug 14 20:02:33 2019 +0200
Changeset: 482675db8835b11214a0a391012b69c2c8f2e14f
Modified Files:
doomlegacy/Makefile
doomlegacy/TODO
doomlegacy/distinfo
Removed Files:
doomlegacy/patches/patch-Makefile
doomlegacy/patches/patch-src_Makefile
doomlegacy/patches/patch-src_doomtype.h
doomlegacy/patches/patch-src_i__tcp.c
doomlegacy/patches/patch-src_sdl_i__system.c
Log Message:
doomlegacy: Update to SVN revision 1448
pkgsrc patches removed (merged upstream)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=482675db8835b11214a0a391012b69c2c8f2e14f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
doomlegacy/Makefile | 25 ++++-
doomlegacy/TODO | 5 +-
doomlegacy/distinfo | 9 --
doomlegacy/patches/patch-Makefile | 76 -------------
doomlegacy/patches/patch-src_Makefile | 158 ---------------------------
doomlegacy/patches/patch-src_doomtype.h | 50 ---------
doomlegacy/patches/patch-src_i__tcp.c | 47 --------
doomlegacy/patches/patch-src_sdl_i__system.c | 24 ----
8 files changed, 22 insertions(+), 372 deletions(-)
diffs:
diff --git a/doomlegacy/Makefile b/doomlegacy/Makefile
index ac5386d0b3..46a82412be 100644
--- a/doomlegacy/Makefile
+++ b/doomlegacy/Makefile
@@ -1,12 +1,17 @@
# $NetBSD$
VERS= 1.47.2
-PKGNAME= doomlegacy-${VERS}
-PKGREVISION= 1
+#PKGNAME= doomlegacy-${VERS}
+SVNVERS= 1448
+DISTNAME= doomlegacy-devel-r${SVNVERS}
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
-DISTNAME= ${PKGNAME_NOREV:S/-/_/}_source
-DISTFILES= doomlegacy_${VERS}_source.tar.bz2 doomlegacy_${VERS}_common.zip
+
+DISTFILES= doomlegacy_${VERS}_common.zip
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=doomlegacy/}
+SVN_REPOSITORIES= legacy_one
+SVN_REPO.legacy_one= svn://svn.code.sf.net/p/doomlegacy/svn/legacy_one/trunk
+SVN_REVISION.legacy_one= ${SVNVERS}
+SVN_EXTRACTDIR.legacy_one= doomlegacy-devel-r${SVNVERS}
MAINTAINER= micha%NetBSD.org@localhost
HOMEPAGE= http://doomlegacy.sourceforge.net/
@@ -23,6 +28,7 @@ USE_LANGUAGES+= c99
USE_TOOLS+= gmake
MAKE_JOBS_SAFE= no
+.include "../../wip/mk/svn-package.mk"
.include "../../mk/bsd.prefs.mk"
.include "../../mk/endian.mk"
@@ -36,7 +42,6 @@ MAKE_FLAGS+= OS=MAC
# Other Unix (should work for GNU/Linux, OpenBSD and SunOS)
MAKE_FLAGS+= OS=LINUX
.endif
-MAKE_FLAGS+= COMP_ENVIRONMENT=1 HAVE_MIXER=1
.if ${MACHINE_ENDIAN} == "big"
# Some compilers define this themselves (but maybe not all)
@@ -51,6 +56,13 @@ MESSAGE_SRC+= MESSAGE.doomlegacy
MESSAGE_SUBST+= PKGNAME=${PKGNAME:C/-.*//}
MESSAGE_SUBST+= DOOMWADDIR_CONF="${PREFIX}/${DOOMWADDIR}"
+# Configure to honor environment
+SUBST_CLASSES+= makeopt
+SUBST_STAGE.makeopt= do-configure
+SUBST_MESSAGE.makeopt= Preparing make_options file ...
+SUBST_FILES.makeopt= make_options
+SUBST_SED.makeopt= -e 's,\#COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
+
# Configure defaults for LEGACYWADDIR and DOOMWADDIR
SUBST_CLASSES+= doomdef
SUBST_STAGE.doomdef= do-configure
@@ -61,6 +73,7 @@ SUBST_SED.doomdef+= -e 's,DEFWADS01 "~/games/doomlegacy/wads",DEFWADS01 "${PRE
pre-configure:
${CP} ${FILESDIR}/doomlegacy.6.in ${WRKDIR}
+ cd ${WRKSRC} && ${CP} make_options_nix make_options
# Move configure options and process manpage template
do-configure:
diff --git a/doomlegacy/TODO b/doomlegacy/TODO
index 9c9b7c9b69..dcf2f3d9d1 100644
--- a/doomlegacy/TODO
+++ b/doomlegacy/TODO
@@ -5,5 +5,6 @@
=> PKGREVISION not bumped, because binary package has not changed
[X] Move man page to section 6 (it's a game)
=> Bump PKGREVISION
-[ ] Test building of the package again
-[ ] Remove patches after upstream integration
+[X] Test building of the package again
+ => Tested to work with SVN revision r1448
+[X] Remove patches after upstream integration
diff --git a/doomlegacy/distinfo b/doomlegacy/distinfo
index dac1592cb3..0a9e6286eb 100644
--- a/doomlegacy/distinfo
+++ b/doomlegacy/distinfo
@@ -4,12 +4,3 @@ SHA1 (doomlegacy_1.47.2_common.zip) = 9e6faaea797b988565a078a47e80bbe2119d78b9
RMD160 (doomlegacy_1.47.2_common.zip) = 1ac1f47563ad2c0d7c5c1bea93a2aaeb1c001c10
SHA512 (doomlegacy_1.47.2_common.zip) = 7c7c2a0cbab5b9b4645a3fe166addd597de533db7ab41f8011c6c526a868bb04c8dd6b0d27b48765406fbab328bf64fc7827770b395e6c0e5d861d99c4d3865a
Size (doomlegacy_1.47.2_common.zip) = 981654 bytes
-SHA1 (doomlegacy_1.47.2_source.tar.bz2) = afb1213eb8b228d9f131e4c63ead97afed2f599f
-RMD160 (doomlegacy_1.47.2_source.tar.bz2) = 661f0fa2bdc58a2f5f9582f36817ddd9d48df9bc
-SHA512 (doomlegacy_1.47.2_source.tar.bz2) = e2e182c18dd24c14e954f791c58e44119457bb74af4bb079c16219406176536f9fd414afd6c9fa0e956a6062b5a346bbf19ebf4c0d2d300e2e66b2eb01cf53fd
-Size (doomlegacy_1.47.2_source.tar.bz2) = 2276199 bytes
-SHA1 (patch-Makefile) = b85e70fa945c9b917139181af8e01ca1c61c57ac
-SHA1 (patch-src_Makefile) = e940d7d35221f547fd7bdc891293c23bd3ee9633
-SHA1 (patch-src_doomtype.h) = e9d42dab1b7a23af3ddfe8b34f9e103826df212d
-SHA1 (patch-src_i__tcp.c) = 34c2e71dc63e1be114a307b4277f523ba5175117
-SHA1 (patch-src_sdl_i__system.c) = 17524680559b81ae755d781f63f3c5d34e1f14b6
diff --git a/doomlegacy/patches/patch-Makefile b/doomlegacy/patches/patch-Makefile
deleted file mode 100644
index 1d0ecac2b9..0000000000
--- a/doomlegacy/patches/patch-Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD$
-
-Add NetBSD to OS list.
-Honor environment variables CFLAGS, LDFLAGS and LIBS.
-Silence warnings about common symbol merging.
-
---- Makefile.orig 2017-03-03 20:22:35.000000000 +0000
-+++ Makefile
-@@ -128,6 +128,7 @@
- # Linux is the default for SDL, that also applies to most unix-like OS.
- # OS=LINUX
- # OS=FREEBSD
-+# OS=NETBSD
- # Windows operating systems. Also see CC_SELECT.
- # WIN32 is a generic 32bit Windows.
- # OS=WIN32
-@@ -418,7 +419,7 @@ endif
- export SMIF
-
-
--OS_LIST:=LINUX FREEBSD WIN32 WIN98 WIN7 OS2 DOS MAC
-+OS_LIST:=LINUX FREEBSD NETBSD WIN32 WIN98 WIN7 OS2 DOS MAC
-
- ifeq ($(OS), LINUX)
- LINUX=1
-@@ -429,6 +430,12 @@ ifeq ($(OS), FREEBSD)
- $(info Please submit bug reports, and bug fixes. )
- FREEBSD=1
- else
-+ifeq ($(OS), NETBSD)
-+ # Uses statvfs(5).
-+ $(info NetBSD support is dependent upon user reports.)
-+ $(info Please submit bug reports, and bug fixes. )
-+ NETBSD=1
-+else
- ifeq ($(OS), WIN32)
- $(info Generic Windows compile. May or may-not work on modern Windows.)
- $(info Please submit bug reports, and bug fixes. )
-@@ -482,6 +489,7 @@ endif
- endif
- endif
- endif
-+endif
- export OS
-
-
-@@ -507,7 +515,7 @@ ifdef DOSFILE
- O_WIN:=$(subst /,\,$(O))
- DD_WIN:=$(subst /,\,$(DD))
- else
-- # Linux, FreeBSD, Mac
-+ # Linux, FreeBSD, NETBSD, Mac
- RM:=rm
- SHELL:=/bin/sh
- endif
-@@ -730,7 +738,7 @@ ifdef DOSFILE
- INSTALL_GAMES_DIR ?= \games\doomlegacy
- INSTALL_USER_DIR ?= $(USERHOME)\games\doomlegacy
- else
-- # Linux, FreeBSD, Mac
-+ # Linux, FreeBSD, NETBSD, Mac
- # DO NOT use tilde, use $(HOME).
- PREFIX ?= /usr/local
- INSTALL_SYS_DIR ?= $(PREFIX)/bin
-@@ -1144,7 +1152,11 @@ else
- ifeq ($(OS), FREEBSD)
- cp -n make_options_nix $(BUILD_DIR)make_options
- else
-+ ifeq ($(OS), NETBSD)
- cp -n make_options_nix $(BUILD_DIR)make_options
-+ else
-+ cp -n make_options_nix $(BUILD_DIR)make_options
-+ endif
- endif
- endif
- endif
diff --git a/doomlegacy/patches/patch-src_Makefile b/doomlegacy/patches/patch-src_Makefile
deleted file mode 100644
index a0d7150bae..0000000000
--- a/doomlegacy/patches/patch-src_Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-$NetBSD$
-
-Add NetBSD to OS list.
-Honor environment variables CFLAGS, LDFLAGS and LIBS.
-Silence warnings about common symbol merging.
-
---- src/Makefile.orig 2018-07-16 09:17:06.000000000 +0000
-+++ src/Makefile
-@@ -449,13 +449,13 @@ endif
- endif
-
-
--OS_LIST:=LINUX FREEBSD WIN32 WIN7 WIN98 OS2 DOS MAC
-+OS_LIST:=LINUX FREEBSD NETBSD WIN32 WIN7 WIN98 OS2 DOS MAC
-
- OPTS:=
-
- ifeq ($(OS), LINUX)
- LINUX=1
-- OPTS:=-DLINUX
-+ OPTS+=-DLINUX
- #Known Compiler symbols
- # linux __linux __linux__
- # AIX defines: _AIX
-@@ -474,15 +474,23 @@ else
- ifeq ($(OS), FREEBSD)
- # Has some linking differences from the rest of Linux-like OS.
- FREEBSD=1
-- OPTS:=-DLINUX -DFREEBSD
-+ OPTS+=-DLINUX -DFREEBSD
- #Known Compiler symbols
- # __FreeBSD__ __FreeBSD_kernel__ __DragonFly__
- # SDL_platform.h for FreeBSD defines: __FREEBSD__
- else
-+ifeq ($(OS), NETBSD)
-+ # Uses statvfs(5).
-+ NETBSD=1
-+ OPTS+=-DLINUX -DNETBSD
-+ #Known Compiler symbols
-+ # __NetBSD__
-+ # SDL_platform.h for NetBSD defines: __NETBSD__
-+else
- ifeq ($(OS), WIN32)
- WIN32=1
- DOSFILE=1
-- OPTS:=-DWIN32
-+ OPTS+=-DWIN32
- # if have windows > Win98, and want large memory reports
- ifdef WIN_LARGE_MEM
- OPTS+=-DWIN_LARGE_MEM
-@@ -500,7 +508,7 @@ ifeq ($(OS), WIN7)
- # This does NOT YET make a version customized to Win7/8.
- WIN32=1
- DOSFILE=1
-- OPTS:=-DWIN32
-+ OPTS+=-DWIN32
- # probably want large memory reports
- OPTS+=-DWIN_LARGE_MEM
- #Known Compiler symbols
-@@ -511,12 +519,12 @@ ifeq ($(OS), WIN98)
- # If Win98 differences occur, this category can isolate them.
- WIN32=1
- DOSFILE=1
-- OPTS:=-DWIN32
-+ OPTS+=-DWIN32
- else
- ifeq ($(OS), OS2)
- OS2=1
- DOSFILE=1
-- OPTS:=-D__OS2__
-+ OPTS+=-D__OS2__
- #Known Compiler symbols
- # __OS2__
- else
-@@ -545,13 +553,38 @@ endif
- endif
- endif
- endif
-+endif
- export DOSFILE
-
-+# OPTS goes to the C compiler and assembler.
-+# OPTS is almost all defines using -D. It selects conditional code.
-+# CFLAGS only goes to the C compiler. It gets a copy of OPTS.
-+# LDFLAGS goes to the linker. Some linkers cannot handle OPTS.
-+# LIBS goes to the linker.
-+
-+ifdef COMP_ENVIRONMENT
-+ # Things like this will always have an enabling control.
-+ # Otherwise, something that is useful on one system, will be a surprise on another system.
-+ # And it is very hard to debug other systems when unknown settings
-+ # are allowed to influence compiling, without any control or notification.
-+
-+ # NETBSD: Include the environment CFLAGS in OPTS.
-+ # (This is what I got from the NETBSD user, and don't know why it
-+ # goes in OPTS instead of CFLAGS.)
-+ OPTS+=$(CFLAGS)
-+# ENV_CFLAGS=$(CFLAGS)
-+
-+ # NETBSD: Has environment settings that should be used?
-+ # Do not reset LIBS, use the LIBS from the environment.
-+ # Do not reset LDFLAGS, use the LDFLAGS from the environment.
-+else
-+ LIBS:=
-+ LDFLAGS:=
-+endif
-+
- # all OPTINC need to have -I. because of how includes are written
- # however the order of -I may be important, so it is left to each SMIF.
- OPTINC:=
--LIBS:=
--LDFLAGS:=
- INSTALL_SUPPL:=
-
- CFLAGS:=
-@@ -568,6 +601,10 @@ ifdef ARCH
- endif
- endif
-
-+ifdef ENV_CFLAGS
-+ CFLAGS+=$(ENV_CFLAGS)
-+endif
-+
-
- #=================================
- ifeq ($(SMIF), SDL)
-@@ -597,14 +634,14 @@ ifeq ($(SMIF), SDL)
- ifndef MAC
- # default is Linux, for all unix SDL
- EXENAME:=doomlegacy
-- LDFLAGS=-L/usr/X11R6/lib
-- LIBS:=-lGL -lGLU -lm
-+ LDFLAGS+=-L/usr/X11R6/lib
-+ LIBS+=-lGL -lGLU -lm
- # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have
- # the GLU libraries in an X11 directory.
- # -lm is needed for pow, powf, and other MATH1 functions.
- else
- EXENAME:=doomlegacy
-- LDFLAGS=-framework OpenGL
-+ LDFLAGS+=-framework OpenGL
- endif
-
- SDL_CONFIG:=1
-@@ -1013,9 +1050,13 @@ CFLAGS+=$(OPTS) $(OPTINC)
- ifdef MAC
- # MAC linker does not accept these flags.
- else
-+ifdef NETBSD
-+ # NETBSD linker does not accept these flags.
-+else
- # Flags to the linker.
- LDFLAGS+=-Xlinker --warn-common
- endif
-+endif
-
- SNDSERV_EXTRAFLAGS:=
- ifdef HAVE_ESD
diff --git a/doomlegacy/patches/patch-src_doomtype.h b/doomlegacy/patches/patch-src_doomtype.h
deleted file mode 100644
index 3b65c63df0..0000000000
--- a/doomlegacy/patches/patch-src_doomtype.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
-Always use limits.h.
-
---- src/doomtype.h.orig 2018-07-16 09:17:06.000000000 +0000
-+++ src/doomtype.h
-@@ -165,18 +165,31 @@ int strlwr(char *n);
- #endif
-
-
-+// [WDJ] This is needs to be fixed throughout all the files.
-+// But, not until it is determined which systems support which names.
- // Predefined with some OS.
- #ifdef __WIN32__
- #include <limits.h>
--#elif defined( MACOS_DI ) || defined( __MACH__ ) || defined( FREEBSD )
-+#elif defined( MACOS_DI ) || defined( __MACH__ ) || defined( FREEBSD ) || defined( NETBSD )
- #include <limits.h>
- #else
- // Linux GNU, which also includes limits.h
- // obsolete header file
--#include <values.h>
--//#include <limits.h>
-+//#include <values.h>
-+#include <limits.h>
- #endif
-
-+#if ! defined(MAXINT) && defined( INT_MAX )
-+// [WDJ] Define the values.h symbols using defines from limits.h.
-+// This is what values.h does now.
-+#define MAXCHAR CHAR_MAX
-+#define MINCHAR CHAR_MIN
-+#define MAXSHORT SHRT_MAX
-+#define MINSHORT SHRT_MIN
-+#define MAXINT INT_MAX
-+#define MININT INT_MIN
-+
-+#else
- // [WDJ] This is very dangerous considering 32 bit and 64 bit systems,
- // should use stdint.h values instead.
- // These are obsolete defines from values.h.
-@@ -214,6 +227,8 @@ int strlwr(char *n);
- #define MININT ((int)0x80000000)
- #endif
-
-+#endif
-+
- // Sound effect id type.
- typedef uint16_t sfxid_t;
-
diff --git a/doomlegacy/patches/patch-src_i__tcp.c b/doomlegacy/patches/patch-src_i__tcp.c
deleted file mode 100644
index 2c565b12d6..0000000000
--- a/doomlegacy/patches/patch-src_i__tcp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-Disable IPX for NetBSD.
-
---- src/i_tcp.c.orig 2018-07-16 09:17:06.000000000 +0000
-+++ src/i_tcp.c
-@@ -135,6 +135,7 @@
- # ifdef USE_IPX
- # include <wsipx.h>
- # endif // USE_IPX
-+
- #else
- // Not Windows
-
-@@ -169,6 +170,13 @@
- # endif
- #endif
-
-+#ifdef NETBSD
-+// NetBSD does not have IPX.
-+# ifdef USE_IPX
-+# undef USE_IPX
-+# endif
-+#endif
-+
- // Reported to be __OpenBSD__ , but it should be all caps and I am paranoid.
- #if defined( __OpenBSD__ ) || defined( __OPENBSD__ )
- // OpenBSD does not have IPX.
-@@ -413,15 +421,15 @@ char *SOCK_AddrToStr(mysockaddr_t *sk)
- boolean IPX_cmpaddr(mysockaddr_t *a, mysockaddr_t *b)
- {
- #ifdef LINUX
--#ifdef FREEBSD
-+# ifdef FREEBSD
- // FreeBSD: IPX address compare
- return ipx_neteq( a->ipx.sipx_addr, b->ipx.sipx_addr) &&
- ipx_hosteq( a->ipx.sipx_addr, b->ipx.sipx_addr );
--#else
-+# else
- // Linux (except FreeBSD): IPX address compare
- return ((memcmp(&(a->ipx.sipx_network) ,&(b->ipx.sipx_network) ,4)==0) &&
- (memcmp(&(a->ipx.sipx_node),&(b->ipx.sipx_node),6)==0));
--#endif
-+# endif
- #else
- // Windows, OS2, DJGPP: IPX address compare
- return ((memcmp(&(a->ipx.sa_netnum) ,&(b->ipx.sa_netnum) ,4)==0) &&
diff --git a/doomlegacy/patches/patch-src_sdl_i__system.c b/doomlegacy/patches/patch-src_sdl_i__system.c
deleted file mode 100644
index e19ae005b3..0000000000
--- a/doomlegacy/patches/patch-src_sdl_i__system.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Use statvfs(5) for NetBSD.
-
---- src/sdl/i_system.c.orig 2017-03-03 20:22:35.000000000 +0000
-+++ src/sdl/i_system.c
-@@ -74,7 +74,7 @@
- // meminfo
- # include <sys/types.h>
- # include <sys/sysctl.h>
--# elif defined( __MACH__ )
-+# elif defined( __MACH__ ) || defined( NETBSD )
- # include <sys/statvfs.h>
- # else
- # include <sys/vfs.h>
-@@ -861,7 +861,7 @@ uint64_t I_GetDiskFreeSpace(void)
- # ifdef SOLARIS
- goto guess;
-
--# elif defined( __MACH__ )
-+# elif defined( __MACH__ ) || defined( NETBSD )
- struct statvfs stfs;
- if (statvfs(".", &stfs) == -1)
- goto guess;
Home |
Main Index |
Thread Index |
Old Index