Fix build on NetBSD and remove unused patch.

Provided by Soren Jacobsen in PR 23771

5 files changed, 20 insertions, 23 deletions

diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile
index f186ff56c09..aad4d485da0 100644
--- a/graphics/mjpegtools/Makefile
+++ b/graphics/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/09/23 12:18:56 recht Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/16 07:26:49 recht Exp $
 
 DISTNAME=	mjpegtools-1.6.1.90
 PKGREVISION=	2
@@ -6,7 +6,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://sourceforge.net/projects/mjpeg
+HOMEPAGE=	http://mjpeg.sourceforge.net/
 COMMENT=	Programs for compressing video streams
 
 DEPENDS+=		toolame>=02l:../../audio/toolame
@@ -31,5 +31,6 @@ CONFIGURE_ARGS+=	--without-avifile
 .include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mjpegtools/PLIST b/graphics/mjpegtools/PLIST
index 4f1be09496c..c55233ab928 100644
--- a/graphics/mjpegtools/PLIST
+++ b/graphics/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/31 21:58:23 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/16 07:26:49 recht Exp $
 bin/glav
 bin/img2mpg
 bin/jpeg2yuv
@@ -73,8 +73,8 @@ lib/libmjpegutils.a
 lib/libmmxsse.a
 lib/libmotion.a
 lib/pkgconfig/mjpegtools.pc
-man/man1/jpeg2yuv.1
 man/man1/img2mpg.1
+man/man1/jpeg2yuv.1
 man/man1/lav2mpeg.1
 man/man1/lav2wav.1
 man/man1/lav2yuv.1
diff --git a/graphics/mjpegtools/distinfo b/graphics/mjpegtools/distinfo
index 1790cd308fe..1b7f4439ffc 100644
--- a/graphics/mjpegtools/distinfo
+++ b/graphics/mjpegtools/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/08/31 21:58:23 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2003/12/16 07:26:49 recht Exp $
 
 SHA1 (mjpegtools-1.6.1.90.tar.gz) = c66ed5ba3cb5b8835facaeeb80b05bb9f5014206
 Size (mjpegtools-1.6.1.90.tar.gz) = 1168921 bytes
-SHA1 (patch-aa) = 446e3c8a3ef385ca4244c0826435737e51fa0225
-SHA1 (patch-ab) = de6d7fd8a307141ef7d3d160ca2cdb955e8e5154
+SHA1 (patch-ab) = 5562496d75bc470ffe6030e9fea02c94a22855e7
diff --git a/graphics/mjpegtools/patches/patch-aa b/graphics/mjpegtools/patches/patch-aa
deleted file mode 100644
index 60466991323..00000000000
--- a/graphics/mjpegtools/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/08/31 22:31:38 mycroft Exp $
-
---- lavtools/Makefile.am.orig	2003-08-23 13:14:34.000000000 +0000
-+++ lavtools/Makefile.am	2003-08-31 20:42:27.000000000 +0000
-@@ -101,7 +101,7 @@
- 
- yuv2lav_SOURCES = yuv2lav.c $(lav_headers)
- yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \
--		 liblavfile.la liblavjpeg.la
-+		 liblavfile.la liblavjpeg.la -lm
- 
- transist_flt_SOURCES = transist.flt.c ${lav_headers}
- transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a
diff --git a/graphics/mjpegtools/patches/patch-ab b/graphics/mjpegtools/patches/patch-ab
index 64134f1e4b4..9426287587a 100644
--- a/graphics/mjpegtools/patches/patch-ab
+++ b/graphics/mjpegtools/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2003/08/31 22:31:38 mycroft Exp $
+$NetBSD: patch-ab,v 1.4 2003/12/16 07:26:49 recht Exp $
 
---- lavtools/Makefile.in.orig	2003-08-23 14:21:53.000000000 +0000
-+++ lavtools/Makefile.in	2003-08-31 20:42:34.000000000 +0000
+--- lavtools/Makefile.in.orig	2003-08-23 07:21:53.000000000 -0700
++++ lavtools/Makefile.in	2003-12-15 18:00:39.000000000 -0800
 @@ -220,7 +220,7 @@
  
  yuv2lav_SOURCES = yuv2lav.c $(lav_headers)
@@ -11,3 +11,13 @@ $NetBSD: patch-ab,v 1.3 2003/08/31 22:31:38 mycroft Exp $
  
  
  transist_flt_SOURCES = transist.flt.c ${lav_headers}
+@@ -235,7 +235,8 @@
+ lavplay_SOURCES = lavplay.c ${lav_headers}
+ lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+ 	liblavplay.la liblavjpeg.la liblavfile.la \
+-	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11
++	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 \
++	${LIBOSSAUDIO}
+ 
+ 
+ lavrec_SOURCES = lavrec.c $(lav_headers)