From owner-svn-ports-head@freebsd.org Thu Oct 20 15:34:17 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E32C3C1AB7A; Thu, 20 Oct 2016 15:34:17 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9AE67FBD; Thu, 20 Oct 2016 15:34:17 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9KFYGGp065176; Thu, 20 Oct 2016 15:34:16 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9KFYGfJ065173; Thu, 20 Oct 2016 15:34:16 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201610201534.u9KFYGfJ065173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 20 Oct 2016 15:34:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424337 - in head: games/linux-ssamtfe games/linux-ssamtse www/junkbuster X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2016 15:34:18 -0000 Author: mat Date: Thu Oct 20 15:34:16 2016 New Revision: 424337 URL: https://svnweb.freebsd.org/changeset/ports/424337 Log: Locate some places where USES=dos2unix could be used, and fix some of them. Sponsored by: Absolight Modified: head/games/linux-ssamtfe/Makefile (contents, props changed) head/games/linux-ssamtse/Makefile (contents, props changed) head/www/junkbuster/Makefile (contents, props changed) Modified: head/games/linux-ssamtfe/Makefile ============================================================================== --- head/games/linux-ssamtfe/Makefile Thu Oct 20 15:33:49 2016 (r424336) +++ head/games/linux-ssamtfe/Makefile Thu Oct 20 15:34:16 2016 (r424337) @@ -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'`//" '{}' \ Modified: head/games/linux-ssamtse/Makefile ============================================================================== --- head/games/linux-ssamtse/Makefile Thu Oct 20 15:33:49 2016 (r424336) +++ head/games/linux-ssamtse/Makefile Thu Oct 20 15:34:16 2016 (r424337) @@ -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" \ Modified: head/www/junkbuster/Makefile ============================================================================== --- head/www/junkbuster/Makefile Thu Oct 20 15:33:49 2016 (r424336) +++ head/www/junkbuster/Makefile Thu Oct 20 15:34:16 2016 (r424337) @@ -13,7 +13,7 @@ COMMENT= HTTP proxy server that eliminat 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