Wed Sep 20 06:47:56 2017 UTC ()
rtmpdump: clean-up

Clean-up:
Removed double USE_LIBTOOL=yes.
Pass external CFLAGS and LDFLAGS.
Put PREFIX in patches, removing SUBST.
Do not override optimisation with OPT=-O2.


(adam)
diff -r1.9 -r1.10 pkgsrc/net/rtmpdump/Makefile
diff -r1.4 -r1.5 pkgsrc/net/rtmpdump/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/net/rtmpdump/distinfo
diff -r1.6 -r1.7 pkgsrc/net/rtmpdump/patches/patch-Makefile
diff -r1.4 -r1.5 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile
cvs diff -r1.9 -r1.10 pkgsrc/net/rtmpdump/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/Makefile 2016/03/05 11:27:53 1.9
+++ pkgsrc/net/rtmpdump/Makefile 2017/09/20 06:47:56 1.10
@@ -1,34 +1,26 @@ @@ -1,34 +1,26 @@
1# $NetBSD: Makefile,v 1.9 2016/03/05 11:27:53 jperkin Exp $ 1# $NetBSD: Makefile,v 1.10 2017/09/20 06:47:56 adam Exp $
2# 
3 2
4DISTNAME= rtmpdump-2.4 3DISTNAME= rtmpdump-2.4
5PKGREVISION= 3 4PKGREVISION= 3
6CATEGORIES= net multimedia 5CATEGORIES= net multimedia
7MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/ 6MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/
8 7
9MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://rtmpdump.mplayerhq.hu/ 9HOMEPAGE= http://rtmpdump.mplayerhq.hu/
11COMMENT= Tools for handling RTMP stream 10COMMENT= Tools for handling RTMP stream
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
13 12
14USE_LIBTOOL= yes 13USE_LIBTOOL= yes
15 
16USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
17USE_LIBTOOL= yes 
18BUILD_DIRS= . librtmp 15BUILD_DIRS= . librtmp
 16MAKE_ENV+= XCFLAGS=${CFLAGS:Q}
 17MAKE_ENV+= XLDFLAGS=${LDFLAGS:Q}
19 18
20WRKSRC= ${WRKDIR}/rtmpdump 19WRKSRC= ${WRKDIR}/rtmpdump
21PKGCONFIG_OVERRIDE+= librtmp/librtmp.pc.in 20PKGCONFIG_OVERRIDE+= librtmp/librtmp.pc.in
22 21
23LDFLAGS.SunOS+= -lnsl -lsocket 22LDFLAGS.SunOS+= -lnsl -lsocket
24 23
25SUBST_CLASSES+= fix-paths 
26SUBST_STAGE.fix-paths= pre-configure 
27SUBST_MESSAGE.fix-paths= Fixing absolute paths. 
28SUBST_FILES.fix-paths= Makefile 
29SUBST_FILES.fix-paths+= librtmp/Makefile 
30SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g' 
31 
32.include "../../security/openssl/buildlink3.mk" 24.include "../../security/openssl/buildlink3.mk"
33.include "../../devel/zlib/buildlink3.mk" 25.include "../../devel/zlib/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/net/rtmpdump/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/buildlink3.mk 2016/03/05 11:27:53 1.4
+++ pkgsrc/net/rtmpdump/buildlink3.mk 2017/09/20 06:47:56 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:53 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2017/09/20 06:47:56 adam Exp $
2 2
3BUILDLINK_TREE+= rtmpdump 3BUILDLINK_TREE+= rtmpdump
4 4
5.if !defined(RTMPDUMP_BUILDLINK3_MK) 5.if !defined(RTMPDUMP_BUILDLINK3_MK)
6RTMPDUMP_BUILDLINK3_MK:= 6RTMPDUMP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.rtmpdump+= rtmpdump>=2.3 8BUILDLINK_API_DEPENDS.rtmpdump+= rtmpdump>=2.3
9BUILDLINK_ABI_DEPENDS.rtmpdump?= rtmpdump>=2.4nb3 9BUILDLINK_ABI_DEPENDS.rtmpdump+= rtmpdump>=2.4nb3
10BUILDLINK_PKGSRCDIR.rtmpdump?= ../../net/rtmpdump 10BUILDLINK_PKGSRCDIR.rtmpdump?= ../../net/rtmpdump
11 11
12.include "../../security/openssl/buildlink3.mk" 12.include "../../security/openssl/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 13.include "../../devel/zlib/buildlink3.mk"
14.endif # RTMPDUMP_BUILDLINK3_MK 14.endif # RTMPDUMP_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -rtmpdump 16BUILDLINK_TREE+= -rtmpdump
cvs diff -r1.8 -r1.9 pkgsrc/net/rtmpdump/distinfo (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/distinfo 2017/09/12 05:54:10 1.8
+++ pkgsrc/net/rtmpdump/distinfo 2017/09/20 06:47:56 1.9
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.8 2017/09/12 05:54:10 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2017/09/20 06:47:56 adam 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) = db528f2b97bf7f4500cce26c34e5b3929019fd9a 7SHA1 (patch-Makefile) = 1e1012b62ce372a3512f61aa10e876b22e96996b
8SHA1 (patch-librtmp_Makefile) = a44cd464e56230a76143f0d5130190c0cc7dc7a9 8SHA1 (patch-librtmp_Makefile) = 0b32ab60020786ecfd42495e357d7845f4415bad
cvs diff -r1.6 -r1.7 pkgsrc/net/rtmpdump/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/patches/patch-Makefile 2017/09/12 05:54:10 1.6
+++ pkgsrc/net/rtmpdump/patches/patch-Makefile 2017/09/20 06:47:56 1.7
@@ -1,59 +1,69 @@ @@ -1,59 +1,69 @@
1$NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $ 1$NetBSD: patch-Makefile,v 1.7 2017/09/20 06:47:56 adam Exp $
2 2
3* Pass LDFLAGS to linker 3Use PREFIX and PKGMANDIR.
4* Libtoolize 4Remove OPT.
 5Libtoolize
