Received: by mail.netbsd.org (Postfix, from userid 605) id DE46484ED4; Fri, 19 Aug 2022 12:17:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2386084ECD for ; Fri, 19 Aug 2022 12:17:47 +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 0S_FBFZuoOSc for ; Fri, 19 Aug 2022 12:17:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 70C9384CEA for ; Fri, 19 Aug 2022 12:17:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6E3CAFB1A; Fri, 19 Aug 2022 12:17:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1660911466241870" MIME-Version: 1.0 Date: Fri, 19 Aug 2022 12:17:46 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/audio/nas To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220819121746.6E3CAFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1660911466241870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Fri Aug 19 12:17:46 UTC 2022 Modified Files: pkgsrc/audio/nas: Makefile distinfo pkgsrc/audio/nas/patches: patch-ag Log Message: nas: replicate missing -laudio fix from patch-ag to more places Use a SUBST block instead of a patch since too many Makefiles need fixups. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 pkgsrc/audio/nas/Makefile cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/nas/distinfo cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/nas/patches/patch-ag Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1660911466241870 Content-Disposition: inline Content-Length: 3996 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/nas/Makefile diff -u pkgsrc/audio/nas/Makefile:1.103 pkgsrc/audio/nas/Makefile:1.104 --- pkgsrc/audio/nas/Makefile:1.103 Sun Apr 26 06:35:30 2020 +++ pkgsrc/audio/nas/Makefile Fri Aug 19 12:17:46 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2020/04/26 06:35:30 rillig Exp $ +# $NetBSD: Makefile,v 1.104 2022/08/19 12:17:46 tnn Exp $ DISTNAME= nas-1.9.4.src PKGNAME= ${DISTNAME:S/.src//} @@ -40,6 +40,13 @@ SUBST_STAGE.mungeman= pre-configure SUBST_FILES.mungeman= config/mungeman SUBST_SED.mungeman= -e 's|^ *\#|\#|g' +SUBST_CLASSES+= laudio +SUBST_STAGE.laudio= pre-configure +SUBST_MESSAGE.laudio= fix linking with not-yet-installed libaudio.so +SUBST_FILES.laudio= config/NetAudio.tmpl +SUBST_FILES.laudio+= Makefile */Makefile */*/Makefile */*/*/Makefile +SUBST_SED.laudio= -e 's,-laudio,-L$$(AUSRC) &,g' + REPLACE_SH= clients/audio/util/checkmail PLIST_SRC= ${PKGDIR}/PLIST.clients Index: pkgsrc/audio/nas/distinfo diff -u pkgsrc/audio/nas/distinfo:1.39 pkgsrc/audio/nas/distinfo:1.40 --- pkgsrc/audio/nas/distinfo:1.39 Tue Oct 26 09:59:18 2021 +++ pkgsrc/audio/nas/distinfo Fri Aug 19 12:17:46 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.39 2021/10/26 09:59:18 nia Exp $ +$NetBSD: distinfo,v 1.40 2022/08/19 12:17:46 tnn Exp $ BLAKE2s (nas-1.9.4.src.tar.gz) = 6a7271a2d32e2d7778f10a85213c8e61f35354081562d446902aa3a242e225d6 SHA512 (nas-1.9.4.src.tar.gz) = 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 348c34feb5b5da95ba4d1d SHA1 (patch-ad) = bef3e9fe82487766240931bbbed0213e3fe1c2c3 SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a -SHA1 (patch-ag) = bd7d41acba8c38f133318380155dff30a7d32994 +SHA1 (patch-ag) = bd9f832cb3a32fc75deb61a1eb1f4adddffe852e SHA1 (patch-clients_audio_auconvert_Imakefile) = 423e6123111fdc1c10943b2d73b0214ca037fdaa SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b SHA1 (patch-server_dia_lex.l) = dbfbf4adcad53034d633d59959d08a7464774b85 Index: pkgsrc/audio/nas/patches/patch-ag diff -u pkgsrc/audio/nas/patches/patch-ag:1.9 pkgsrc/audio/nas/patches/patch-ag:1.10 --- pkgsrc/audio/nas/patches/patch-ag:1.9 Sat Mar 24 11:09:41 2018 +++ pkgsrc/audio/nas/patches/patch-ag Fri Aug 19 12:17:46 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.9 2018/03/24 11:09:41 spz Exp $ +$NetBSD: patch-ag,v 1.10 2022/08/19 12:17:46 tnn Exp $ (from cvs log for 1.4) date: 2006/01/11 11:32:38; author: markd; state: Exp; lines: +12 -14 @@ -7,29 +7,8 @@ symlink, so create the actual release.h the depends stage is too late (server/os is before lib/audio). Fixes PR pkg/32098 from Gilles Dauphin. --L$(AUSRC): make sure -laudio gets found when building clients before -the package has been installed - ---- ./config/NetAudio.tmpl.orig 2013-04-27 00:41:00.000000000 +0000 -+++ ./config/NetAudio.tmpl -@@ -178,7 +178,7 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib - /* place #ifdef's for other architectures around these lines */ - LOCAL_LDFLAGS = _AuUse(-L$(USRLIBDIR), -L$(AUSRC) -L$(USRLIBDIR)) - DEPAULIB = -- AULIB = -laudio -+ AULIB = -L$(AUSRC) -laudio - - #endif /* SunArchitecture */ - -@@ -186,7 +186,7 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib - #else /* SharedLibAudio */ - LOCAL_LDFLAGS = - DEPAULIB = _AuUseCat($(USRLIBDIR),$(AUSRC),/Lib(audio)) -- AULIB = LoaderLibPrefix _AuUse(-laudio,$(DEPAULIB)) -+ AULIB = -L$(AUSRC) LoaderLibPrefix _AuUse(-laudio,$(DEPAULIB)) - #endif /* SharedLibAudio */ - - AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB) +--- config/NetAudio.tmpl.orig 2013-04-27 00:41:00.000000000 +0000 ++++ config/NetAudio.tmpl @@ -316,6 +316,8 @@ AuComplexProgramTarget(program) release.h: $(TOP)/RELEASE @@\ @echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@ @@\ --_----------=_1660911466241870--