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

$OpenBSD: patch-Makefile,v 1.8 2004/05/06 07:27:49 biorn Exp $
--- Makefile.orig	2004-04-13 13:22:37.000000000 +0200
+++ Makefile	2004-04-28 12:24:12.000000000 +0200
@@ -229,7 +229,7 @@ mplayer_wine.so:	$(MPLAYER_DEP)
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
 	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
-	$(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) -lm 
+	$(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) -lm 
 endif
 
 codecs.conf.h: $(PRG_CFG) etc/codecs.conf
@@ -287,8 +287,6 @@ ifeq ($(GUI),yes)
 	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
 	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
 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
Take it to 1.0pre4 ok brad@ 2004-05-06 03:27:36 -04:00			$OpenBSD: patch-Makefile,v 1.8 2004/05/06 07:27:49 biorn Exp $
			`--- Makefile.orig 2004-04-13 13:22:37.000000000 +0200`
			`+++ Makefile 2004-04-28 12:24:12.000000000 +0200`
Update to 1.0pre3 Ok espie@ pvalchev@ 2003-12-16 12:17:14 -05:00			`@@ -229,7 +229,7 @@ mplayer_wine.so: $(MPLAYER_DEP)`
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)`
			`./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a`
upgrade to mplayer 1.0pre2 based on diff from MAINTAINER 2003-11-02 18:30:27 -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) -lm`
			`+ $(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) -lm`
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.0pre3 Ok espie@ pvalchev@ 2003-12-16 12:17:14 -05:00			`@@ -287,8 +287,6 @@ ifeq ($(GUI),yes)`
- 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			`@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"`
			`@echo "*** for GUI, and extract to $(DATADIR)/Skin/"`
			`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`