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 (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 (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,79 +1,71 @@ @@ -1,79 +1,71 @@
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)
29 SBINDIR=$(DESTDIR)$(sbindir) 21 SBINDIR=$(DESTDIR)$(sbindir)
30@@ -44,7 +44,7 @@ THREADLIB_mingw= 22@@ -44,7 +44,7 @@ THREADLIB_mingw=
31 THREADLIB=$(THREADLIB_$(SYS)) 23 THREADLIB=$(THREADLIB_$(SYS))
32 SLIBS=$(THREADLIB) $(LIBS) 24 SLIBS=$(THREADLIB) $(LIBS)
33  25
34-LIBRTMP=librtmp/librtmp.a 26-LIBRTMP=librtmp/librtmp.a
35+LIBRTMP=librtmp/librtmp.la 27+LIBRTMP=librtmp/librtmp.la
36 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h 28 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
37  29
38 EXT_posix= 30 EXT_posix=
39@@ -60,11 +60,11 @@ $(PROGS): $(LIBRTMP) 31@@ -60,11 +60,11 @@ $(PROGS): $(LIBRTMP)
40  32
41 install: $(PROGS) 33 install: $(PROGS)
42 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 34 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
43- cp rtmpdump$(EXT) $(BINDIR) 35- cp rtmpdump$(EXT) $(BINDIR)
44- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) 36- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
45+ cd librtmp; $(MAKE) install $(MAKEFLAGS) 37+ cd librtmp; $(MAKE) install $(MAKEFLAGS)
46+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR) 38+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR)
47+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) 39+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
48 cp rtmpdump.1 $(MANDIR)/man1 40 cp rtmpdump.1 $(MANDIR)/man1
49 cp rtmpgw.8 $(MANDIR)/man8 41 cp rtmpgw.8 $(MANDIR)/man8
50- @cd librtmp; $(MAKE) install 42- @cd librtmp; $(MAKE) install
51  43
52 clean: 44 clean:
53 rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) 45 rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
54@@ -76,19 +76,16 @@ $(LIBRTMP): FORCE 46@@ -76,19 +76,16 @@ $(LIBRTMP): FORCE
55 @cd librtmp; $(MAKE) all 47 @cd librtmp; $(MAKE) all
56  48
57 rtmpdump: rtmpdump.o 49 rtmpdump: rtmpdump.o
58- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) 50- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
59+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) 51+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
60  52
61 rtmpsrv: rtmpsrv.o thread.o 53 rtmpsrv: rtmpsrv.o thread.o
62- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) 54- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
63+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) 55+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
64  56
65 rtmpsuck: rtmpsuck.o thread.o 57 rtmpsuck: rtmpsuck.o thread.o
66- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) 58- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
67+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) 59+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
68  60
69 rtmpgw: rtmpgw.o thread.o 61 rtmpgw: rtmpgw.o thread.o
70- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) 62- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
71+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) 63+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
72  64
73-rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile 65-rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
74-rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile 66-rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
75-rtmpsrv.o: rtmpsrv.c $(INCRTMP) Makefile 67-rtmpsrv.o: rtmpsrv.c $(INCRTMP) Makefile
76-rtmpsuck.o: rtmpsuck.c $(INCRTMP) Makefile 68-rtmpsuck.o: rtmpsuck.c $(INCRTMP) Makefile
77-thread.o: thread.c thread.h 69-thread.o: thread.c thread.h
78+%.lo: %.c 70+%.lo: %.c
79+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 71+ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $<