CVS commit: pkgsrc/emulators/free42

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Mar 16 00:21:07 UTC 2020

Modified Files:
        pkgsrc/emulators/free42: Makefile distinfo
        pkgsrc/emulators/free42/patches: patch-gtk_Makefile

Log Message:
free42: try to fix Linux breakage w/ alsa


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/free42/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/free42/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/free42/patches/patch-gtk_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/free42/Makefile
diff -u pkgsrc/emulators/free42/Makefile:1.20 pkgsrc/emulators/free42/Makefile:1.21
--- pkgsrc/emulators/free42/Makefile:1.20       Tue Mar 10 22:09:46 2020
+++ pkgsrc/emulators/free42/Makefile    Mon Mar 16 00:21:07 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2020/03/10 22:09:46 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/03/16 00:21:07 tnn Exp $
 
 DISTNAME=      free42
 PKGNAME=       ${DISTNAME}-1.4.78
-PKGREVISION=   12
+PKGREVISION=   13
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 CATEGORIES=    emulators
 #MASTER_SITES= http://thomasokken.com/free42/download/
@@ -24,7 +24,6 @@ BUILD_DIRS=   gtk
 BUILD_TARGET=  free42${VARIANT}
 
 CXXFLAGS.NetBSD+=      -DNO_SINCOS
-MAKE_ENV.Linux+=       AUDIO_ALSA=1
 
 INSTALLATION_DIRS+=    bin
 INSTALLATION_DIRS+=    share/doc/free42
@@ -37,6 +36,11 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/${BUILD_DIRS}/README \
                ${DESTDIR}/${PREFIX}/share/doc/free42/README.gtk
 
+.if ${OPSYS} == "Linux"
+MAKE_ENV+=     AUDIO_ALSA=1
+.include "../../audio/alsa-lib/buildlink3.mk"
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/free42/distinfo
diff -u pkgsrc/emulators/free42/distinfo:1.2 pkgsrc/emulators/free42/distinfo:1.3
--- pkgsrc/emulators/free42/distinfo:1.2        Thu Mar 23 17:06:49 2017
+++ pkgsrc/emulators/free42/distinfo    Mon Mar 16 00:21:07 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2017/03/23 17:06:49 joerg Exp $
+$NetBSD: distinfo,v 1.3 2020/03/16 00:21:07 tnn Exp $
 
 SHA1 (free42-1.4.78/free42.tgz) = 4b5caada89dbe8adac31b0ef67fddb572663a514
 RMD160 (free42-1.4.78/free42.tgz) = 3f4cc40dc42d0cdee7ec89201566e196f3ce2431
 SHA512 (free42-1.4.78/free42.tgz) = 14281538cf5228b6c0c84b529e692b04b606cd8a2733c0cc69bd58d9c1a259c92ca2df41d001947c22438e009eb99b924fcf09179f96bf2befebbc9a9d4e4265
 Size (free42-1.4.78/free42.tgz) = 10707178 bytes
 SHA1 (patch-README) = 4e1311b272c1334a1ddbb6d7043d90805516b681
-SHA1 (patch-gtk_Makefile) = 472361dc7e7b7d5b6869eb83198b6924b98ca7aa
+SHA1 (patch-gtk_Makefile) = 63bb16da78d778b09d40fd7034531afe8087c742
 SHA1 (patch-gtk_README) = 83ab97efb8f9046cba6056798344b76128562d5d

Index: pkgsrc/emulators/free42/patches/patch-gtk_Makefile
diff -u pkgsrc/emulators/free42/patches/patch-gtk_Makefile:1.1 pkgsrc/emulators/free42/patches/patch-gtk_Makefile:1.2
--- pkgsrc/emulators/free42/patches/patch-gtk_Makefile:1.1      Mon Mar 10 08:38:25 2014
+++ pkgsrc/emulators/free42/patches/patch-gtk_Makefile  Mon Mar 16 00:21:07 2020
@@ -1,18 +1,25 @@
-$NetBSD: patch-gtk_Makefile,v 1.1 2014/03/10 08:38:25 he Exp $
+$NetBSD: patch-gtk_Makefile,v 1.2 2020/03/16 00:21:07 tnn Exp $
 
 Remove references to X11 headers and libs, allow them to
 be controlled by pkgsrc.  Also allow CXXFLAGS to be added to.
 
 --- gtk/Makefile.orig  2013-12-09 00:49:20.000000000 +0000
 +++ gtk/Makefile
-@@ -15,8 +15,8 @@
+@@ -15,11 +15,14 @@
  # along with this program; if not, see http://www.gnu.org/licenses/.
  ###############################################################################
  
 -CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -g -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\""
 -LDFLAGS = -L/usr/X11R6/lib
+-LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
 +CXXFLAGS_PRE := -MMD -Wall -Wno-parentheses -Wno-write-strings -g -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\""
 +CXXFLAGS += ${CXXFLAGS_PRE}
- LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
++LIBS := -lX11 -lXmu $(shell pkg-config --libs gtk+-2.0)
  
  ifeq "$(shell uname -s)" "Linux"
++ifdef AUDIO_ALSA
++LIBS += -ldl -pthread
++endif
+ LDFLAGS += -Wl,--hash-style=both
+ endif
+