diff options
author | ryoon <ryoon> | 2011-10-05 21:41:25 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2011-10-05 21:41:25 +0000 |
commit | 89e9a99c5bdcaf9f195a6c7342dba833ddd46937 (patch) | |
tree | 89a48f36c267633a0a95c6f95bd4d0e0a4dc1ef1 /net/rtmpdump | |
parent | 074968d69199ced6dd9287cf2ca2b6a37f76a07f (diff) | |
download | pkgsrc-89e9a99c5bdcaf9f195a6c7342dba833ddd46937.tar.gz |
Fix PR pkg/44125.
Libtoolized.
Diffstat (limited to 'net/rtmpdump')
-rw-r--r-- | net/rtmpdump/Makefile | 9 | ||||
-rw-r--r-- | net/rtmpdump/PLIST | 6 | ||||
-rw-r--r-- | net/rtmpdump/distinfo | 4 | ||||
-rw-r--r-- | net/rtmpdump/patches/patch-Makefile | 53 | ||||
-rw-r--r-- | net/rtmpdump/patches/patch-librtmp_Makefile | 65 |
5 files changed, 128 insertions, 9 deletions
diff --git a/net/rtmpdump/Makefile b/net/rtmpdump/Makefile index e03757ddb03..fab788ebb8f 100644 --- a/net/rtmpdump/Makefile +++ b/net/rtmpdump/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/07/21 18:27:12 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2011/10/05 21:41:25 ryoon Exp $ # DISTNAME= rtmpdump-2.3 +PKGREVISION= 1 CATEGORIES= net multimedia MASTER_SITES= http://rtmpdump.mplayerhq.hu/download/ EXTRACT_SUFX= .tgz @@ -9,15 +10,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= ryo_on@yk.rim.or.jp HOMEPAGE= http://rtmpdump.mplayerhq.hu/ COMMENT= Tools for handling RTMP stream - LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir +USE_LIBTOOL= yes + USE_TOOLS+= pkg-config USE_LIBTOOL= yes -BUILD_DIRS= . \ - librtmp +BUILD_DIRS= . librtmp PKGCONFIG_OVERRIDE+= librtmp/librtmp.pc.in diff --git a/net/rtmpdump/PLIST b/net/rtmpdump/PLIST index 3b52fa22727..7d3c0c440ef 100644 --- a/net/rtmpdump/PLIST +++ b/net/rtmpdump/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/21 18:27:12 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/05 21:41:25 ryoon Exp $ bin/rtmpdump include/librtmp/amf.h include/librtmp/http.h include/librtmp/log.h include/librtmp/rtmp.h -lib/librtmp.a -lib/librtmp.so -lib/librtmp.so.0 +lib/librtmp.la lib/pkgconfig/librtmp.pc man/man1/rtmpdump.1 man/man3/librtmp.3 diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo index 469ee27522c..6f898d9df49 100644 --- a/net/rtmpdump/distinfo +++ b/net/rtmpdump/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/07/21 18:27:12 drochner Exp $ +$NetBSD: distinfo,v 1.2 2011/10/05 21:41:25 ryoon Exp $ SHA1 (rtmpdump-2.3.tgz) = b65ce7708ae79adb51d1f43dd0b6d987076d7c42 RMD160 (rtmpdump-2.3.tgz) = 1d48925e6567783806fa68819d6a695cd06138bc Size (rtmpdump-2.3.tgz) = 125103 bytes +SHA1 (patch-Makefile) = cfc0de0ef2bb26fb1db1bdae0f90158abed29d16 +SHA1 (patch-librtmp_Makefile) = 4df3c8741198cd13d8e507b8e8033cddeb0410ae diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile new file mode 100644 index 00000000000..d1c3dc357d7 --- /dev/null +++ b/net/rtmpdump/patches/patch-Makefile @@ -0,0 +1,53 @@ +$NetBSD: patch-Makefile,v 1.1 2011/10/05 21:41:25 ryoon Exp $ + +Libtoolize + +--- Makefile.orig 2010-06-30 19:58:35.000000000 +0000 ++++ Makefile +@@ -40,7 +40,7 @@ THREADLIB_mingw= + THREADLIB=$(THREADLIB_$(SYS)) + SLIBS=$(THREADLIB) $(LIBS) + +-LIBRTMP=librtmp/librtmp.a ++LIBRTMP=librtmp/librtmp.la + INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h + + EXT_posix= +@@ -53,8 +53,9 @@ progs: rtmpdump rtmpgw rtmpsrv rtmpsuck + + install: progs + -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 +- cp rtmpdump$(EXT) $(BINDIR) +- cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) ++ cd librtmp; $(MAKE) install $(MAKEFLAGS) ++ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpdump$(EXT) $(BINDIR) ++ $(LIBTOOL) --tag=CC --mode=install $(INSTALL) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) + cp rtmpdump.1 $(MANDIR)/man1 + cp rtmpgw.8 $(MANDIR)/man8 + @cd librtmp; $(MAKE) install +@@ -72,19 +73,16 @@ $(LIBRTMP): FORCE + # we use both since either make will ignore the one it doesn't recognize + + rtmpdump: rtmpdump.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) ++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) + + rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) + + rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) + + rtmpgw: rtmpgw.o thread.o $(LIBRTMP) +- $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) ++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) + +-rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile +-rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile +-rtmpsrv.o: rtmpsrv.c $(INCRTMP) Makefile +-rtmpsuck.o: rtmpsuck.c $(INCRTMP) Makefile +-thread.o: thread.c thread.h ++%.lo: %.c ++ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c -o $@ $< diff --git a/net/rtmpdump/patches/patch-librtmp_Makefile b/net/rtmpdump/patches/patch-librtmp_Makefile new file mode 100644 index 00000000000..dfe5852a0a7 --- /dev/null +++ b/net/rtmpdump/patches/patch-librtmp_Makefile @@ -0,0 +1,65 @@ +$NetBSD: patch-librtmp_Makefile,v 1.1 2011/10/05 21:41:25 ryoon Exp $ + +Libtoolize + +--- librtmp/Makefile.orig 2010-06-30 20:01:28.000000000 +0000 ++++ librtmp/Makefile +@@ -52,34 +52,46 @@ MANDIR=$(DESTDIR)$(mandir) + + OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o + +-all: librtmp.a $(SO_LIB) ++all: librtmp.la + + clean: + rm -f *.o *.a *.so *.$(SO_EXT) + +-librtmp.a: $(OBJS) +- $(AR) rs $@ $? ++librtmp.la: $(OBJS) ++ ${LIBTOOL} --mode=link --tag=CC \ ++ ${CC} -o ${.TARGET:.a=.la} \ ++ ${OBJS:.o=.lo} \ ++ -rpath ${PREFIX}/lib + + librtmp.$(SO_EXT): $(OBJS) +- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) ++ ${LIBTOOL} --mode=link --tag=CC \ ++ ${CC} -o ${.TARGET:.a=.la} \ ++ ${OBJS:.o=.lo} \ ++ -rpath ${PREFIX}/lib \ ++ -version-info 0:0 + ln -sf $@ librtmp.so + +-log.o: log.c log.h Makefile +-rtmp.o: rtmp.c rtmp.h rtmp_sys.h handshake.h dh.h log.h amf.h Makefile +-amf.o: amf.c amf.h bytes.h log.h Makefile +-hashswf.o: hashswf.c http.h rtmp.h rtmp_sys.h Makefile +-parseurl.o: parseurl.c rtmp.h rtmp_sys.h log.h Makefile ++log.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c log.c ++rtmp.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c rtmp.c ++amf.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c amf.c ++hashswf.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c hashswf.c ++parseurl.o: ++ ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} -c parseurl.c + + librtmp.pc: librtmp.pc.in Makefile + sed -e "s;@prefix@;$(prefix);" -e "s;@VERSION@;$(VERSION);" \ + -e "s;@CRYPTO_REQ@;$(CRYPTO_REQ);" 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 + 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 + |