pkg/44125: Please support libtool for net/rtmpdump

[ryo_on%yk.rim.or.jp@localhost]

>Number:         44125
>Category:       pkg
>Synopsis:       Please support libtool for net/rtmpdump
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 21 09:05:00 +0000 2010
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.40
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.40 NetBSD 5.99.40 (LEAFGIRL2) 
#3: Sun Nov 21 04:46:19 JST 2010 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/LEAFGIRL2
 i386
Architecture: i386
Machine: i386
>Description:
net/rtmpdump does not use libtool now.
It should use libtool.

Should PKGREVISION be increased?
        
>How-To-Repeat:
        
>Fix:
        
diff -urpN rtmpdump/PLIST rtmpdump.new/PLIST
--- rtmpdump/PLIST      2010-07-22 03:27:12.000000000 +0900
+++ rtmpdump.new/PLIST  2010-11-21 17:55:03.000000000 +0900
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/21 18:27:12 drochner Exp $
+@comment $NetBSD$
 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 -urpN rtmpdump/distinfo rtmpdump.new/distinfo
--- rtmpdump/distinfo   2010-07-22 03:27:12.000000000 +0900
+++ rtmpdump.new/distinfo       2010-11-21 17:36:14.000000000 +0900
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.1.1.1 2010/07/21 1
 SHA1 (rtmpdump-2.3.tgz) = b65ce7708ae79adb51d1f43dd0b6d987076d7c42
 RMD160 (rtmpdump-2.3.tgz) = 1d48925e6567783806fa68819d6a695cd06138bc
 Size (rtmpdump-2.3.tgz) = 125103 bytes
+SHA1 (patch-aa) = 2ab4ab0a401d6262b3d5abbe3b13dbf95535a831
+SHA1 (patch-ab) = 3753ea3942b2bf605c579357db1cbed54cb566f7
diff -urpN rtmpdump/patches/patch-aa rtmpdump.new/patches/patch-aa
--- rtmpdump/patches/patch-aa   1970-01-01 09:00:00.000000000 +0900
+++ rtmpdump.new/patches/patch-aa       2010-11-21 17:54:45.000000000 +0900
@@ -0,0 +1,65 @@
+$NetBSD$
+
+--- librtmp/Makefile.orig      2010-06-30 20:01:28.000000000 +0000
++++ librtmp/Makefile
+@@ -52,34 +52,48 @@ MANDIR=$(DESTDIR)$(mandir)
+ 
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o
+ 
+-all:  librtmp.a $(SO_LIB)
++all:  librtmp.la $(SO_LIB)
+ 
+ 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
++#     $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB)
+       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
+ 
diff -urpN rtmpdump/patches/patch-ab rtmpdump.new/patches/patch-ab
--- rtmpdump/patches/patch-ab   1970-01-01 09:00:00.000000000 +0900
+++ rtmpdump.new/patches/patch-ab       2010-11-21 17:35:37.000000000 +0900
@@ -0,0 +1,34 @@
+$NetBSD$
+
+--- 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=
+@@ -72,16 +72,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} --mode=link --tag=CC $(CC) ${CFLAGS} $(LDFLAGS) $^ $> -o 
$@$(EXT) $(LIBS)
+ 
+ rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
+-      $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++      ${LIBTOOL} --mode=link --tag=CC $(CC) ${CFLAGS} $(LDFLAGS) $^ $> -o 
$@$(EXT) $(SLIBS)
+ 
+ rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
+-      $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++      ${LIBTOOL} --mode=link --tag=CC $(CC) ${CFLAGS} $(LDFLAGS) $^ $> -o 
$@$(EXT) $(SLIBS)
+ 
+ rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
+-      $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++      ${LIBTOOL} --mode=link --tag=CC $(CC) ${CFLAGS} $(LDFLAGS) $^ $> -o 
$@$(EXT) $(SLIBS)
+ 
+ rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
+ rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile


>Unformatted: