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.

5 files changed, 40 insertions, 34 deletions

diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile
index 37aa0ae742c..5bd7b691e06 100644
--- a/net/rtmpdump/Makefile
+++ b/net/rtmpdump/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:27:53 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.10 2017/09/20 06:47:56 adam Exp $
 
 DISTNAME=	rtmpdump-2.4
 PKGREVISION=	3
@@ -12,23 +11,16 @@ COMMENT=	Tools for handling RTMP stream
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1
 
 USE_LIBTOOL=	yes
-
 USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	yes
 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
 
-SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		pre-configure
-SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
-SUBST_FILES.fix-paths=		Makefile
-SUBST_FILES.fix-paths+=		librtmp/Makefile
-SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rtmpdump/buildlink3.mk b/net/rtmpdump/buildlink3.mk
index 2106ab34373..a7b04da2160 100644
--- a/net/rtmpdump/buildlink3.mk
+++ b/net/rtmpdump/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2017/09/20 06:47:56 adam Exp $
 
 BUILDLINK_TREE+=	rtmpdump
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	rtmpdump
 RTMPDUMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.rtmpdump+=	rtmpdump>=2.3
-BUILDLINK_ABI_DEPENDS.rtmpdump?=	rtmpdump>=2.4nb3
-BUILDLINK_PKGSRCDIR.rtmpdump?=	../../net/rtmpdump
+BUILDLINK_ABI_DEPENDS.rtmpdump+=	rtmpdump>=2.4nb3
+BUILDLINK_PKGSRCDIR.rtmpdump?=		../../net/rtmpdump
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo
index 707a5dfdfcf..4b8425d5e3a 100644
--- a/net/rtmpdump/distinfo
+++ b/net/rtmpdump/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2017/09/12 05:54:10 wiz Exp $
+$NetBSD: distinfo,v 1.9 2017/09/20 06:47:56 adam Exp $
 
 SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac
 RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff
 SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609
 Size (rtmpdump-2.4.tar.gz) = 134558 bytes
-SHA1 (patch-Makefile) = db528f2b97bf7f4500cce26c34e5b3929019fd9a
-SHA1 (patch-librtmp_Makefile) = a44cd464e56230a76143f0d5130190c0cc7dc7a9
+SHA1 (patch-Makefile) = 1e1012b62ce372a3512f61aa10e876b22e96996b
+SHA1 (patch-librtmp_Makefile) = 0b32ab60020786ecfd42495e357d7845f4415bad
diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile
index a8996836d0d..dba561609de 100644
--- a/net/rtmpdump/patches/patch-Makefile
+++ b/net/rtmpdump/patches/patch-Makefile
@@ -1,16 +1,26 @@
-$NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $
+$NetBSD: patch-Makefile,v 1.7 2017/09/20 06:47:56 adam Exp $
 
-* Pass LDFLAGS to linker
-* Libtoolize
+Use PREFIX and PKGMANDIR.
+Remove OPT.
+Libtoolize
 
 --- Makefile.orig	2011-07-12 00:24:33.000000000 +0000
 +++ Makefile
-@@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+@@ -1,6 +1,6 @@
+ VERSION=v2.4
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ 
+ CC=$(CROSS_COMPILE)gcc
+ LD=$(CROSS_COMPILE)ld
+@@ -20,13 +20,12 @@ DEF_=-DNO_CRYPTO
+ CRYPTO_DEF=$(DEF_$(CRYPTO))
+ 
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
- OPT=-O2
+-OPT=-O2
  CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
--LDFLAGS=-Wall $(XLDFLAGS)
-+LDFLAGS+=-Wall $(XLDFLAGS)
+ LDFLAGS=-Wall $(XLDFLAGS)
  
  bindir=$(prefix)/bin
  sbindir=$(prefix)/sbin
@@ -19,7 +29,7 @@ $NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $
  
  BINDIR=$(DESTDIR)$(bindir)
  SBINDIR=$(DESTDIR)$(sbindir)
-@@ -44,7 +44,7 @@ THREADLIB_mingw=
+@@ -44,7 +43,7 @@ THREADLIB_mingw=
  THREADLIB=$(THREADLIB_$(SYS))
  SLIBS=$(THREADLIB) $(LIBS)
  
@@ -28,7 +38,7 @@ $NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $
  INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
  
  EXT_posix=
-@@ -60,11 +60,11 @@ $(PROGS): $(LIBRTMP)
+@@ -60,11 +59,11 @@ $(PROGS): $(LIBRTMP)
  
  install:	$(PROGS)
  	-mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
@@ -43,7 +53,7 @@ $NetBSD: patch-Makefile,v 1.6 2017/09/12 05:54:10 wiz Exp $
  
  clean:
  	rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
-@@ -76,19 +76,16 @@ $(LIBRTMP): FORCE
+@@ -76,19 +75,16 @@ $(LIBRTMP): FORCE
  	@cd librtmp; $(MAKE) all
  
  rtmpdump: rtmpdump.o
diff --git a/net/rtmpdump/patches/patch-librtmp_Makefile b/net/rtmpdump/patches/patch-librtmp_Makefile
index 4b08421e65d..a58ac4296db 100644
--- a/net/rtmpdump/patches/patch-librtmp_Makefile
+++ b/net/rtmpdump/patches/patch-librtmp_Makefile
@@ -1,5 +1,7 @@
-$NetBSD: patch-librtmp_Makefile,v 1.4 2017/07/13 13:19:59 wiz Exp $
+$NetBSD: patch-librtmp_Makefile,v 1.5 2017/09/20 06:47:56 adam Exp $
 
+Use PREFIX and PKGMANDIR.
+Remove OPT.
 Libtoolize
 
 --- librtmp/Makefile.orig	2011-07-12 00:24:33.000000000 +0000
@@ -7,7 +9,8 @@ Libtoolize
 @@ -1,11 +1,11 @@
  VERSION=v2.4
  
- prefix=/usr/local
+-prefix=/usr/local
++prefix=${PREFIX}
  
  incdir=$(prefix)/include/librtmp
  bindir=$(prefix)/bin
@@ -17,12 +20,13 @@ Libtoolize
  BINDIR=$(DESTDIR)$(bindir)
  INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
-@@ -68,28 +68,40 @@ SO_INST=$(SOINST_$(SHARED))
+@@ -66,30 +66,41 @@ SO_LIB=$(SOLIB_$(SHARED))
+ SO_INST=$(SOINST_$(SHARED))
+ 
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
- OPT=-O2
+-OPT=-O2
  CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
--LDFLAGS=$(XLDFLAGS)
-+LDFLAGS+=$(XLDFLAGS)
+ LDFLAGS=$(XLDFLAGS)
  
  
  OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
@@ -63,7 +67,7 @@ Libtoolize
  
  librtmp.pc: librtmp.pc.in Makefile
  	sed -e "s;@prefix@;$(prefix);" -e "s;@libdir@;$(libdir);" \
-@@ -97,12 +109,12 @@ librtmp.pc: librtmp.pc.in Makefile
+@@ -97,12 +108,12 @@ librtmp.pc: librtmp.pc.in Makefile
  		-e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" \
  		-e "s;@PRIVATE_LIBS@;$(PRIVATE_LIBS);" librtmp.pc.in > $@