Merge branch '3.4' into 3.5

rtmpdump/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wKUrPfjOmAx++Mhd8bIuPKfb8+dMySskPQUiVp5aR6VCQtE6K9SSZVRgijxVOJUKYCEwyl8VCGs4xXSYxavdw0=
-SHA256 (Pkgfile) = bcd7534fa5e10be7e1b4d1a7ba4b69924e8855056bccb56714c25f9f1624c165
+RWSagIOpLGJF3yQ1+dWUVxI4HcBaKLRQ/vnXtXOF85DyjZN4MCqyp1JgCAP8JqsqeKqlxXxD/Pd65x1Mf0GhAMVmZuz8iQAvdwg=
+SHA256 (Pkgfile) = babfd16c945c935f6227907a80c4d969a0b61e380a7e67d10ab3ad5c17c71a49
 SHA256 (.footprint) = 18a78fe5a351a9baf2d0f144b99c2d06c7b8368d7dd9fe1e2a41300bbf4dad63
 SHA256 (rtmpdump-2.4-c5f04a58.tar.xz) = 14d2f9096998527b7d2d9462c720f8bc3f7d2166ef611a3a4d5da14b2518bbf6

rtmpdump/Pkgfile

@@ -1,21 +1,26 @@
 # Description: A tool to download rtmp streams.
 # URL: http://rtmpdump.mplayerhq.hu/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: zlib openssl
+# Depends on: zlib gnutls
 
 name=rtmpdump
 version=2.4
-release=2
+release=3
 source=(http://crux.ster.zone/downloads/$name/$name-$version-c5f04a58.tar.xz)
 
 build() {
 	cd $name
 
-	sed -i \
+	sed \
+		-e 's/^CRYPTO=OPENSSL/#CRYPTO=OPENSSL/' \
+		-e 's/#CRYPTO=GNUTLS/CRYPTO=GNUTLS/' \
+		-i Makefile -i librtmp/Makefile
+
+	sed \
 		-e 's|OPT=|&-fPIC |' \
 		-e 's|OPT|OPTS|' \
 		-e 's|CFLAGS=.*|& $(OPT)|' \
-		librtmp/Makefile
+		-i librtmp/Makefile
 
 
 	install -d $PKG/usr/lib
@@ -27,11 +32,9 @@ build() {
 		$MAKEFLAGS \
 		OPT="$CFLAGS" \
 		XLDFLAGS="$LDFLAGS" \
-		CRYPTO=OPENSSL \
 		SYS=posix
 
 	make \
-		CRYPTO=OPENSSL \
 		prefix=/usr \
 		sbindir=/usr/bin \
 		mandir=/usr/share/man \