aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/d2x-xl/Makefile4
-rw-r--r--games/fretsonfire/Makefile3
-rw-r--r--games/glaxium/Makefile4
-rw-r--r--games/paintown/Makefile3
-rw-r--r--games/q2pro/Makefile4
-rw-r--r--games/slune/Makefile7
-rw-r--r--games/warmux/Makefile4
-rw-r--r--graphics/panomatic/Makefile4
-rw-r--r--graphics/pear-Image_Canvas/Makefile1
-rw-r--r--graphics/pear-Image_Graph/Makefile2
-rw-r--r--graphics/sketch/Makefile3
-rw-r--r--java/berkeley-db/Makefile3
-rw-r--r--lang/neko/Makefile3
-rw-r--r--mail/davmail/Makefile3
-rw-r--r--mail/phpmailer2/Makefile2
-rw-r--r--math/R-cran-SuppDists/Makefile3
-rw-r--r--math/dieharder/Makefile4
-rw-r--r--math/octave-forge-ad/Makefile2
-rw-r--r--math/octave-forge-fl-core/Makefile2
-rw-r--r--math/p5-Statistics-Lite/Makefile3
-rw-r--r--misc/tkregexp/Makefile4
-rw-r--r--net-mgmt/macroscope/Makefile4
-rw-r--r--net-p2p/retroshare/Makefile4
23 files changed, 35 insertions, 41 deletions
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index f1f4e2660a2e..6061428e7b74 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -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
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 91b4b7b3266f..fe3bee3989b9 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -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}
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 7535d431f73a..cd537a25c9dd 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -13,13 +13,13 @@ COMMENT= OpenGL based space-ship "shoot-em-up" game
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" \
diff --git a/games/paintown/Makefile b/games/paintown/Makefile
index 7dbebd3f221f..a7c9a7d45924 100644
--- a/games/paintown/Makefile
+++ b/games/paintown/Makefile
@@ -16,11 +16,10 @@ LIB_DEPENDS= liballeg.so:${PORTSDIR}/devel/allegro \
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" \
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index cd9679abb750..d516fe668da0 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -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= #
diff --git a/games/slune/Makefile b/games/slune/Makefile
index bf31d8941796..fe353a16a811 100644
--- a/games/slune/Makefile
+++ b/games/slune/Makefile
@@ -15,11 +15,10 @@ RUN_DEPENDS= soya_editor:${PORTSDIR}/graphics/py-soya3d \
${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
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index e4d5111953b4..5b2f736a85b3 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
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
diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile
index df7f2f205769..84bdc17fcb27 100644
--- a/graphics/panomatic/Makefile
+++ b/graphics/panomatic/Makefile
@@ -15,9 +15,7 @@ BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \
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}
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 18bfc8d47550..9436c2c01a8b 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -13,6 +13,7 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
USE_PHP= gd
+USES= dos2unix
USE_DOS2UNIX= yes
PEAR_AUTOINSTALL= yes
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index c4c779e4aeac..a70bab2e557e 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
PEAR_AUTOINSTALL= yes
USE_PHP= yes
-USE_DOS2UNIX= yes
+USES= dos2unix
DOS2UNIX_REGEX= .*php$$
DEFAULT_PHP_VER= 5
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index ecb2f20cccc5..376b59db8dca 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -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
diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile
index d0baf85fc52d..55984e5744f3 100644
--- a/java/berkeley-db/Makefile
+++ b/java/berkeley-db/Makefile
@@ -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
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 7e22f36aca5b..4996e69381dc 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -14,9 +14,8 @@ LIB_DEPENDS= gc-threaded.1:${PORTSDIR}/devel/boehm-gc-threaded
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))$$
diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 4574b6701275..e3bb975de9a7 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -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+
diff --git a/mail/phpmailer2/Makefile b/mail/phpmailer2/Makefile
index 9629c44d7bc7..ea337d58135c 100644
--- a/mail/phpmailer2/Makefile
+++ b/mail/phpmailer2/Makefile
@@ -12,7 +12,7 @@ COMMENT= Full Featured Email Transfer Class for PHP4
CONFLICTS= phpmailer-5*
-USE_DOS2UNIX= yes
+USES= dos2unix
NO_BUILD= yes
USE_PHP= pcre
diff --git a/math/R-cran-SuppDists/Makefile b/math/R-cran-SuppDists/Makefile
index c65e8bce9d1f..b0bfe861ee79 100644
--- a/math/R-cran-SuppDists/Makefile
+++ b/math/R-cran-SuppDists/Makefile
@@ -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}
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index d6cd7b8624c3..70bedf6dc073 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -13,11 +13,11 @@ COMMENT= A random number generator testsuite
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
diff --git a/math/octave-forge-ad/Makefile b/math/octave-forge-ad/Makefile
index 575173786419..f9cc2606bd46 100644
--- a/math/octave-forge-ad/Makefile
+++ b/math/octave-forge-ad/Makefile
@@ -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 <bsd.port.mk>
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
index b5dc03625842..18bdbd70eefe 100644
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv3
OCTSRC= ${OCTAVE_PKGNAME}
WRKSRC= ${WRKDIR}/${OCTSRC}/src
-USE_DOS2UNIX= yes
+USES= dos2unix
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/p5-Statistics-Lite/Makefile b/math/p5-Statistics-Lite/Makefile
index 45cee0073632..da5409b48bc1 100644
--- a/math/p5-Statistics-Lite/Makefile
+++ b/math/p5-Statistics-Lite/Makefile
@@ -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 <bsd.port.mk>
diff --git a/misc/tkregexp/Makefile b/misc/tkregexp/Makefile
index fc057da833a8..3f1a1bef4ada 100644
--- a/misc/tkregexp/Makefile
+++ b/misc/tkregexp/Makefile
@@ -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
diff --git a/net-mgmt/macroscope/Makefile b/net-mgmt/macroscope/Makefile
index e6b6daa640d9..a2c76172269e 100644
--- a/net-mgmt/macroscope/Makefile
+++ b/net-mgmt/macroscope/Makefile
@@ -17,9 +17,7 @@ LIB_DEPENDS= lzo2:${PORTSDIR}/archivers/lzo2 \
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
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index c33a55c4135f..769abd9c611c 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -31,7 +31,7 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
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}|' \