5 6
6--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000 7--- Makefile.orig 2011-07-12 00:24:33.000000000 +0000
7+++ Makefile 8+++ Makefile
8@@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) 9@@ -1,6 +1,6 @@
 10 VERSION=v2.4
 11
 12-prefix=/usr/local
 13+prefix=${PREFIX}
 14
 15 CC=$(CROSS_COMPILE)gcc
 16 LD=$(CROSS_COMPILE)ld
 17@@ -20,13 +20,12 @@ DEF_=-DNO_CRYPTO
 18 CRYPTO_DEF=$(DEF_$(CRYPTO))
 19
9 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) 20 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
10 OPT=-O2 21-OPT=-O2
11 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) 22 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
12-LDFLAGS=-Wall $(XLDFLAGS) 23 LDFLAGS=-Wall $(XLDFLAGS)
13+LDFLAGS+=-Wall $(XLDFLAGS) 
14  24
15 bindir=$(prefix)/bin 25 bindir=$(prefix)/bin
16 sbindir=$(prefix)/sbin 26 sbindir=$(prefix)/sbin
17-mandir=$(prefix)/man 27-mandir=$(prefix)/man
18+mandir=$(prefix)/${PKGMANDIR} 28+mandir=$(prefix)/${PKGMANDIR}
19  29
20 BINDIR=$(DESTDIR)$(bindir) 30 BINDIR=$(DESTDIR)$(bindir)
21 SBINDIR=$(DESTDIR)$(sbindir) 31 SBINDIR=$(DESTDIR)$(sbindir)
22@@ -44,7 +44,7 @@ THREADLIB_mingw= 32@@ -44,7 +43,7 @@ THREADLIB_mingw=
23 THREADLIB=$(THREADLIB_$(SYS)) 33 THREADLIB=$(THREADLIB_$(SYS))
24 SLIBS=$(THREADLIB) $(LIBS) 34 SLIBS=$(THREADLIB) $(LIBS)
25  35
26-LIBRTMP=librtmp/librtmp.a 36-LIBRTMP=librtmp/librtmp.a
27+LIBRTMP=librtmp/librtmp.la 37+LIBRTMP=librtmp/librtmp.la
28 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h 38 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
29  39
30 EXT_posix= 40 EXT_posix=
31@@ -60,11 +60,11 @@ $(PROGS): $(LIBRTMP) 41@@ -60,11 +59,11 @@ $(PROGS): $(LIBRTMP)
32  42
33 install: $(PROGS) 43 install: $(PROGS)
34 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 44 -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
35- cp rtmpdump$(EXT) $(BINDIR) 45- cp rtmpdump$(EXT) $(BINDIR)
36- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) 46- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
37+ cd librtmp; $(MAKE) install $(MAKEFLAGS) 47+ cd librtmp; $(MAKE) install $(MAKEFLAGS)
38+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR) 48+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR)
39+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) 49+ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
40 cp rtmpdump.1 $(MANDIR)/man1 50 cp rtmpdump.1 $(MANDIR)/man1
41 cp rtmpgw.8 $(MANDIR)/man8 51 cp rtmpgw.8 $(MANDIR)/man8
42- @cd librtmp; $(MAKE) install 52- @cd librtmp; $(MAKE) install
43  53
44 clean: 54 clean:
45 rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) 55 rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
46@@ -76,19 +76,16 @@ $(LIBRTMP): FORCE 56@@ -76,19 +75,16 @@ $(LIBRTMP): FORCE
47 @cd librtmp; $(MAKE) all 57 @cd librtmp; $(MAKE) all
48  58
49 rtmpdump: rtmpdump.o 59 rtmpdump: rtmpdump.o
50- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) 60- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
51+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) 61+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
52  62
53 rtmpsrv: rtmpsrv.o thread.o 63 rtmpsrv: rtmpsrv.o thread.o
54- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) 64- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
55+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) 65+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
56  66
57 rtmpsuck: rtmpsuck.o thread.o 67 rtmpsuck: rtmpsuck.o thread.o
58- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) 68- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
59+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) 69+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
cvs diff -r1.4 -r1.5 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile (expand / switch to unified diff)

--- pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile 2017/07/13 13:19:59 1.4
+++ pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile 2017/09/20 06:47:56 1.5
@@ -1,38 +1,42 @@ @@ -1,38 +1,42 @@
1$NetBSD: patch-librtmp_Makefile,v 1.4 2017/07/13 13:19:59 wiz Exp $ 1$NetBSD: patch-librtmp_Makefile,v 1.5 2017/09/20 06:47:56 adam Exp $
2 2
 3Use PREFIX and PKGMANDIR.
 4Remove OPT.
3Libtoolize 5Libtoolize
4 6
5--- librtmp/Makefile.orig 2011-07-12 00:24:33.000000000 +0000 7--- librtmp/Makefile.orig 2011-07-12 00:24:33.000000000 +0000
6+++ librtmp/Makefile 8+++ librtmp/Makefile
7@@ -1,11 +1,11 @@ 9@@ -1,11 +1,11 @@
8 VERSION=v2.4 10 VERSION=v2.4
9  11
10 prefix=/usr/local 12-prefix=/usr/local
 13+prefix=${PREFIX}
11  14
12 incdir=$(prefix)/include/librtmp 15 incdir=$(prefix)/include/librtmp
13 bindir=$(prefix)/bin 16 bindir=$(prefix)/bin
14 libdir=$(prefix)/lib 17 libdir=$(prefix)/lib
15-mandir=$(prefix)/man 18-mandir=$(prefix)/man
16+mandir=$(prefix)/${PKGMANDIR} 19+mandir=$(prefix)/${PKGMANDIR}
17 BINDIR=$(DESTDIR)$(bindir) 20 BINDIR=$(DESTDIR)$(bindir)
18 INCDIR=$(DESTDIR)$(incdir) 21 INCDIR=$(DESTDIR)$(incdir)
19 LIBDIR=$(DESTDIR)$(libdir) 22 LIBDIR=$(DESTDIR)$(libdir)
20@@ -68,28 +68,40 @@ SO_INST=$(SOINST_$(SHARED)) 23@@ -66,30 +66,41 @@ SO_LIB=$(SOLIB_$(SHARED))
 24 SO_INST=$(SOINST_$(SHARED))
 25
21 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) 26 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
22 OPT=-O2 27-OPT=-O2
23 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) 28 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
24-LDFLAGS=$(XLDFLAGS) 29 LDFLAGS=$(XLDFLAGS)
25+LDFLAGS+=$(XLDFLAGS) 
26  30
27  31
28 OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o 32 OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
29  33
30-all: librtmp.a $(SO_LIB) 34-all: librtmp.a $(SO_LIB)
31+all: librtmp.la 35+all: librtmp.la
32  36
33 clean: 37 clean:
34 rm -f *.o *.a *.$(SOX) *.$(SO_EXT) 38 rm -f *.o *.a *.$(SOX) *.$(SO_EXT)
35  39
36-librtmp.a: $(OBJS) 40-librtmp.a: $(OBJS)
37- $(AR) rs $@ $? 41- $(AR) rs $@ $?
38+librtmp.la: $(OBJS) 42+librtmp.la: $(OBJS)
@@ -53,27 +57,27 @@ Libtoolize @@ -53,27 +57,27 @@ Libtoolize
53 log.o: log.c log.h Makefile 57 log.o: log.c log.h Makefile
54+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c 58+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c
55 rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile 59 rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
56+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c 60+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c
57 amf.o: amf.c amf.h bytes.h log.h Makefile 61 amf.o: amf.c amf.h bytes.h log.h Makefile
58+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c 62+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c
59 hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile 63 hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile
60+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c 64+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c
61 parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile 65 parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile
62+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c 66+ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c
63  67
64 librtmp.pc: librtmp.pc.in Makefile 68 librtmp.pc: librtmp.pc.in Makefile
65 sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \ 69 sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
66@@ -97,12 +109,12 @@ librtmp.pc: librtmp.pc.in Makefile 70@@ -97,12 +108,12 @@ librtmp.pc: librtmp.pc.in Makefile
67 -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \ 71 -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
68 -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@ 72 -e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
69  73
70-install: install_base $(SO_INST) 74-install: install_base $(SO_INST)
71+install: install_base 75+install: install_base
72  76
73-install_base: librtmp.a librtmp.pc 77-install_base: librtmp.a librtmp.pc
74+install_base: librtmp.la librtmp.pc 78+install_base: librtmp.la librtmp.pc
75 -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 79 -mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
76 cp amf.h http.h log.h rtmp.h $(INCDIR) 80 cp amf.h http.h log.h rtmp.h $(INCDIR)
77- cp librtmp.a $(LIBDIR) 81- cp librtmp.a $(LIBDIR)
78+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} librtmp.la $(LIBDIR) 82+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} librtmp.la $(LIBDIR)
79 cp librtmp.pc $(LIBDIR)/pkgconfig 83 cp librtmp.pc $(LIBDIR)/pkgconfig