Thu Jul 13 12:04:37 2017 UTC ()
Honor LDFLAGS. Fixes RELRO build.


(wiz)
diff -r1.20 -r1.21 pkgsrc/audio/ocp/Makefile
diff -r1.8 -r1.9 pkgsrc/audio/ocp/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/patches/patch-ad
cvs diff -r1.20 -r1.21 pkgsrc/audio/ocp/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/ocp/Makefile 2016/03/03 19:35:13 1.20
+++ pkgsrc/audio/ocp/Makefile 2017/07/13 12:04:37 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2016/03/03 19:35:13 shattered Exp $ 1# $NetBSD: Makefile,v 1.21 2017/07/13 12:04:37 wiz Exp $
2 2
3DISTNAME= ocp-0.1.21 3DISTNAME= ocp-0.1.21
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencubicplayer/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencubicplayer/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= shattered@NetBSD.org 9MAINTAINER= shattered@NetBSD.org
10HOMEPAGE= http://sourceforge.net/p/opencubicplayer/ 10HOMEPAGE= http://sourceforge.net/p/opencubicplayer/
11COMMENT= Open Cubic Player 11COMMENT= Open Cubic Player
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
@@ -23,24 +23,30 @@ REPLACE_SH= ocp-curses ocp-sdl ocp-vcsa @@ -23,24 +23,30 @@ REPLACE_SH= ocp-curses ocp-sdl ocp-vcsa
23# ymtype.so wants to link -llzh before it's finished building 23# ymtype.so wants to link -llzh before it's finished building
24MAKE_JOBS_SAFE= no 24MAKE_JOBS_SAFE= no
25 25
26CONFIGURE_ARGS+= --exec-prefix=${PREFIX} 26CONFIGURE_ARGS+= --exec-prefix=${PREFIX}
27CONFIGURE_ARGS+= --infodir=${PREFIX}/info 27CONFIGURE_ARGS+= --infodir=${PREFIX}/info
28 28
29CFLAGS.SunOS+= -mimpure-text 29CFLAGS.SunOS+= -mimpure-text
30CFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS 30CFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS
31CFLAGS.SunOS+= -DSOUND_PCM_WRITE_BITS=SNDCTL_DSP_SETFMT 31CFLAGS.SunOS+= -DSOUND_PCM_WRITE_BITS=SNDCTL_DSP_SETFMT
32CFLAGS.SunOS+= -DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED 32CFLAGS.SunOS+= -DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED
33 33
34PLIST_VARS+= sdl x11 desktop 34PLIST_VARS+= sdl x11 desktop
35 35
 36SUBST_CLASSES+= ldflags
 37SUBST_SED.ldflags+= -e 's/$$(SHARED_FLAGS)/$$(LDFLAGS) $$(SHARED_FLAGS)/g'
 38SUBST_FILES.ldflags+= */Makefile
 39SUBST_MESSAGE.ldflags= Honoring LDFLAGS.
 40SUBST_STAGE.ldflags= pre-build
 41
36.include "options.mk" 42.include "options.mk"
37 43
38.include "../../audio/libid3tag/buildlink3.mk" 44.include "../../audio/libid3tag/buildlink3.mk"
39.include "../../audio/libmad/buildlink3.mk" 45.include "../../audio/libmad/buildlink3.mk"
40.include "../../audio/libvorbis/buildlink3.mk" 46.include "../../audio/libvorbis/buildlink3.mk"
41.include "../../converters/libiconv/buildlink3.mk" 47.include "../../converters/libiconv/buildlink3.mk"
42.include "../../devel/ncurses/buildlink3.mk" 48.include "../../devel/ncurses/buildlink3.mk"
43.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
44.include "../../multimedia/libogg/buildlink3.mk" 50.include "../../multimedia/libogg/buildlink3.mk"
45.include "../../mk/oss.buildlink3.mk" 51.include "../../mk/oss.buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/audio/ocp/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/ocp/distinfo 2016/04/12 06:33:42 1.8
+++ pkgsrc/audio/ocp/distinfo 2017/07/13 12:04:37 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.8 2016/04/12 06:33:42 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2017/07/13 12:04:37 wiz Exp $
2 2
3SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380 3SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380
4RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f 4RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f
5SHA512 (ocp-0.1.21.tar.bz2) = fec0123b61163780d8133939df2a0219c98b533a7a6eb477ee1029eff7b2f3782969e792f6a767d3ff99c809cc2cf8dc0b8518f0e91f96015279c20115507269 5SHA512 (ocp-0.1.21.tar.bz2) = fec0123b61163780d8133939df2a0219c98b533a7a6eb477ee1029eff7b2f3782969e792f6a767d3ff99c809cc2cf8dc0b8518f0e91f96015279c20115507269
6Size (ocp-0.1.21.tar.bz2) = 781805 bytes 6Size (ocp-0.1.21.tar.bz2) = 781805 bytes
7SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429 7SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429
8SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6 8SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
9SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46 9SHA1 (patch-ad) = 5252050662343fa2575d84e883f8d157b4a2de0e
10SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65 10SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
11SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9 11SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
12SHA1 (patch-configure) = 521884c80ef507149afa75841a62c35a42739377 12SHA1 (patch-configure) = 521884c80ef507149afa75841a62c35a42739377
13SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4 13SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4
14SHA1 (patch-playym_ympplay.cpp) = d0d5fd0126e30f5036f0267d17ae3524c9afcb34 14SHA1 (patch-playym_ympplay.cpp) = d0d5fd0126e30f5036f0267d17ae3524c9afcb34
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/audio/ocp/patches/patch-ad 2009/08/16 15:52:11 1.1.1.1
+++ pkgsrc/audio/ocp/patches/patch-ad 2017/07/13 12:04:37 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $ 1$NetBSD: patch-ad,v 1.2 2017/07/13 12:04:37 wiz Exp $
2 2
3--- devs/Makefile.orig 2008-01-14 18:48:59.000000000 +0000 3--- devs/Makefile.orig 2008-01-14 18:48:59.000000000 +0000
4+++ devs/Makefile 4+++ devs/Makefile
5@@ -14,7 +14,7 @@ devsnone$(LIB_SUFFIX): $(devsnone_so) 5@@ -14,7 +14,7 @@ devsnone$(LIB_SUFFIX): $(devsnone_so)
6  6
7 devsoss_so=devsoss.o 7 devsoss_so=devsoss.o
8 devsoss$(LIB_SUFFIX): $(devsoss_so) 8 devsoss$(LIB_SUFFIX): $(devsoss_so)
9- $(CC) $(SHARED_FLAGS) $(OSS_LIBS) -o $@ $^ 9- $(CC) $(SHARED_FLAGS) $(OSS_LIBS) -o $@ $^
10+ $(CC) $(SHARED_FLAGS) $(LIBOSSAUDIO) -o $@ $^ 10+ $(CC) $(SHARED_FLAGS) $(LDFLAGS) $(LIBOSSAUDIO) -o $@ $^
11  11
12 clean: 12 clean:
13 rm -f *.o *$(LIB_SUFFIX) 13 rm -f *.o *$(LIB_SUFFIX)