svn commit: r372644 - in head/multimedia: mencoder mplayer

[Thomas Zander]

Author: riggs
Date: Sun Nov 16 17:20:32 2014
New Revision: 372644
URL: https://svnweb.freebsd.org/changeset/ports/372644
QAT: https://qat.redports.org/buildarchive/r372644/

Log:
  Correct iconv handling
  Bump PORTREVISION
  
  While on it:
  - Remove @dirrm(try) from pkg-plists
  
  PR:		195065
  Submitted by:	yuri at rawbw.com
  Reviewed by:	riggs

Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mencoder/pkg-plist
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/pkg-plist

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Sun Nov 16 16:25:46 2014	(r372643)
+++ head/multimedia/mencoder/Makefile	Sun Nov 16 17:20:32 2014	(r372644)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Convenient video file and movie encoder
 
@@ -41,7 +41,7 @@ TOOLFILES=	aconvert.sh binary_codecs.sh 
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
-USES+=		alias shebangfix
+USES+=		alias iconv shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
@@ -95,6 +95,7 @@ post-patch:
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
+		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \

Modified: head/multimedia/mencoder/pkg-plist
==============================================================================
--- head/multimedia/mencoder/pkg-plist	Sun Nov 16 16:25:46 2014	(r372643)
+++ head/multimedia/mencoder/pkg-plist	Sun Nov 16 17:20:32 2014	(r372644)
@@ -23,5 +23,3 @@ man/man1/mencoder.1.gz
 %%DATADIR%%/tools/vobshift.py
 %%DATADIR%%/tools/w32codec_dl.pl
 %%DATADIR%%/tools/wma2ogg.pl
- at dirrm %%DATADIR%%/tools
- at dirrmtry %%DATADIR%%

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Sun Nov 16 16:25:46 2014	(r372643)
+++ head/multimedia/mplayer/Makefile	Sun Nov 16 17:20:32 2014	(r372644)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 
 COMMENT=	High performance media player supporting many formats
 
@@ -42,7 +42,7 @@ SUB_FILES=	pkg-message
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
-USES+=		pkgconfig
+USES+=		iconv pkgconfig
 
 .include "${.CURDIR}/Makefile.optvars"
 .include <bsd.port.pre.mk>
@@ -142,6 +142,7 @@ post-patch:
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
+		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \

Modified: head/multimedia/mplayer/pkg-plist
==============================================================================
--- head/multimedia/mplayer/pkg-plist	Sun Nov 16 16:25:46 2014	(r372643)
+++ head/multimedia/mplayer/pkg-plist	Sun Nov 16 17:20:32 2014	(r372644)
@@ -7,6 +7,3 @@ man/man1/mplayer.1.gz
 %%DATADIR%%/examples/etc/input.conf
 %%DATADIR%%/examples/etc/menu.conf
 %%DATADIR%%/examples/etc/dvb-menu.conf
- at dirrm %%DATADIR%%/examples/etc
- at dirrm %%DATADIR%%/examples
- at dirrmtry %%DATADIR%%