Tue Sep 12 05:54:11 2017 UTC ()
rtmpdump: do not hardcode /usr/pkg

Fixes PR 52537 by John Klos.


(wiz)
diff -r1.7 -r1.8 pkgsrc/net/rtmpdump/distinfo
diff -r1.5 -r1.6 pkgsrc/net/rtmpdump/patches/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/net/rtmpdump/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/distinfo 2017/07/13 13:19:59 1.7
+++ pkgsrc/net/rtmpdump/distinfo 2017/09/12 05:54:10 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2017/07/13 13:19:59 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2017/09/12 05:54:10 wiz Exp $
2 2
3SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac 3SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
4RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff 4RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
5SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609 5SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
6Size (rtmpdump-2.4.tar.gz) = 134558 bytes 6Size (rtmpdump-2.4.tar.gz) = 134558 bytes
7SHA1 (patch-Makefile) = 21c888a0b864d692595fb8a4a60c1bef3e2fca0c 7SHA1 (patch-Makefile) = db528f2b97bf7f4500cce26c34e5b3929019fd9a
8SHA1 (patch-librtmp_Makefile) = a44cd464e56230a76143f0d5130190c0cc7dc7a9 8SHA1 (patch-librtmp_Makefile) = a44cd464e56230a76143f0d5130190c0cc7dc7a9
cvs diff -r1.5 -r1.6 pkgsrc/net/rtmpdump/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/patches/patch-Makefile 2017/07/13 13:19:59 1.5
+++ pkgsrc/net/rtmpdump/patches/patch-Makefile 2017/09/12 05:54:10 1.6
@@ -1,28 +1,20 @@ @@ -1,28 +1,20 @@
1$NetBSD: patch-Makefile,v 1.5 2017/07/13 13:19:59 wiz Exp $ 1$NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $
2 2
3* Pass LDFLAGS to linker 3* Pass LDFLAGS to linker
4* Libtoolize 4* Libtoolize
5 5
6--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000 6--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000
7+++ Makefile 7+++ Makefile
8@@ -1,6 +1,6 @@ 
9 VERSION=v2.4 
10  
11-prefix=/usr/local 
12+prefix=/usr/pkg 
13  
14 CC=$(CROSS_COMPILE)gcc 
15 LD=$(CROSS_COMPILE)ld 
16@@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) 8@@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
17 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) 9 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
18 OPT=-O2 10 OPT=-O2
19 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) 11 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
20-LDFLAGS=-Wall $(XLDFLAGS) 12-LDFLAGS=-Wall $(XLDFLAGS)
21+LDFLAGS+=-Wall $(XLDFLAGS) 13+LDFLAGS+=-Wall $(XLDFLAGS)
22  14
23 bindir=$(prefix)/bin 15 bindir=$(prefix)/bin
24 sbindir=$(prefix)/sbin 16 sbindir=$(prefix)/sbin
25-mandir=$(prefix)/man 17-mandir=$(prefix)/man
26+mandir=$(prefix)/${PKGMANDIR} 18+mandir=$(prefix)/${PKGMANDIR}
27  19
28 BINDIR=$(DESTDIR)$(bindir) 20 BINDIR=$(DESTDIR)$(bindir)