openbsd-ports/x11/mplayer/patches/patch-Makefile

$OpenBSD: patch-Makefile,v 1.11 2005/05/09 12:24:38 biorn Exp $
--- Makefile.orig	Sat Apr 16 22:18:12 2005
+++ Makefile	Wed Apr 20 06:35:54 2005
@@ -259,7 +259,7 @@ mplayer_wine.so:	$(MPLAYER_DEP)
 
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
+	$(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)
 endif
 
 codecs.conf.h: $(PRG_CFG) etc/codecs.conf
@@ -325,8 +325,6 @@ ifeq ($(GUI),yes)
 	@if test ! -d $(prefix)/share/applications ; then mkdir -p $(prefix)/share/applications ; fi
 	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
 endif
-	@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
-	@if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
 ifeq ($(DVDKIT_SHARED),yes)
 ifeq ($(DVDKIT2),yes)
 	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
Update to 1.0pre7 Don't depend on ogg/vorbis as it's built in now Put fontconfig and freetype in WANTLIB and BUILD_DEPEND on pkgconfig if FLAVOR is not no_x11. 2005-05-09 08:24:38 -04:00			$OpenBSD: patch-Makefile,v 1.11 2005/05/09 12:24:38 biorn Exp $
			`--- Makefile.orig Sat Apr 16 22:18:12 2005`
			`+++ Makefile Wed Apr 20 06:35:54 2005`
			`@@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)`
update to 1.0pre5 ok pvalchev@ 2004-10-18 02:48:08 -04:00
Partial real video support. Need manual installation of the codecs. mplayer was already working, but if linked with g++, mencoder also works, so one can convert stuff from realvideo into other more palateable formats. With help from Bjorn, who suggested linking with g++. 2003-05-18 07:49:55 -04:00			`ifeq ($(MENCODER),yes)`
			`$(PRG_MENCODER): $(MENCODER_DEP)`
Finally take it to 1.0pre6a Prodded by espi@, ok sturm@ 2005-03-09 11:07:29 -05:00			`- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)`
			`+ $(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB)`
Partial real video support. Need manual installation of the codecs. mplayer was already working, but if linked with g++, mencoder also works, so one can convert stuff from realvideo into other more palateable formats. With help from Bjorn, who suggested linking with g++. 2003-05-18 07:49:55 -04:00			`endif`

Take it to 1.0pre4 ok brad@ 2004-05-06 03:27:36 -04:00			`codecs.conf.h: $(PRG_CFG) etc/codecs.conf`
Update to 1.0pre7 Don't depend on ogg/vorbis as it's built in now Put fontconfig and freetype in WANTLIB and BUILD_DEPEND on pkgconfig if FLAVOR is not no_x11. 2005-05-09 08:24:38 -04:00			`@@ -325,8 +325,6 @@ ifeq ($(GUI),yes)`
Finally take it to 1.0pre6a Prodded by espi@, ok sturm@ 2005-03-09 11:07:29 -05:00			`@if test ! -d $(prefix)/share/applications ; then mkdir -p $(prefix)/share/applications ; fi`
			`$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop`
- move global config files from LOCALBASE/share/mplayer (bad enough no one noticed it wasn't using SYSCONFDIR nevermind LOCALBASE) to SYSCONFDIR/mplayer - move install time message via @exec's in the PLIST to MESSAGE - add @extra stuff - remove WWW: from DESCR -- ok jolan@ pvalchev@ 2003-10-26 14:54:46 -05:00			`endif`
			`- @if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi`
			`- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi`
			`ifeq ($(DVDKIT_SHARED),yes)`
			`ifeq ($(DVDKIT2),yes)`
			`if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi`