mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Correct iconv handling

Browse Source 
Bump PORTREVISION

While on it:
- Remove @dirrm(try) from pkg-plists

PR:		195065
Submitted by:	yuri@rawbw.com
Reviewed by:	riggs
This commit is contained in:
Thomas Zander 2014-11-16 17:20:32 +00:00
parent d9582fb7f0
commit fa8b448107
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372644
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
multimedia/mencoder/Makefile
View File

@ -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 calcbpp.pl \
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 | \

2
multimedia/mencoder/pkg-plist
View File

@ -23,5 +23,3 @@ man/man1/mencoder.1.gz
%%DATADIR%%/tools/vobshift.py
%%DATADIR%%/tools/w32codec_dl.pl
%%DATADIR%%/tools/wma2ogg.pl
@dirrm %%DATADIR%%/tools
@dirrmtry %%DATADIR%%

5
multimedia/mplayer/Makefile
View File

@ -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 | \

3
multimedia/mplayer/pkg-plist
View File

@ -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
@dirrm %%DATADIR%%/examples/etc
@dirrm %%DATADIR%%/examples
@dirrmtry %%DATADIR%%