 @@ -1,26 +1,27 @@
-# $NetBSD: Makefile,v 1.10 2017/09/20 06:47:56 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/09/23 21:09:32 wiz Exp $
-DISTNAME=	rtmpdump-2.4
+DISTNAME=	rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0
-PKGREVISION=	3
+PKGNAME=	${DISTNAME:S/-git-/.0.0./}
 CATEGORIES=	net multimedia
-MASTER_SITES=	http://rtmpdump.mplayerhq.hu/download/
+#MASTER_SITES=
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	http://rtmpdump.mplayerhq.hu/
 COMMENT=	Tools for handling RTMP stream
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 BUILD_DIRS=	. librtmp
 MAKE_ENV+=	XCFLAGS=${CFLAGS:Q}
 MAKE_ENV+=	XLDFLAGS=${LDFLAGS:Q}
 WRKSRC=		${WRKDIR}/rtmpdump
 PKGCONFIG_OVERRIDE+=	librtmp/librtmp.pc.in
 LDFLAGS.SunOS+=	-lnsl -lsocket
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2017/09/20 06:47:56 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/09/23 21:09:32 wiz Exp $
-SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
+SHA1 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 245de43e34fa8cf7c06a3604cd32cfafa981f8c0
-RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
+RMD160 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = c11b59337d7b9dd6c8136cc331ee6ade8ed4bc9e
-SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
+SHA512 (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 05a55c7170fa4e9b132166deddf7ff78f9b02880a22420ffd7af891f95172a293315b323d40bf6e0b891c2b8874dfa678c28b8671b0c09fe33c100dcf7d680b4
-Size (rtmpdump-2.4.tar.gz) = 134558 bytes
+Size (rtmpdump-2.4-git-fa8646daeb19dfd12c181f7d19de708d623704c0.tar.gz) = 1030982 bytes
-SHA1 (patch-Makefile) = 1e1012b62ce372a3512f61aa10e876b22e96996b
+SHA1 (patch-Makefile) = 0001b2c1745f4ee6eae36e780d256ff584631ab9
-SHA1 (patch-librtmp_Makefile) = 0b32ab60020786ecfd42495e357d7845f4415bad
+SHA1 (patch-librtmp_Makefile) = 90a076de219dcf7ba6840913cb6101e007f549cf

 @@ -1,29 +1,42 @@
-$NetBSD: patch-Makefile,v 1.7 2017/09/20 06:47:56 adam Exp $
+$NetBSD: patch-Makefile,v 1.8 2018/09/23 21:09:33 wiz Exp $
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
 Choose gnutls.
---- Makefile.orig	2011-07-12 00:24:33.000000000 +0000
+--- Makefile.orig	2018-09-23 10:40:58.000000000 +0000
 +++ Makefile
 @@ -1,6 +1,6 @@
  VERSION=v2.4
 -prefix=/usr/local
 +prefix=${PREFIX}
  CC=$(CROSS_COMPILE)gcc
  LD=$(CROSS_COMPILE)ld
@@ -8,9 +8,9 @@ LD=$(CROSS_COMPILE)ld
  SYS=posix
  #SYS=mingw
 -CRYPTO=OPENSSL
 +#CRYPTO=OPENSSL
  #CRYPTO=POLARSSL
 -#CRYPTO=GNUTLS
 +CRYPTO=GNUTLS
  LIBZ=-lz
  LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
  LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
 @@ -20,13 +20,12 @@ DEF_=-DNO_CRYPTO
  CRYPTO_DEF=$(DEF_$(CRYPTO))
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
 -OPT=-O2
  CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
  LDFLAGS=-Wall $(XLDFLAGS)
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
 -mandir=$(prefix)/man
 +mandir=$(prefix)/${PKGMANDIR}

 @@ -1,85 +1,100 @@
-$NetBSD: patch-librtmp_Makefile,v 1.5 2017/09/20 06:47:56 adam Exp $
+$NetBSD: patch-librtmp_Makefile,v 1.6 2018/09/23 21:09:33 wiz Exp $
 Use PREFIX and PKGMANDIR.
 Remove OPT.
 Libtoolize
 Choose gnutls.
---- librtmp/Makefile.orig	2011-07-12 00:24:33.000000000 +0000
+--- librtmp/Makefile.orig	2018-09-23 10:40:58.000000000 +0000
 +++ librtmp/Makefile
 @@ -1,11 +1,11 @@
  VERSION=v2.4
 -prefix=/usr/local
 +prefix=${PREFIX}
  incdir=$(prefix)/include/librtmp
  bindir=$(prefix)/bin
  libdir=$(prefix)/lib
 -mandir=$(prefix)/man
 +mandir=$(prefix)/${PKGMANDIR}
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
-@@ -66,30 +66,41 @@ SO_LIB=$(SOLIB_$(SHARED))
+@@ -16,8 +16,8 @@ LD=$(CROSS_COMPILE)ld
  AR=$(CROSS_COMPILE)ar
  SYS=posix
 -CRYPTO=OPENSSL
 -#CRYPTO=GNUTLS
 +#CRYPTO=OPENSSL
 +CRYPTO=GNUTLS
  DEF_POLARSSL=-DUSE_POLARSSL
  DEF_OPENSSL=-DUSE_OPENSSL
  DEF_GNUTLS=-DUSE_GNUTLS
@@ -73,30 +73,42 @@ SO_LIB=$(SOLIB_$(SHARED))
  SO_INST=$(SOINST_$(SHARED))
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
 -OPT=-O2
  CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
  LDFLAGS=$(XLDFLAGS)
  OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
 -all:	librtmp.a $(SO_LIB)
 +all:	librtmp.la
  clean:
- 	rm -f *.o *.a *.$(SOX) *.$(SO_EXT)
+ 	rm -f *.o *.a *.$(SOX) *$(SO_EXT) librtmp.pc
 -librtmp.a: $(OBJS)
 -	$(AR) rs $@ $?
+-
 -librtmp$(SO_EXT): $(OBJS)
 -	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
 +librtmp.la: $(OBJS)
 +	${LIBTOOL} --mode=link --tag=CC \
 +		${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \
 +			${OBJS:.o=.lo} \
 +			-rpath ${PREFIX}/lib
++
- librtmp.$(SO_EXT): $(OBJS)
++librtmp.$(SO_EXT): $(OBJS)
 -	$(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
 +	${LIBTOOL} --mode=link --tag=CC \
 +		${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \
 +		${OBJS:.o=.lo} \
 +		-rpath ${PREFIX}/lib \
 +		-version-info 0:0
  	ln -sf $@ librtmp.$(SOX)
  log.o: log.c log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c
  rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c
  amf.o: amf.c amf.h bytes.h log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c
  hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c
  parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile
 +	${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c
++
  librtmp.pc: librtmp.pc.in Makefile
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
-@@ -97,12 +108,12 @@ librtmp.pc: librtmp.pc.in Makefile
+@@ -105,12 +117,12 @@ librtmp.pc: librtmp.pc.in Makefile
- 		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
+ 		-e "s;@PUBLIC_LIBS@;$(PUBLIC_LIBS);" \
  		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@
 -install:	install_base $(SO_INST)
 +install:	install_base
 -install_base:	librtmp.a librtmp.pc
 +install_base:	librtmp.la librtmp.pc
- 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3
+ 	-mkdir -p $(INCDIR) $(LIBDIR)/pkgconfig $(MANDIR)/man3 $(SODIR)
  	cp amf.h http.h log.h rtmp.h $(INCDIR)
 -	cp librtmp.a $(LIBDIR)
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} librtmp.la $(LIBDIR)
  	cp librtmp.pc $(LIBDIR)/pkgconfig
  	cp librtmp.3 $(MANDIR)/man3

 @@ -1,16 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/09/20 06:47:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/09/23 21:09:32 wiz Exp $
 BUILDLINK_TREE+=	rtmpdump
 .if !defined(RTMPDUMP_BUILDLINK3_MK)
 RTMPDUMP_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.rtmpdump+=	rtmpdump>=2.3
 BUILDLINK_ABI_DEPENDS.rtmpdump+=	rtmpdump>=2.4nb3
 BUILDLINK_PKGSRCDIR.rtmpdump?=		../../net/rtmpdump
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .endif	# RTMPDUMP_BUILDLINK3_MK
 BUILDLINK_TREE+=	-rtmpdump