Wed Feb 28 21:46:52 2018 UTC ()
portaudio: honor LDFLAGS. Fixes RELRO build.

Bump PKGREVISION.


(wiz)
diff -r1.21 -r1.22 pkgsrc/audio/portaudio/Makefile
diff -r1.14 -r1.15 pkgsrc/audio/portaudio/distinfo
diff -r1.8 -r1.9 pkgsrc/audio/portaudio/patches/patch-ac
cvs diff -r1.21 -r1.22 pkgsrc/audio/portaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/Makefile 2013/01/08 16:23:24 1.21
+++ pkgsrc/audio/portaudio/Makefile 2018/02/28 21:46:51 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2013/01/08 16:23:24 gdt Exp $ 1# $NetBSD: Makefile,v 1.22 2018/02/28 21:46:51 wiz Exp $
2 2
3DISTNAME= portaudio_v18_1 3DISTNAME= portaudio_v18_1
4PKGNAME= portaudio-18.1 4PKGNAME= portaudio-18.1
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://www.portaudio.com/archives/ 7MASTER_SITES= http://www.portaudio.com/archives/
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.portaudio.com/ 11HOMEPAGE= http://www.portaudio.com/
12COMMENT= Portable cross-platform Audio API 12COMMENT= Portable cross-platform Audio API
13LICENSE= mit 13LICENSE= mit
14 14
15NOT_FOR_PLATFORM= Interix-*-* 15NOT_FOR_PLATFORM= Interix-*-*
16 16
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.14 -r1.15 pkgsrc/audio/portaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/distinfo 2015/11/03 01:12:46 1.14
+++ pkgsrc/audio/portaudio/distinfo 2018/02/28 21:46:51 1.15
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.14 2015/11/03 01:12:46 agc Exp $ 1$NetBSD: distinfo,v 1.15 2018/02/28 21:46:51 wiz Exp $
2 2
3SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1 3SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
4RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2 4RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2
5SHA512 (portaudio_v18_1.zip) = 991be0640101bb3ec75d8168db81288f66cf876bdd3029317bc29f8711770cf93ec680bb084a3e61a9cb58258b8f08e4e1d9d84e8b7adf10f03a0f7c01dfd306 5SHA512 (portaudio_v18_1.zip) = 991be0640101bb3ec75d8168db81288f66cf876bdd3029317bc29f8711770cf93ec680bb084a3e61a9cb58258b8f08e4e1d9d84e8b7adf10f03a0f7c01dfd306
6Size (portaudio_v18_1.zip) = 550130 bytes 6Size (portaudio_v18_1.zip) = 550130 bytes
7SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56 7SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
8SHA1 (patch-ac) = 08740265e8957d2ce655b54dba40e8d90407f4f6 8SHA1 (patch-ac) = d8a92333a77a3fc7079c55bec939142308569536
9SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a 9SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
10SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59 10SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
11SHA1 (patch-af) = fb0c8c9c78b4726d86281edcc57718952107a7a7 11SHA1 (patch-af) = fb0c8c9c78b4726d86281edcc57718952107a7a7
12SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1 12SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1
cvs diff -r1.8 -r1.9 pkgsrc/audio/portaudio/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/portaudio/patches/Attic/patch-ac 2010/10/12 21:50:49 1.8
+++ pkgsrc/audio/portaudio/patches/Attic/patch-ac 2018/02/28 21:46:52 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.8 2010/10/12 21:50:49 joerg Exp $ 1$NetBSD: patch-ac,v 1.9 2018/02/28 21:46:52 wiz Exp $
2 2
3--- Makefile.in.orig 2003-02-11 14:24:56.000000000 +0000 3--- Makefile.in.orig 2003-02-11 14:24:56.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -5,14 +5,14 @@ 5@@ -5,14 +5,14 @@
6 # 6 #
7  7
8 PREFIX = @prefix@ 8 PREFIX = @prefix@
9-CC = @CC@ 9-CC = @CC@
10+CC = ${LIBTOOL} --mode=compile @CC@ 10+CC = ${LIBTOOL} --mode=compile @CC@
11 CFLAGS = @CFLAGS@ -Ipa_common 11 CFLAGS = @CFLAGS@ -Ipa_common
12-LIBS = @LIBS@ 12-LIBS = @LIBS@
13+LIBS = ${LIBOSSAUDIO} ${RT_LIB_SCHED} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@ 13+LIBS = ${LIBOSSAUDIO} ${RT_LIB_SCHED} -L@prefix@/lib ${COMPILER_RPATH_FLAG}@prefix@/lib @LIBS@
14 AR = @AR@ 14 AR = @AR@
@@ -16,34 +16,34 @@ $NetBSD: patch-ac,v 1.8 2010/10/12 21:50 @@ -16,34 +16,34 @@ $NetBSD: patch-ac,v 1.8 2010/10/12 21:50
16 INSTALL = @INSTALL@ 16 INSTALL = @INSTALL@
17 SHARED_FLAGS = @SHARED_FLAGS@ 17 SHARED_FLAGS = @SHARED_FLAGS@
18-DLL_LIBS = @DLL_LIBS@ 18-DLL_LIBS = @DLL_LIBS@
19+DLL_LIBS = @DLL_LIBS@ ${LIBOSSAUDIO} ${RT_LIB_SCHED} 19+DLL_LIBS = @DLL_LIBS@ ${LIBOSSAUDIO} ${RT_LIB_SCHED}
20  20
21 OTHER_OBJS = @OTHER_OBJS@ 21 OTHER_OBJS = @OTHER_OBJS@
22  22
23@@ -57,20 +57,16 @@ all: lib/$(PALIB) lib/$(PADLLV) tests 23@@ -57,20 +57,16 @@ all: lib/$(PALIB) lib/$(PADLLV) tests
24 tests: bin/ $(TESTS) 24 tests: bin/ $(TESTS)
25  25
26 lib/$(PALIB): lib/ $(OBJS) Makefile $(PAINC) 26 lib/$(PALIB): lib/ $(OBJS) Makefile $(PAINC)
27- $(AR) ruv lib/$(PALIB) $(OBJS) 27- $(AR) ruv lib/$(PALIB) $(OBJS)
28- $(RANLIB) lib/$(PALIB) 28- $(RANLIB) lib/$(PALIB)
29+ ${LIBTOOL} --mode=link @CC@ -o lib/${PALIB:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:18:0 $(DLL_LIBS) 29+ ${LIBTOOL} --mode=link @CC@ -o lib/${PALIB:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:18:0 $(LDFLAGS) $(DLL_LIBS)
30  30
31 lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC) 31 lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
32- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS) 32- $(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
33  33
34 $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c 34 $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
35- $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS) 35- $(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
36+ ${LIBTOOL} --mode=link @CC@ -o $@ $(CFLAGS) pa_tests/$*.c lib/${PALIB:.a=.la} $(LIBS) 36+ ${LIBTOOL} --mode=link @CC@ -o $@ $(LDFLAGS) $(CFLAGS) pa_tests/$*.c lib/${PALIB:.a=.la} $(LIBS)
37  37
38 install: lib/$(PALIB) lib/$(PADLLV) 38 install: lib/$(PALIB) lib/$(PADLLV)
39- $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV) 39- $(INSTALL) -m 644 lib/$(PADLLV) $(PREFIX)/lib/$(PADLLV)
40- $(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB) 40- $(INSTALL) -m 644 lib/$(PALIB) $(PREFIX)/lib/$(PALIB)
41- cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL) 41- cd $(PREFIX)/lib && rm -f $(PADLL) && ln -s $(PADLLV) $(PADLL)
42- $(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h 42- $(INSTALL) -m 644 pa_common/portaudio.h $(PREFIX)/include/portaudio.h
43+ ${LIBTOOL} --mode=install $(INSTALL) -m 644 lib/${PALIB:.a=.la} $(DESTDIR)$(PREFIX)/lib/ 43+ ${LIBTOOL} --mode=install $(INSTALL) -m 644 lib/${PALIB:.a=.la} $(DESTDIR)$(PREFIX)/lib/
44+ $(INSTALL) -m 644 pa_common/portaudio.h $(DESTDIR)$(PREFIX)/include/portaudio.h 44+ $(INSTALL) -m 644 pa_common/portaudio.h $(DESTDIR)$(PREFIX)/include/portaudio.h
45 @echo "" 45 @echo ""
46 @echo "------------------------------------------------------------" 46 @echo "------------------------------------------------------------"
47 @echo "PortAudio was successfully installed." 47 @echo "PortAudio was successfully installed."
48@@ -89,8 +86,8 @@ clean: 48@@ -89,8 +86,8 @@ clean:
49 %.o: %.c Makefile $(PAINC) 49 %.o: %.c Makefile $(PAINC)