din: Fixed the linker options to pick the correct library (ALSA vs JACK).

Module Name: pkgsrc-wip
Committed By: fox <santhosh.raju%gmail.com@localhost>
Pushed By: fox
Date:  Mon Jun 18 01:19:50 2018 +0530
Changeset: e1ab0a27db2577485e96ba1662f741bfd46ce632

Modified Files:
 din/Makefile
 din/distinfo
 din/options.mk
Added Files:
 din/patches/patch-src_Makefile.am
 din/patches/patch-src_Makefile.in

Log Message:
din: Fixed the linker options to pick the correct library (ALSA vs JACK).

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

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

diffstat:
 din/Makefile                      |  2 ++
 din/distinfo                      |  2 ++
 din/options.mk                    |  9 ++++++---
 din/patches/patch-src_Makefile.am | 14 ++++++++++++++
 din/patches/patch-src_Makefile.in | 15 +++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)

diffs:
diff --git a/din/Makefile b/din/Makefile
index 369cdc1b2e..e0487511ce 100644
--- a/din/Makefile
+++ b/din/Makefile
@@ -14,6 +14,8 @@ USE_LANGUAGES= c c++
 USE_TOOLS+= autoreconf pkg-config gmake
 GNU_CONFIGURE= yes
 
+LDFLAGS+= -ltcl -lSDL -lGL -lpthread
+
 .include "options.mk"
 
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/din/distinfo b/din/distinfo
index e8d1a88299..9df35f31ec 100644
--- a/din/distinfo
+++ b/din/distinfo
@@ -4,4 +4,6 @@ SHA1 (din-35.tar.gz) = 8a21258da1f0c97cbc8372c3e9f87f45e915ed8c
 RMD160 (din-35.tar.gz) = a86fe3198a7472ca68024ce53b6e5784be01db7e
 SHA512 (din-35.tar.gz) = a3f16996eab7362624e6bb6156843173c6d5e5662843a4502920aedff4c81efa34723d07b8982973cc99ff5e0c945efeb1b66d7e52e14f92cf26d817b8a5a309
 Size (din-35.tar.gz) = 3613126 bytes
+SHA1 (patch-src_Makefile.am) = bb22b57b55cb6301bc00563c932ae2bb9c3333f2
+SHA1 (patch-src_Makefile.in) = 6b071dc18bfb2d964192638813342037fe7832ce
 SHA1 (patch-src_main.cc) = 21a55217a2e03a49ccbae4e46994e6da68f83d92
diff --git a/din/options.mk b/din/options.mk
index 6ea3cfc04e..4cc669326c 100644
--- a/din/options.mk
+++ b/din/options.mk
@@ -1,8 +1,9 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR= PKG_OPTIONS.din
-PKG_SUPPORTED_OPTIONS= alsa jack
-PKG_SUGGESTED_OPTIONS= jack
+PKG_OPTIONS_VAR=  PKG_OPTIONS.din
+PKG_OPTIONS_OPTIONAL_GROUPS= backend
+PKG_OPTIONS_GROUP.backend= alsa jack
+PKG_SUGGESTED_OPTIONS=  jack
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,6 +12,7 @@ PKG_SUGGESTED_OPTIONS= jack
 ###
 .if !empty(PKG_OPTIONS:Malsa)
 CXXFLAGS+=  -D__LINUX_ALSA__
+LDFLAGS+=  -lasound
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 
@@ -19,5 +21,6 @@ CXXFLAGS+=  -D__LINUX_ALSA__
 ###
 .if !empty(PKG_OPTIONS:Mjack)
 CXXFLAGS+=  -D__UNIX_JACK__
+LDFLAGS+=  -ljack
 .include "../../audio/jack/buildlink3.mk"
 .endif
diff --git a/din/patches/patch-src_Makefile.am b/din/patches/patch-src_Makefile.am
new file mode 100644
index 0000000000..7ece4e90bc
--- /dev/null
+++ b/din/patches/patch-src_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Now it only links the library (ALSA / JACK) selected during build time.
+
+--- src/Makefile.am.orig 2018-06-18 00:37:00.000000000 +0000
++++ src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = -I ../include -I /usr/include/tcl -Wall -DGPL2=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -DPREFIX=\"@prefix@\"
+-LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound -ljack
++AM_CXXFLAGS = -I ../include -Wall -DGPL2=1 -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread
+ 
+ AM_CFLAGS = -I ../include
+ bin_PROGRAMS = din
diff --git a/din/patches/patch-src_Makefile.in b/din/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..85dd1d27e5
--- /dev/null
+++ b/din/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Removed linker flags, it is now handled by the pkgsrc script.
+
+--- src/Makefile.in.orig 2018-06-17 18:24:44.603878000 +0000
++++ src/Makefile.in
+@@ -234,7 +234,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@ -ltcl -lSDL -lGL -lpthread -lasound -ljack
++LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@