From owner-svn-ports-all@FreeBSD.ORG Mon May 26 08:44:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09F847ED; Mon, 26 May 2014 08:44:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 CF9FB27E3; Mon, 26 May 2014 08:44:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4Q8idLT081221; Mon, 26 May 2014 08:44:39 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4Q8iZEZ081194; Mon, 26 May 2014 08:44:35 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405260844.s4Q8iZEZ081194@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 26 May 2014 08:44:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355288 - in head: games/d2x-xl games/fretsonfire games/glaxium games/paintown games/q2pro games/slune games/warmux graphics/panomatic graphics/pear-Image_Canvas graphics/pear-Image_Gra... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 08:44:40 -0000 Author: bapt Date: Mon May 26 08:44:34 2014 New Revision: 355288 URL: http://svnweb.freebsd.org/changeset/ports/355288 QAT: https://qat.redports.org/buildarchive/r355288/ Log: Convert to USES=dos2unix With hat: portmgr Modified: head/games/d2x-xl/Makefile head/games/fretsonfire/Makefile head/games/glaxium/Makefile head/games/paintown/Makefile head/games/q2pro/Makefile head/games/slune/Makefile head/games/warmux/Makefile head/graphics/panomatic/Makefile head/graphics/pear-Image_Canvas/Makefile head/graphics/pear-Image_Graph/Makefile head/graphics/sketch/Makefile head/java/berkeley-db/Makefile head/lang/neko/Makefile head/mail/davmail/Makefile head/mail/phpmailer2/Makefile head/math/R-cran-SuppDists/Makefile head/math/dieharder/Makefile head/math/octave-forge-ad/Makefile head/math/octave-forge-fl-core/Makefile head/math/p5-Statistics-Lite/Makefile head/misc/tkregexp/Makefile head/net-mgmt/macroscope/Makefile head/net-p2p/retroshare/Makefile Modified: head/games/d2x-xl/Makefile ============================================================================== --- head/games/d2x-xl/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/d2x-xl/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -24,11 +24,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-debug --enable-release=yes \ --with-sharepath=${PREFIX}/share/d2x-xl USE_SDL= sdl mixer image -USES= gmake motif +USES= dos2unix gmake motif USE_AUTOTOOLS= aclocal autoheader automake autoconf AUTOMAKE_ARGS= --add-missing --copy -USE_DOS2UNIX= missing depcomp +DOS2UNIX_FILES= missing depcomp SUB_FILES= pkg-message Modified: head/games/fretsonfire/Makefile ============================================================================== --- head/games/fretsonfire/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/fretsonfire/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -18,8 +18,9 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:${PORTSDIR}/games/fretsonfire-data +USES= dos2unix USE_PYTHON= yes -USE_DOS2UNIX= *.txt +DOS2UNIX_FILES= *.txt NO_BUILD= yes DATADIR= share/${PORTNAME} Modified: head/games/glaxium/Makefile ============================================================================== --- head/games/glaxium/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/glaxium/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -13,13 +13,13 @@ COMMENT= OpenGL based space-ship "shoot- LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png -USES= gmake +USES= dos2unix gmake USE_SDL= sdl mixer USE_GL= glut GNU_CONFIGURE= yes ALL_TARGET= ${PORTNAME} -USE_DOS2UNIX= variables.cpp scene.cpp +DOS2UNIX_FILES= variables.cpp scene.cpp DESKTOP_ENTRIES= "Glaxium" \ "Space-ship \"shoot-em-up\" game" \ Modified: head/games/paintown/Makefile ============================================================================== --- head/games/paintown/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/paintown/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -16,11 +16,10 @@ LIB_DEPENDS= liballeg.so:${PORTSDIR}/dev libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USE_BZIP2= yes +USES= dos2unix tar:bzip2 USE_SCONS= yes USE_SDL= yes INSTALLS_ICONS= yes -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.(c|cpp|h) SCONS_BUILDENV+=CPPPATH="${LOCALBASE}/include" \ Modified: head/games/q2pro/Makefile ============================================================================== --- head/games/q2pro/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/q2pro/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -11,9 +11,7 @@ MASTER_SITE_SUBDIR= alepulver MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II engine modification compatible with R1Q2 -USE_BZIP2= yes -USE_DOS2UNIX= yes -USE_GMAKE= yes +USES= dos2unix gmake tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME} ALL_TARGET= # Modified: head/games/slune/Makefile ============================================================================== --- head/games/slune/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/slune/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -15,11 +15,10 @@ RUN_DEPENDS= soya_editor:${PORTSDIR}/gra ${PYTHON_SITELIBDIR}/_openal.so:${PORTSDIR}/audio/py-openal \ ${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \ ${PYTHON_SITELIBDIR}/py2play/level.py:${PORTSDIR}/net-p2p/py-py2play -LIB_DEPENDS= cal3d.12:${PORTSDIR}/graphics/cal3d +LIB_DEPENDS= libcal3d.so:${PORTSDIR}/graphics/cal3d -USE_BZIP2= yes -USE_DOS2UNIX= *.po *.mo -USES= gettext +DOS2UNIX_GLOB= *.po *.mo +USES= dos2unix gettext tar:bzip2 USE_PYTHON= yes USE_PYDISTUTILS= yes USE_GL= glew Modified: head/games/warmux/Makefile ============================================================================== --- head/games/warmux/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/games/warmux/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -17,9 +17,9 @@ LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR} CONFLICTS_INSTALL= wormux-* GNU_CONFIGURE= yes -USES= gmake pkgconfig tar:bzip2 +USES= dos2unix gmake pkgconfig tar:bzip2 USE_SDL= sdl image mixer ttf gfx net -USE_DOS2UNIX= fixed_class.h +DOS2UNIX_FILES= fixed_class.h OPTIONS_DEFINE= FRIBIDI SERVER NLS DEBUG FRIBIDI_DESC= Enable bi-directional unicode support Modified: head/graphics/panomatic/Makefile ============================================================================== --- head/graphics/panomatic/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/graphics/panomatic/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -15,9 +15,7 @@ BUILD_DEPENDS= bjam:${PORTSDIR}/devel/bo GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include -USE_BZIP2= yes -USES= gmake -USE_DOS2UNIX= yes +USES= dos2unix gmake tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/graphics/pear-Image_Canvas/Makefile ============================================================================== --- head/graphics/pear-Image_Canvas/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/graphics/pear-Image_Canvas/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -13,6 +13,7 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR RUN_DEPENDS= ${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color USE_PHP= gd +USES= dos2unix USE_DOS2UNIX= yes PEAR_AUTOINSTALL= yes Modified: head/graphics/pear-Image_Graph/Makefile ============================================================================== --- head/graphics/pear-Image_Graph/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/graphics/pear-Image_Graph/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -14,7 +14,7 @@ RUN_DEPENDS= ${PEARDIR}/Log.php:${PORTSD PEAR_AUTOINSTALL= yes USE_PHP= yes -USE_DOS2UNIX= yes +USES= dos2unix DOS2UNIX_REGEX= .*php$$ DEFAULT_PHP_VER= 5 Modified: head/graphics/sketch/Makefile ============================================================================== --- head/graphics/sketch/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/graphics/sketch/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -14,9 +14,8 @@ LICENSE= GPLv3 MAKEFILE= makefile ALL_TARGET= -USES= gmake perl5 +USES= dos2unix gmake perl5 USE_PERL5= build -USE_DOS2UNIX= yes PLIST_FILES= bin/sketch Modified: head/java/berkeley-db/Makefile ============================================================================== --- head/java/berkeley-db/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/java/berkeley-db/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -21,7 +21,8 @@ JAVA_VERSION= 1.6+ USE_ANT= yes MAKE_ENV+= JAVALIBDIR="${JAVALIBDIR}" MAKE_ARGS+= -cp ${JAVALIBDIR}/junit.jar -USE_DOS2UNIX= build.xml +USES= dos2unix +DOS2UNIX_FILES= build.xml PLIST_FILES= %%JAVAJARDIR%%/je.jar Modified: head/lang/neko/Makefile ============================================================================== --- head/lang/neko/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/lang/neko/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -14,9 +14,8 @@ LIB_DEPENDS= gc-threaded.1:${PORTSDIR}/d ONLY_FOR_ARCHS= i386 amd64 -USES= gmake pkgconfig +USES= dos2unix gmake pkgconfig USE_AUTOTOOLS= libtool:env -USE_DOS2UNIX= yes MAKE_JOBS_UNSAFE= yes DOS2UNIX_REGEX= .*(Makefile|\.(c|h|neko|nml))$$ Modified: head/mail/davmail/Makefile ============================================================================== --- head/mail/davmail/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/mail/davmail/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -15,7 +15,8 @@ LICENSE= GPLv2 RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel -USE_DOS2UNIX= build.xml +USES= dos2unix +DOS2UNIX_FILES= build.xml USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ Modified: head/mail/phpmailer2/Makefile ============================================================================== --- head/mail/phpmailer2/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/mail/phpmailer2/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -12,7 +12,7 @@ COMMENT= Full Featured Email Transfer Cl CONFLICTS= phpmailer-5* -USE_DOS2UNIX= yes +USES= dos2unix NO_BUILD= yes USE_PHP= pcre Modified: head/math/R-cran-SuppDists/Makefile ============================================================================== --- head/math/R-cran-SuppDists/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/math/R-cran-SuppDists/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -22,7 +22,8 @@ USES= cran:auto-plist WRKSRC = ${WRKDIR}/${PORTNAME} .if defined(MAINTAINER_MODE) -USE_DOS2UNIX= ../${BENCHMARK_SCRIPT} +USES+= dos2unix +DOS2UNIX_FILES= ../${BENCHMARK_SCRIPT} post-extract: @${CP} ${_DISTDIR}/${BENCHMARK_SCRIPT} ${WRKDIR} Modified: head/math/dieharder/Makefile ============================================================================== --- head/math/dieharder/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/math/dieharder/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -13,11 +13,11 @@ COMMENT= A random number generator tests LICENSE= GPLv2 -LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl +LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl MAKE_JOBS_UNSAFE= yes -USE_DOS2UNIX= yes +USES= dos2unix GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/math/octave-forge-ad/Makefile ============================================================================== --- head/math/octave-forge-ad/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/math/octave-forge-ad/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -13,7 +13,7 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ENV+= HOME=${WRKSRC} -USE_DOS2UNIX= yes +USES= dos2unix .include "${.CURDIR}/../../Mk/bsd.octave.mk" .include Modified: head/math/octave-forge-fl-core/Makefile ============================================================================== --- head/math/octave-forge-fl-core/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/math/octave-forge-fl-core/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -16,7 +16,7 @@ LICENSE= GPLv3 OCTSRC= ${OCTAVE_PKGNAME} WRKSRC= ${WRKDIR}/${OCTSRC}/src -USE_DOS2UNIX= yes +USES= dos2unix .include "${.CURDIR}/../../Mk/bsd.octave.mk" Modified: head/math/p5-Statistics-Lite/Makefile ============================================================================== --- head/math/p5-Statistics-Lite/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/math/p5-Statistics-Lite/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -10,8 +10,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= osa@FreeBSD.org COMMENT= The lightweight and functional object-oriented statistics -USES= perl5 +USES= dos2unix perl5 USE_PERL5= configure -USE_DOS2UNIX= yes .include Modified: head/misc/tkregexp/Makefile ============================================================================== --- head/misc/tkregexp/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/misc/tkregexp/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -12,8 +12,8 @@ EXTRACT_ONLY= MAINTAINER= tcltk@FreeBSD.org COMMENT= Interactive regexp design tool -USES+= tk -USE_DOS2UNIX= visual_regexp-${PORTVERSION}.tcl +USES+= dos2unix tk +DOS2UNIX_FILES= visual_regexp-${PORTVERSION}.tcl NO_BUILD= yes PLIST_FILES= bin/tkregexp Modified: head/net-mgmt/macroscope/Makefile ============================================================================== --- head/net-mgmt/macroscope/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/net-mgmt/macroscope/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -17,9 +17,7 @@ LIB_DEPENDS= lzo2:${PORTSDIR}/archivers gd:${PORTSDIR}/graphics/gd USE_RC_SUBR= ${PORTNAME} -USE_BZIP2= yes -USE_DOS2UNIX= yes -USES= cmake +USES= cmake dos2unix tar:bzip2 OPTIONS_DEFINE= FIREBIRD DOCS #MYSQL OPTIONS_DEFAULT= FIREBIRD Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Mon May 26 08:36:58 2014 (r355287) +++ head/net-p2p/retroshare/Makefile Mon May 26 08:44:34 2014 (r355288) @@ -31,7 +31,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/de libxslt.so:${PORTSDIR}/textproc/libxslt RUN_DEPENDS= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4 -USES= qmake zip +USES= dos2unix qmake zip USE_GNOME= glib20 USE_XORG= ice sm x11 xau xcb xdmcp xext xrender USE_QT4= corelib gui network xml script designer_build uic_build \ @@ -43,7 +43,7 @@ USE_LDCONFIG= yes DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \ "${BINARY}" "Network;FileTransfer;" true -USE_DOS2UNIX= retroshare-gui/src/retroshare-gui.pro +DOS2UNIX_FILES= retroshare-gui/src/retroshare-gui.pro post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \