o Fix build in -STABLE

o Enable port to locate lame libs in a PREFIX safe environment
o Bump PORTREVISION

PR:		44885
Submitted by:	somebody@kashmir.etowns.net,
		MAINTAINER

6 files changed, 62 insertions, 26 deletions

diff --git a/graphics/transcode/Makefile b/graphics/transcode/Makefile
index f495d74f8aec..380bc457e4cb 100644
--- a/graphics/transcode/Makefile
+++ b/graphics/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 DISTNAME=	${PORTNAME}-${PORTVERSION}.20021010
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
@@ -180,6 +181,7 @@ PLIST_SUB+=	WITH_LIBA52="@comment "
 
 .if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+CONFIGURE_ARGS+=	--with-lame-libs=${LOCALBASE}/lib
 PLIST_SUB+=	WITH_LAME=""
 .else
 CONFIGURE_ARGS+=	--with-lame=no
diff --git a/graphics/transcode/files/patch-src:export:Makefile.in b/graphics/transcode/files/patch-src:export:Makefile.in
deleted file mode 100644
index 94ed7e8b264d..000000000000
--- a/graphics/transcode/files/patch-src:export:Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- export/Makefile.in.orig	Tue Sep  3 23:56:33 2002
-+++ export/Makefile.in	Tue Sep  3 23:58:12 2002
-@@ -536,7 +536,9 @@
- export_ffmpeg.la: $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(pkgdir) $(export_ffmpeg_la_LDFLAGS) $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_LIBADD) $(LIBS)
- export_ffmpeg4.la: $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_DEPENDENCIES) 
--	$(LINK) -rpath $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) \
-+    $(AM_LDFLAGS) -o $@ -IWRKSRC/ffmpeg/libavcodec -rpath \
-+    $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS)
- export_im.la: $(export_im_la_OBJECTS) $(export_im_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(pkgdir) $(export_im_la_LDFLAGS) $(export_im_la_OBJECTS) $(export_im_la_LIBADD) $(LIBS)
- export_iv50.la: $(export_iv50_la_OBJECTS) $(export_iv50_la_DEPENDENCIES) 
diff --git a/graphics/transcode/files/patch-src:filter:preview:pv.c b/graphics/transcode/files/patch-src:filter:preview:pv.c
new file mode 100644
index 000000000000..8c74a4a84c6e
--- /dev/null
+++ b/graphics/transcode/files/patch-src:filter:preview:pv.c
@@ -0,0 +1,29 @@
+--- filter/preview/pv.c.orig	Mon Nov  4 18:38:27 2002
++++ filter/preview/pv.c	Mon Nov  4 18:39:27 2002
+@@ -38,7 +38,7 @@
+ #include <sys/shm.h>
+ 
+ #ifdef __FreeBSD__ /* We don't have on_exit() */
+-dv_display_t 	*dv_dpy_on_exit_hack = NULL;
++xv_display_t 	*xv_dpy_on_exit_hack = NULL;
+ #endif
+ 
+ #define XV_FORMAT_MASK		0x03
+@@ -128,7 +128,7 @@
+   free(dv_dpy);
+   dv_dpy = NULL;
+ #ifdef __FreeBSD__
+-  dv_dpy_on_exit_hack = NULL;
++  xv_dpy_on_exit_hack = NULL;
+ #endif
+ } // xv_display_exit
+ 
+@@ -536,7 +536,7 @@
+   }
+   
+ #ifdef __FreeBSD__
+-  dv_dpy_on_exit_hack = dv_dpy;
++  xv_dpy_on_exit_hack = dv_dpy;
+   atexit(xv_display_on_exit_hack_handler);
+ #else
+   on_exit(xv_display_exit_handler, dv_dpy);
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index f495d74f8aec..380bc457e4cb 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 DISTNAME=	${PORTNAME}-${PORTVERSION}.20021010
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
@@ -180,6 +181,7 @@ PLIST_SUB+=	WITH_LIBA52="@comment "
 
 .if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+CONFIGURE_ARGS+=	--with-lame-libs=${LOCALBASE}/lib
 PLIST_SUB+=	WITH_LAME=""
 .else
 CONFIGURE_ARGS+=	--with-lame=no
diff --git a/multimedia/transcode/files/patch-src:export:Makefile.in b/multimedia/transcode/files/patch-src:export:Makefile.in
deleted file mode 100644
index 94ed7e8b264d..000000000000
--- a/multimedia/transcode/files/patch-src:export:Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- export/Makefile.in.orig	Tue Sep  3 23:56:33 2002
-+++ export/Makefile.in	Tue Sep  3 23:58:12 2002
-@@ -536,7 +536,9 @@
- export_ffmpeg.la: $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(pkgdir) $(export_ffmpeg_la_LDFLAGS) $(export_ffmpeg_la_OBJECTS) $(export_ffmpeg_la_LIBADD) $(LIBS)
- export_ffmpeg4.la: $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_DEPENDENCIES) 
--	$(LINK) -rpath $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS)
-+	$(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) \
-+    $(AM_LDFLAGS) -o $@ -IWRKSRC/ffmpeg/libavcodec -rpath \
-+    $(pkgdir) $(export_ffmpeg4_la_LDFLAGS) $(export_ffmpeg4_la_OBJECTS) $(export_ffmpeg4_la_LIBADD) $(LIBS)
- export_im.la: $(export_im_la_OBJECTS) $(export_im_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(pkgdir) $(export_im_la_LDFLAGS) $(export_im_la_OBJECTS) $(export_im_la_LIBADD) $(LIBS)
- export_iv50.la: $(export_iv50_la_OBJECTS) $(export_iv50_la_DEPENDENCIES) 
diff --git a/multimedia/transcode/files/patch-src:filter:preview:pv.c b/multimedia/transcode/files/patch-src:filter:preview:pv.c
new file mode 100644
index 000000000000..8c74a4a84c6e
--- /dev/null
+++ b/multimedia/transcode/files/patch-src:filter:preview:pv.c
@@ -0,0 +1,29 @@
+--- filter/preview/pv.c.orig	Mon Nov  4 18:38:27 2002
++++ filter/preview/pv.c	Mon Nov  4 18:39:27 2002
+@@ -38,7 +38,7 @@
+ #include <sys/shm.h>
+ 
+ #ifdef __FreeBSD__ /* We don't have on_exit() */
+-dv_display_t 	*dv_dpy_on_exit_hack = NULL;
++xv_display_t 	*xv_dpy_on_exit_hack = NULL;
+ #endif
+ 
+ #define XV_FORMAT_MASK		0x03
+@@ -128,7 +128,7 @@
+   free(dv_dpy);
+   dv_dpy = NULL;
+ #ifdef __FreeBSD__
+-  dv_dpy_on_exit_hack = NULL;
++  xv_dpy_on_exit_hack = NULL;
+ #endif
+ } // xv_display_exit
+ 
+@@ -536,7 +536,7 @@
+   }
+   
+ #ifdef __FreeBSD__
+-  dv_dpy_on_exit_hack = dv_dpy;
++  xv_dpy_on_exit_hack = dv_dpy;
+   atexit(xv_display_on_exit_hack_handler);
+ #else
+   on_exit(xv_display_exit_handler, dv_dpy);