aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-10-20 23:34:16 +0800
committerMathieu Arnold <mat@FreeBSD.org>2016-10-20 23:34:16 +0800
commit99f64659a390d5847e5770b48146358bcd41f8da (patch)
tree40bd459a4e11ac42ed20e7103860e6ec34785bf6
parent7d2424284de0da149e536969380f8e49ac997d9b (diff)
downloadfreebsd-ports-gnome-99f64659a390d5847e5770b48146358bcd41f8da.tar.gz
freebsd-ports-gnome-99f64659a390d5847e5770b48146358bcd41f8da.tar.zst
freebsd-ports-gnome-99f64659a390d5847e5770b48146358bcd41f8da.zip
Locate some places where USES=dos2unix could be used, and fix some of them.
Sponsored by: Absolight
-rw-r--r--games/linux-ssamtfe/Makefile2
-rw-r--r--games/linux-ssamtse/Makefile2
-rw-r--r--www/junkbuster/Makefile5
3 files changed, 5 insertions, 4 deletions
diff --git a/games/linux-ssamtfe/Makefile b/games/linux-ssamtfe/Makefile
index 46565356fd0f..552cc0c49b13 100644
--- a/games/linux-ssamtfe/Makefile
+++ b/games/linux-ssamtfe/Makefile
@@ -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'`//" '{}' \
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index b9c3570461eb..4b8b95701da5 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -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" \
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 2a23b4559aef..9ec8a0954d3e 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -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