CVS commit: pkgsrc/emulators/xm8

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jan 15 11:40:13 UTC 2021

Modified Files:
        pkgsrc/emulators/xm8: Makefile distinfo
Added Files:
        pkgsrc/emulators/xm8/patches: patch-Source_Linux_makefile

Log Message:
xm8: Normalize build process. Use LDFLAGS properly.

Should help RPATH issues seen in bulk builds.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/xm8/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/xm8/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/xm8/patches/patch-Source_Linux_makefile

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

Modified files:

Index: pkgsrc/emulators/xm8/Makefile
diff -u pkgsrc/emulators/xm8/Makefile:1.4 pkgsrc/emulators/xm8/Makefile:1.5
--- pkgsrc/emulators/xm8/Makefile:1.4   Tue Aug 18 17:57:48 2020
+++ pkgsrc/emulators/xm8/Makefile       Fri Jan 15 11:40:13 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2020/08/18 17:57:48 leot Exp $
+# $NetBSD: Makefile,v 1.5 2021/01/15 11:40:13 nia Exp $
 
 VERSION=               1.70
 DISTNAME=              xm8_${VERSION:S/.//}
 PKGNAME=               xm8-${VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 #PKGREVISION=          
 CATEGORIES=            emulators
 MASTER_SITES=          http://retropc.net/pi/
@@ -21,14 +21,14 @@ USE_TOOLS+=         gmake unzip
 USE_LANGUAGES=         c c++03
 NO_CONFIGURE=          YES
 
+BUILD_DIRS=            Source/Linux
+MAKE_FILE=             makefile
+
 INSTALLATION_DIRS+=    bin share/doc/xm8
 
 post-extract:
        (cd ${WRKSRC}/Source && ${UNZIP_CMD} Source.zip)
 
-do-build:
-       (cd ${WRKSRC}/Source/Linux && ${GMAKE} -f makefile)
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/Source/Linux/xm8 \
            ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/emulators/xm8/distinfo
diff -u pkgsrc/emulators/xm8/distinfo:1.1 pkgsrc/emulators/xm8/distinfo:1.2
--- pkgsrc/emulators/xm8/distinfo:1.1   Sat Sep  7 00:36:34 2019
+++ pkgsrc/emulators/xm8/distinfo       Fri Jan 15 11:40:13 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2019/09/07 00:36:34 tsutsui Exp $
+$NetBSD: distinfo,v 1.2 2021/01/15 11:40:13 nia Exp $
 
 SHA1 (xm8_170.zip) = 2992590d22f20007fcc5c739be071e39eef5e342
 RMD160 (xm8_170.zip) = 0860b40bdb74bb53ad84b600edaa58b1c994d391
 SHA512 (xm8_170.zip) = c1e49aefec3c4d08cc21f284960d63af2c126883bfc0119d7cf6babe5e14405fae91ea1123eabaaeb41bce8f6ec2e80257b7db8645ce762487ce5ebc94d0d65b
 Size (xm8_170.zip) = 6186595 bytes
+SHA1 (patch-Source_Linux_makefile) = 201f8caaa618ec4bfd3345798d973353a1e7e16d
 SHA1 (patch-Source_UI_app.cpp) = ca4de2687454c483a153a83d03c5c4b1f1d9b7a7
 SHA1 (patch-Source_UI_emu.cpp) = 9c7c8357ebdaa41a317319d46e24fbcabe283418
 SHA1 (patch-Source_UI_emu__sdl.cpp) = 2fee35253b04ef95375d91258faffdf92386ebba

Added files:

Index: pkgsrc/emulators/xm8/patches/patch-Source_Linux_makefile
diff -u /dev/null pkgsrc/emulators/xm8/patches/patch-Source_Linux_makefile:1.1
--- /dev/null   Fri Jan 15 11:40:13 2021
+++ pkgsrc/emulators/xm8/patches/patch-Source_Linux_makefile    Fri Jan 15 11:40:13 2021
@@ -0,0 +1,36 @@
+$NetBSD: patch-Source_Linux_makefile,v 1.1 2021/01/15 11:40:13 nia Exp $
+
+- Honor CXX/CXXFLAGS/LDFLAGS.
+- Do not strip as part of the link process.
+  Let pkgsrc take care of it.
+
+--- Source/Linux/makefile.orig 2015-07-23 04:28:24.000000000 +0000
++++ Source/Linux/makefile
+@@ -12,8 +12,6 @@
+ # tool chain
+ #
+ 
+-CXX = g++
+-
+ STRIP = strip
+ 
+ #
+@@ -28,7 +26,7 @@ SDL_LDFLAGS := $(shell sdl2-config --lib
+ # compile options
+ #
+ 
+-CXXFLAGS = -DSDL -D_PC8801MA -c -O2 -Wall
++CXXFLAGS += -DSDL -D_PC8801MA -c -Wall
+ 
+ #
+ # include directories
+@@ -100,8 +98,7 @@ OBJS = $(SRCS:%.cpp=%.o)
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJS)
+-      $(CXX) -o $(TARGET) $(OBJS) $(SDL_LDFLAGS)
+-      $(STRIP) $(TARGET) 
++      $(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(SDL_LDFLAGS)
+ 
+ #
+ # make clean: