Update mplex to version 1.6.2. A changelog was not available, but several

bugs were fixed.  For details look at
http://cvs.sourceforge.net/viewcvs.py/mjpeg/mjpeg_play/mplex/

5 files changed, 19 insertions, 35 deletions

diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index a003facf2db..88fbfcd63c6 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/30 19:51:31 ben Exp $
 
-DISTNAME=	mjpegtools-1.6.0
-PKGNAME=	mplex-1.6.0
+DISTNAME=	mjpegtools-1.6.2
+PKGNAME=	mplex-1.6.2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
@@ -15,16 +15,21 @@ USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_GCC_SHLIB=	yes
+USE_BUILDLINK3=	yes
 
 do-build:
 	cd ${WRKSRC}/utils && ${GMAKE}
 	cd ${WRKSRC}/mplex && ${GMAKE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mplex/mplex ${PREFIX}/bin
+	cd ${WRKSRC}/mplex && \
+		${LIBTOOL} --mode=install ${INSTALL_DATA} libmplex2.la \
+			${PREFIX}/lib && \
+		${LIBTOOL} --mode=install ${INSTALL_PROGRAM} mplex ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mplex
 	for FILE in COPYING INSTRUCT README; do \
 	  ${INSTALL_DATA} ${WRKSRC}/mplex/$$FILE ${PREFIX}/share/doc/mplex; \
 	done
 
+.include "../../graphics/jpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplex/PLIST b/multimedia/mplex/PLIST
index a1f96bbb56d..2237baa75da 100644
--- a/multimedia/mplex/PLIST
+++ b/multimedia/mplex/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:52:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/30 19:51:31 ben Exp $
 bin/mplex
+lib/libmplex2-1.6.so.2
+lib/libmplex2-1.6.so.2.2
+lib/libmplex2.a
+lib/libmplex2.la
+lib/libmplex2.so
 share/doc/mplex/COPYING
 share/doc/mplex/INSTRUCT
 share/doc/mplex/README
diff --git a/multimedia/mplex/distinfo b/multimedia/mplex/distinfo
index 10deac04211..3231b29e23f 100644
--- a/multimedia/mplex/distinfo
+++ b/multimedia/mplex/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 12:52:07 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/03/30 19:51:31 ben Exp $
 
-SHA1 (mjpegtools-1.6.0.tar.gz) = 07637802c94cff2363ca53529ba5e14d0786d6d6
-Size (mjpegtools-1.6.0.tar.gz) = 928991 bytes
-SHA1 (patch-aa) = 136c2e6068beec6676e328e213ddb9164d9e9489
-SHA1 (patch-ab) = e8207b661a8204b23ecc36e0b60844bfba4e1494
-SHA1 (patch-ac) = 47b2d73ae5d8d697cacc00fa7c5b05b39c2ff789
+SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
+Size (mjpegtools-1.6.2.tar.gz) = 1256280 bytes
+SHA1 (patch-aa) = 6394ea0296e3b1e238c2fc51b77b6712c172bb1d
diff --git a/multimedia/mplex/patches/patch-ab b/multimedia/mplex/patches/patch-ab
deleted file mode 100644
index db766d361b2..00000000000
--- a/multimedia/mplex/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:52:07 jmmv Exp $
-
---- mplex/systems.cc	2003/12/19 18:19:54	1.1
-+++ mplex/systems.cc	2003/12/19 18:20:07
-@@ -2,6 +2,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <assert.h>
- #include <sys/param.h>
- #include <sys/stat.h>
- #include "systems.hh"
diff --git a/multimedia/mplex/patches/patch-ac b/multimedia/mplex/patches/patch-ac
deleted file mode 100644
index b16dd9904e0..00000000000
--- a/multimedia/mplex/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/01/26 12:52:07 jmmv Exp $
-
---- mplex/stillsstream.cc	2003/12/19 18:20:51	1.1
-+++ mplex/stillsstream.cc	2003/12/19 18:21:08
-@@ -22,6 +22,7 @@
- 
- 
- #include <format_codes.h>
-+#include <assert.h>
- 
- #include "stillsstream.hh"
- #include "interact.hh"