Received: by mail.netbsd.org (Postfix, from userid 605) id B433C84D69; Wed, 7 Aug 2019 23:49:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3B28684D5D for ; Wed, 7 Aug 2019 23:49:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FlV6dLWAcfUh for ; Wed, 7 Aug 2019 23:49:02 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B860384CF1 for ; Wed, 7 Aug 2019 23:49:02 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B0C56FBF4; Wed, 7 Aug 2019 23:49:02 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1565221742291980" MIME-Version: 1.0 Date: Wed, 7 Aug 2019 23:49:02 +0000 From: "Santhosh Raju" Subject: CVS commit: pkgsrc/audio/din To: pkgsrc-changes@NetBSD.org Reply-To: fox@netbsd.org X-Mailer: log_accum Message-Id: <20190807234902.B0C56FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1565221742291980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fox Date: Wed Aug 7 23:49:02 UTC 2019 Modified Files: pkgsrc/audio/din: Makefile options.mk Log Message: din: Fixes builds in Linux. 1. Should fix builds in Ubuntu, LIBS are appended correctly during link. 2. Bumps PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/din/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/din/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1565221742291980 Content-Disposition: inline Content-Length: 1687 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/din/Makefile diff -u pkgsrc/audio/din/Makefile:1.7 pkgsrc/audio/din/Makefile:1.8 --- pkgsrc/audio/din/Makefile:1.7 Sun Jul 28 17:12:46 2019 +++ pkgsrc/audio/din/Makefile Wed Aug 7 23:49:02 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2019/07/28 17:12:46 fox Exp $ +# $NetBSD: Makefile,v 1.8 2019/08/07 23:49:02 fox Exp $ DISTNAME= din-42 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= https://archive.org/download/dinisnoise_source_code/ @@ -14,8 +14,8 @@ USE_LANGUAGES= c c++ USE_TOOLS+= autoreconf pkg-config gmake GNU_CONFIGURE= yes -LDFLAGS+= -ltcl -lSDL -lGL -lpthread -LDFLAGS.Darwin+= -lSDLmain +LIBS+= -ltcl -lSDL -lGL -lpthread +LIBS.Darwin+= -lSDLmain .include "options.mk" Index: pkgsrc/audio/din/options.mk diff -u pkgsrc/audio/din/options.mk:1.1 pkgsrc/audio/din/options.mk:1.2 --- pkgsrc/audio/din/options.mk:1.1 Mon Dec 10 20:33:06 2018 +++ pkgsrc/audio/din/options.mk Wed Aug 7 23:49:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/12/10 20:33:06 fox Exp $ +# $NetBSD: options.mk,v 1.2 2019/08/07 23:49:02 fox Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.din PKG_OPTIONS_OPTIONAL_GROUPS= backend @@ -11,8 +11,8 @@ PKG_SUGGESTED_OPTIONS= jack ### Support ALSA ### .if !empty(PKG_OPTIONS:Malsa) -CXXFLAGS+= -D__LINUX_ALSA__ -LDFLAGS+= -lasound +CXXFLAGS+= -D__LINUX_ALSA__ +LIBS+= -lasound .include "../../audio/alsa-lib/buildlink3.mk" .endif @@ -20,7 +20,7 @@ LDFLAGS+= -lasound ### Support JACK ### .if !empty(PKG_OPTIONS:Mjack) -CXXFLAGS+= -D__UNIX_JACK__ -LDFLAGS+= -ljack +CXXFLAGS+= -D__UNIX_JACK__ +LIBS+= -ljack .include "../../audio/jack/buildlink3.mk" .endif --_----------=_1565221742291980--