Locate some places where USES=dos2unix could be used, and fix some of them.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2016-10-20 15:34:16 +00:00
parent 7d2424284d
commit 99f64659a3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=424337
3 changed files with 5 additions and 4 deletions

View file

@ -98,6 +98,8 @@ do-install:
.if ${PORT_OPTIONS:MVORBIS}
${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${STAGEDIR}${DATADIR}/Bin/libvorbisfile.so
.endif
# This looks like an attempt of duplicating what USES=dos2unix does,
# but I don't have the CDROM to test.
@${FIND} -E ${STAGEDIR}${DATADIR} -type f \
-iregex ".*\.(ctl|txt|lst|ini|cfg|des|reg)" \
-exec ${SH} -c "${SED} "s/`printf '\r'`//" '{}' \

View file

@ -91,6 +91,8 @@ do-install:
.if ${PORT_OPTIONS:MVORBIS}
${LN} -fs ${LINUXBASE}/usr/lib/libvorbisfile.so.3 ${STAGEDIR}${DATADIR}/Bin/libvorbisfile.so
.endif
# This looks like an attempt of duplicating what USES=dos2unix does,
# but I don't have the CDROM to test.
@${FIND} -E ${STAGEDIR}${DATADIR} -type f \
-iregex ".*\.(ctl|txt|lst|ini|cfg|des|reg)" \
! -iregex ".*ModExt.txt" \

View file

@ -13,7 +13,7 @@ COMMENT= HTTP proxy server that eliminates ads
LICENSE= GPLv2+
USES= tar:tgz
USES= dos2unix tar:tgz
ALL_TARGET= # yes, an empty target.
JDIR= ${PREFIX}/etc/junkbuster
SUB_FILES= junkbuster pkg-message
@ -23,9 +23,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message
GNUREGEXP= 's:gnu_regex.h:gnu/regex.h:'
post-patch:
.for f in junkbstr.ini saclfile.ini sblock.ini scookie.ini sforward.ini strust.ini win32.h
@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/${f}
.endfor
.for f in acl.c bind.c conn.c encode.c filters.c gnu_regex.c jcc.c loaders.c parsers.c socks4.c ssplit.c win32.c
@${REINPLACE_CMD} -e ${GNUREGEXP} ${WRKSRC}/${f}
.endfor