Fix linking when previous version is installed.

Bump PORTREVISION for dependent ports.

PR:		ports/133826
Submitted by:	Alberto Villa (maintainer)

10 files changed, 163 insertions, 2 deletions

diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index e3f9ca5f1cb3..1e82923b5c6e 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	mlt
 PORTVERSION=	0.3.6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SFE
 
@@ -14,7 +15,6 @@ COMMENT=	A multimedia framework and video playout server for TV broadcasting
 
 USE_GNOME=	libxml2 gnomehack
 USE_QT_VER=	4
-QT_COMPONENTS=	#will be defined later
 USE_SDL=	image
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug \
@@ -23,7 +23,6 @@ CONFIGURE_ARGS=	--disable-debug \
 		--enable-westley
 USE_GMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 PORTDOCS=	AUTHORS ChangeLog COPYING \
diff --git a/multimedia/mlt/files/patch-src-modules-avformat-Makefile b/multimedia/mlt/files/patch-src-modules-avformat-Makefile
new file mode 100644
index 000000000000..68e02d8a139a
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-avformat-Makefile
@@ -0,0 +1,29 @@
+--- src/modules/avformat/Makefile.orig	2009-04-22 11:12:04.000000000 +0200
++++ src/modules/avformat/Makefile	2009-04-22 11:15:13.000000000 +0200
+@@ -1,6 +1,13 @@
+ include ../../../config.mak
++
++CFLAGS += -I../..
++
++LDFLAGS += -L../../framework -lmlt
++
+ include config.mak
+ 
++LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS)
++
+ ifndef CODECS
+ TARGET = ../libmltffmpeg$(LIBSUF)
+ else
+@@ -25,12 +32,6 @@
+ CFLAGS += -DCODECS
+ endif
+ 
+-CFLAGS+=-I../..
+-
+-LDFLAGS+=-L../../framework
+-
+-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+-
+ ifdef SWSCALE
+ 	CFLAGS+=-DSWSCALE
+ 	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
diff --git a/multimedia/mlt/files/patch-src-modules-dv-Makefile b/multimedia/mlt/files/patch-src-modules-dv-Makefile
new file mode 100644
index 000000000000..bdc0264fb24e
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-dv-Makefile
@@ -0,0 +1,13 @@
+--- src/modules/dv/Makefile.orig	2009-04-22 11:18:29.000000000 +0200
++++ src/modules/dv/Makefile	2009-04-22 11:18:48.000000000 +0200
+@@ -8,9 +8,9 @@
+ 
+ CFLAGS += `pkg-config --cflags libdv` -I../..
+ 
++LDFLAGS+=-L../../framework -lmlt
+ LDFLAGS += `pkg-config --libs libdv`
+ 
+-LDFLAGS+=-L../../framework -lmlt
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-modules-gtk2-Makefile b/multimedia/mlt/files/patch-src-modules-gtk2-Makefile
new file mode 100644
index 000000000000..1f22d9f5ca53
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-gtk2-Makefile
@@ -0,0 +1,22 @@
+--- src/modules/gtk2/Makefile.orig	2009-04-22 11:19:10.000000000 +0200
++++ src/modules/gtk2/Makefile	2009-04-22 11:19:34.000000000 +0200
+@@ -5,6 +5,9 @@
+ 
+ OBJS = factory.o
+ 
++CFLAGS += -I../..
++LDFLAGS+=-L../../framework -lmlt
++
+ ifdef USE_GTK2
+ OBJS += consumer_gtk2.o
+ CFLAGS += `pkg-config gtk+-2.0 --cflags`
+@@ -29,9 +32,6 @@
+ LDFLAGS += `pkg-config pangoft2 --libs`
+ endif
+ 
+-CFLAGS += -I../..
+-LDFLAGS+=-L../../framework -lmlt
+-
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
diff --git a/multimedia/mlt/files/patch-src-modules-jackrack-Makefile b/multimedia/mlt/files/patch-src-modules-jackrack-Makefile
new file mode 100644
index 000000000000..535cb709de21
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-jackrack-Makefile
@@ -0,0 +1,15 @@
+--- src/modules/jackrack/Makefile.orig	2009-04-22 11:19:54.000000000 +0200
++++ src/modules/jackrack/Makefile	2009-04-22 11:20:06.000000000 +0200
+@@ -17,11 +17,11 @@
+ CFLAGS += `xml2-config --cflags`
+ CFLAGS += `pkg-config glib-2.0 --cflags` 
+ 
++LDFLAGS+=-L../../framework -lmlt
+ LDFLAGS += `pkg-config --libs jack`
+ LDFLAGS += `xml2-config --libs`
+ LDFLAGS += `pkg-config glib-2.0 --libs`
+ 
+-LDFLAGS+=-L../../framework -lmlt
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-modules-resample-Makefile b/multimedia/mlt/files/patch-src-modules-resample-Makefile
new file mode 100644
index 000000000000..4c1f7035d5b9
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-resample-Makefile
@@ -0,0 +1,16 @@
+--- src/modules/resample/Makefile.orig	2009-04-22 11:02:49.000000000 +0200
++++ src/modules/resample/Makefile	2009-04-22 11:04:43.000000000 +0200
+@@ -6,10 +6,10 @@
+ 	   filter_resample.o 
+ 
+ CFLAGS += -I../..
++CFLAGS += `pkg-config --cflags samplerate`
+ 
+-LDFLAGS += -lsamplerate
+-
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS += -L../../framework -lmlt
++LDFLAGS += `pkg-config --libs samplerate`
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-modules-sdl-Makefile b/multimedia/mlt/files/patch-src-modules-sdl-Makefile
new file mode 100644
index 000000000000..b2ef64e2ec97
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-sdl-Makefile
@@ -0,0 +1,13 @@
+--- src/modules/sdl/Makefile.orig	2009-04-22 11:21:20.000000000 +0200
++++ src/modules/sdl/Makefile	2009-04-22 11:21:35.000000000 +0200
+@@ -18,9 +18,9 @@
+ 
+ CFLAGS +=-I../.. `sdl-config --cflags`
+ 
++LDFLAGS +=-L../../framework -lmlt
+ LDFLAGS +=`sdl-config --libs`
+ 
+-LDFLAGS +=-L../../framework -lmlt
+ 
+ ifeq ($(WITH_SDL_IMAGE),1)
+ OBJS += producer_sdl_image.o
diff --git a/multimedia/mlt/files/patch-src-modules-sox-Makefile b/multimedia/mlt/files/patch-src-modules-sox-Makefile
new file mode 100644
index 000000000000..f8aad39014d4
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-sox-Makefile
@@ -0,0 +1,23 @@
+--- src/modules/sox/Makefile.orig	2009-04-22 11:21:46.000000000 +0200
++++ src/modules/sox/Makefile	2009-04-22 11:22:11.000000000 +0200
+@@ -1,4 +1,9 @@
+ include ../../../config.mak
++
++CFLAGS += -I../../
++
++LDFLAGS += -L../../framework -lmlt
++
+ include config.mak
+ 
+ TARGET = ../libmltsox$(LIBSUF)
+@@ -6,10 +11,6 @@
+ OBJS = factory.o \
+ 	   filter_sox.o 
+ 
+-CFLAGS += -I../../
+-
+-LDFLAGS += -L../../framework -lmlt
+-
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
diff --git a/multimedia/mlt/files/patch-src-modules-vorbis-Makefile b/multimedia/mlt/files/patch-src-modules-vorbis-Makefile
new file mode 100644
index 000000000000..8681e65bbef1
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-vorbis-Makefile
@@ -0,0 +1,18 @@
+--- src/modules/vorbis/Makefile.orig	2009-04-22 11:04:56.000000000 +0200
++++ src/modules/vorbis/Makefile	2009-04-22 11:06:14.000000000 +0200
+@@ -6,10 +6,12 @@
+ 	   producer_vorbis.o
+ 
+ CFLAGS += -I../..
++CFLAGS += `pkg-config --cflags vorbis`
++CFLAGS += `pkg-config --cflags vorbisfile`
+ 
+-LDFLAGS += -lvorbisfile -lvorbis
+-
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS += -L../../framework -lmlt
++LDFLAGS += `pkg-config --libs vorbis`
++LDFLAGS += `pkg-config --libs vorbisfile`
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
diff --git a/multimedia/mlt/files/patch-src-modules-westley-Makefile b/multimedia/mlt/files/patch-src-modules-westley-Makefile
new file mode 100644
index 000000000000..3dbe1449c702
--- /dev/null
+++ b/multimedia/mlt/files/patch-src-modules-westley-Makefile
@@ -0,0 +1,13 @@
+--- src/modules/westley/Makefile.orig	2009-04-22 11:22:27.000000000 +0200
++++ src/modules/westley/Makefile	2009-04-22 11:22:41.000000000 +0200
+@@ -8,9 +8,9 @@
+ 
+ CFLAGS += -I../../ `xml2-config --cflags`
+ 
++LDFLAGS+=-L../../framework -lmlt
+ LDFLAGS += `xml2-config --libs`
+ 
+-LDFLAGS+=-L../../framework -lmlt
+ 
+ SRCS := $(OBJS:.o=.c)
+