Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1499947477258280"
MIME-Version: 1.0
Date: Thu, 13 Jul 2017 12:04:37 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/audio/ocp
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20170713120437.68930FACB@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1499947477258280
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Jul 13 12:04:37 UTC 2017

Modified Files:
	pkgsrc/audio/ocp: Makefile distinfo
	pkgsrc/audio/ocp/patches: patch-ad

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/ocp/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/ocp/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/patches/patch-ad

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


--_----------=_1499947477258280
Content-Disposition: inline
Content-Length: 2596
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/ocp/Makefile
diff -u pkgsrc/audio/ocp/Makefile:1.20 pkgsrc/audio/ocp/Makefile:1.21
--- pkgsrc/audio/ocp/Makefile:1.20	Thu Mar  3 19:35:13 2016
+++ pkgsrc/audio/ocp/Makefile	Thu Jul 13 12:04:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/03/03 19:35:13 shattered Exp $
+# $NetBSD: Makefile,v 1.21 2017/07/13 12:04:37 wiz Exp $
 
 DISTNAME=		ocp-0.1.21
 PKGREVISION=		7
@@ -33,6 +33,12 @@ CFLAGS.SunOS+=		-DSOUND_PCM_WRITE_RATE=S
 
 PLIST_VARS+=		sdl x11 desktop
 
+SUBST_CLASSES+=		ldflags
+SUBST_SED.ldflags+=	-e 's/$$(SHARED_FLAGS)/$$(LDFLAGS) $$(SHARED_FLAGS)/g'
+SUBST_FILES.ldflags+=	*/Makefile
+SUBST_MESSAGE.ldflags=	Honoring LDFLAGS.
+SUBST_STAGE.ldflags=	pre-build
+
 .include "options.mk"
 
 .include "../../audio/libid3tag/buildlink3.mk"

Index: pkgsrc/audio/ocp/distinfo
diff -u pkgsrc/audio/ocp/distinfo:1.8 pkgsrc/audio/ocp/distinfo:1.9
--- pkgsrc/audio/ocp/distinfo:1.8	Tue Apr 12 06:33:42 2016
+++ pkgsrc/audio/ocp/distinfo	Thu Jul 13 12:04:37 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/04/12 06:33:42 wiz Exp $
+$NetBSD: distinfo,v 1.9 2017/07/13 12:04:37 wiz Exp $
 
 SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380
 RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f
@@ -6,7 +6,7 @@ SHA512 (ocp-0.1.21.tar.bz2) = fec0123b61
 Size (ocp-0.1.21.tar.bz2) = 781805 bytes
 SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429
 SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
-SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46
+SHA1 (patch-ad) = 5252050662343fa2575d84e883f8d157b4a2de0e
 SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
 SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
 SHA1 (patch-configure) = 521884c80ef507149afa75841a62c35a42739377

Index: pkgsrc/audio/ocp/patches/patch-ad
diff -u pkgsrc/audio/ocp/patches/patch-ad:1.1.1.1 pkgsrc/audio/ocp/patches/patch-ad:1.2
--- pkgsrc/audio/ocp/patches/patch-ad:1.1.1.1	Sun Aug 16 15:52:11 2009
+++ pkgsrc/audio/ocp/patches/patch-ad	Thu Jul 13 12:04:37 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2017/07/13 12:04:37 wiz Exp $
 
 --- devs/Makefile.orig	2008-01-14 18:48:59.000000000 +0000
 +++ devs/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/08/16 1
  devsoss_so=devsoss.o
  devsoss$(LIB_SUFFIX): $(devsoss_so)
 -	$(CC) $(SHARED_FLAGS) $(OSS_LIBS) -o $@ $^
-+	$(CC) $(SHARED_FLAGS) $(LIBOSSAUDIO) -o $@ $^
++	$(CC) $(SHARED_FLAGS) $(LDFLAGS) $(LIBOSSAUDIO) -o $@ $^
  
  clean:
  	rm -f *.o *$(LIB_SUFFIX)


--_----------=_1499947477258280--