fixes for Makefile pkg-plist and build-in ffmpeg

[Y. A.]

hi!

Provided patches build Chromium on CURRENT with fixed:
1. Makefie OPTIONS
2. make package
3. correct build with internal ffmpeg library
-------------- next part --------------
--- Makefile.orig	2011-03-26 16:21:28.000000000 +0200
+++ Makefile	2011-03-26 16:24:01.000000000 +0200
@@ -63,23 +63,25 @@
 #GYP_DEFINES+=	use_system_libjpeg=1
 #GYP_DEFINES+=	use_system_libpng=1
 GYP_DEFINES+=	use_system_libxml=1
+GYP_DEFINES+=	use_system_ffmpeg=0
 #GYP_DEFINES+=	use_system_sqlite=0
 #GYP_DEFINES+=	use_system_zlib=1
 GYP_DEFINES+=	python_ver=${PYTHON_VER}
 
-.include <bsd.port.options.mk>
 
 OPTIONS=	CODECS		"Compile and enable patented codecs like H.264" off \
 		GCONF		"Use gconf2 for preferences"		on \
 		SSE2		"Use SSE2, disable this for PIII or older" on \
 		VPX		"Use system libvpx for VP8 codec"	on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_CODECS)
 GYP_DEFINES+=	ffmpeg_branding=Chrome
+GYP_DEFINES+=	use_proprietary_codecs=1
 .else
 GYP_DEFINES+=	ffmpeg_branding=Chromium
+GYP_DEFINES+=	use_proprietary_codecs=0
 .endif
 
 .if defined(WITH_GCONF)
@@ -167,4 +169,4 @@
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} "locales resources" ${DATADIR}
 	${LN} -sf ${DATADIR}/chrome ${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
-------------- next part --------------
--- third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c.orig	2011-03-25 14:43:09.000000000 +0200
+++ third_party/ffmpeg/patched-ffmpeg-mt/libavutil/mem.c	2011-03-25 14:43:21.000000000 +0200
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #if HAVE_MALLOC_H
-#include <malloc.h>
+#include <stdlib.h>
 #endif
 
 #include "avutil.h"
-------------- next part --------------
--- pkg-plist.orig	2011-03-26 16:27:43.000000000 +0200
+++ pkg-plist	2011-03-26 16:28:40.000000000 +0200
@@ -18,6 +18,7 @@
 %%DATADIR%%/locales/es-419.pak
 %%DATADIR%%/locales/es.pak
 %%DATADIR%%/locales/et.pak
+%%DATADIR%%/locales/fa.pak
 %%DATADIR%%/locales/fi.pak
 %%DATADIR%%/locales/fil.pak
 %%DATADIR%%/locales/fr.pak
@@ -59,21 +60,6 @@
 %%DATADIR%%/product_logo_48.png
 %%DATADIR%%/protoc
 %%DATADIR%%/resources.pak
-%%DATADIR%%/resources/calendar_app/128.png
-%%DATADIR%%/resources/calendar_app/24.png
-%%DATADIR%%/resources/calendar_app/32.png
-%%DATADIR%%/resources/calendar_app/48.png
-%%DATADIR%%/resources/calendar_app/manifest.json
-%%DATADIR%%/resources/docs_app/128.png
-%%DATADIR%%/resources/docs_app/24.png
-%%DATADIR%%/resources/docs_app/32.png
-%%DATADIR%%/resources/docs_app/48.png
-%%DATADIR%%/resources/docs_app/manifest.json
-%%DATADIR%%/resources/gmail_app/128.png
-%%DATADIR%%/resources/gmail_app/24.png
-%%DATADIR%%/resources/gmail_app/32.png
-%%DATADIR%%/resources/gmail_app/48.png
-%%DATADIR%%/resources/gmail_app/manifest.json
 %%DATADIR%%/resources/inspector/DevTools.js
 %%DATADIR%%/resources/inspector/Images/applicationCache.png
 %%DATADIR%%/resources/inspector/Images/auditsIcon.png
@@ -116,6 +102,7 @@
 %%DATADIR%%/resources/inspector/Images/excludeButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/focusButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/forward.png
+%%DATADIR%%/resources/inspector/Images/frame.png
 %%DATADIR%%/resources/inspector/Images/gearButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/glossyHeader.png
 %%DATADIR%%/resources/inspector/Images/glossyHeaderPressed.png
@@ -124,10 +111,11 @@
 %%DATADIR%%/resources/inspector/Images/goArrow.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutLeft.png
 %%DATADIR%%/resources/inspector/Images/graphLabelCalloutRight.png
-%%DATADIR%%/resources/inspector/Images/grayConnectorPoint.png
 %%DATADIR%%/resources/inspector/Images/largerResourcesButtonGlyph.png
 %%DATADIR%%/resources/inspector/Images/localStorage.png
+%%DATADIR%%/resources/inspector/Images/networkIcon.png
 %%DATADIR%%/resources/inspector/Images/nodeSearchButtonGlyph.png
+%%DATADIR%%/resources/inspector/Images/paneAddButtons.png
 %%DATADIR%%/resources/inspector/Images/paneBottomGrow.png
 %%DATADIR%%/resources/inspector/Images/paneBottomGrowActive.png
 %%DATADIR%%/resources/inspector/Images/paneGrowHandleLine.png
@@ -153,7 +141,6 @@
 %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
 %%DATADIR%%/resources/inspector/Images/resourcesIcon.png
-%%DATADIR%%/resources/inspector/Images/resourcesSilhouette.png
 %%DATADIR%%/resources/inspector/Images/resourcesSizeGraphIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
 %%DATADIR%%/resources/inspector/Images/scriptsIcon.png
@@ -189,7 +176,6 @@
 %%DATADIR%%/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerHorizontal.png
 %%DATADIR%%/resources/inspector/Images/statusbarResizerVertical.png
-%%DATADIR%%/resources/inspector/Images/storageIcon.png
 %%DATADIR%%/resources/inspector/Images/successGreenDot.png
 %%DATADIR%%/resources/inspector/Images/thumbActiveHoriz.png
 %%DATADIR%%/resources/inspector/Images/thumbActiveVert.png
@@ -238,21 +224,10 @@
 %%DATADIR%%/resources/inspector/Images/warningMediumIcon.png
 %%DATADIR%%/resources/inspector/Images/warningOrangeDot.png
 %%DATADIR%%/resources/inspector/Images/warningsErrors.png
-%%DATADIR%%/resources/inspector/Images/whiteConnectorPoint.png
-%%DATADIR%%/resources/inspector/audits.css
 %%DATADIR%%/resources/inspector/devTools.css
 %%DATADIR%%/resources/inspector/devtools.html
-%%DATADIR%%/resources/inspector/helpScreen.css
-%%DATADIR%%/resources/inspector/inspector.css
-%%DATADIR%%/resources/inspector/inspector.html
-%%DATADIR%%/resources/inspector/inspectorSyntaxHighlight.css
-%%DATADIR%%/resources/inspector/popover.css
-%%DATADIR%%/resources/inspector/textViewer.css
 %%DATADIR%%/xdg-settings
 @dirrm %%DATADIR%%/locales
- at dirrm %%DATADIR%%/resources/calendar_app
- at dirrm %%DATADIR%%/resources/docs_app
- at dirrm %%DATADIR%%/resources/gmail_app
 @dirrm %%DATADIR%%/resources/inspector/Images
 @dirrm %%DATADIR%%/resources/inspector
 @dirrm %%DATADIR%%/resources