diff options
32 files changed, 40 insertions, 43 deletions
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index b7d005df392e..131349f76854 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -20,13 +20,13 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ libftgl.so:${PORTSDIR}/graphics/ftgl \ libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 -USES= pkgconfig +USES= dos2unix pkgconfig tar:bzip2 USE_BZIP2= yes USE_SCONS= yes USE_GL= gl glu USE_SDL= mixer SUB_FILES= pink-pony.sh -USE_DOS2UNIX= lib/GL/GLee.h +DOS2UNIX_FILES= lib/GL/GLee.h PORTDOCS= * PORTDATA= * diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile index 9436c2c01a8b..f44021b7b2ee 100644 --- a/graphics/pear-Image_Canvas/Makefile +++ b/graphics/pear-Image_Canvas/Makefile @@ -14,7 +14,6 @@ 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/net/hawknl/Makefile b/net/hawknl/Makefile index cc60d75905a5..152b78f46ac4 100644 --- a/net/hawknl/Makefile +++ b/net/hawknl/Makefile @@ -11,8 +11,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Portable networking library -USE_DOS2UNIX= yes -USE_GMAKE= yes +USES= dos2unix gmake MAKEFILE= makefile.linux USE_LDCONFIG= yes diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile index 26627a426100..5dca1fafc7c5 100644 --- a/net/ntlmaps/Makefile +++ b/net/ntlmaps/Makefile @@ -11,7 +11,7 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= A proxy that authenticates the user using the NTLM protocol USE_PYTHON= yes -USE_DOS2UNIX= yes +USES= dos2unix DOCS= COPYING Install.txt changelog.txt readme.txt research.txt diff --git a/net/pear-Net_CDDB/Makefile b/net/pear-Net_CDDB/Makefile index 262487578085..f1d86138cef7 100644 --- a/net/pear-Net_CDDB/Makefile +++ b/net/pear-Net_CDDB/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \ ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request \ ${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2 -USE_DOS2UNIX= yes +USES= dos2unix PEAR_AUTOINSTALL= yes .include <bsd.port.pre.mk> diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile index 237cabf70b60..6805eac2cdd8 100644 --- a/net/pktanon/Makefile +++ b/net/pktanon/Makefile @@ -13,7 +13,7 @@ COMMENT= Network trace anonymizer LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 -USE_DOS2UNIX= yes +USES= dos2unix GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lboost_system diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 7ac4e9515fc3..f7eced2cd16a 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -15,7 +15,8 @@ RUN_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg NO_BUILD= yes USE_JAVA= yes -USE_DOS2UNIX= derby.properties +USES= dos2unix +DOS2UNIX_FILES= derby.properties PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message serviiod serviio-console diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile index 5487748ec08a..5c68dfef2112 100644 --- a/net/tn5250j/Makefile +++ b/net/tn5250j/Makefile @@ -22,11 +22,11 @@ RUN_DEPENDS= ${JAVAJARDIR}/mail.jar:${PORTSDIR}/java/javamail \ ${JAVAJARDIR}/itext.jar:${PORTSDIR}/devel/itext \ ${JAVAJARDIR}/log4j.jar:${PORTSDIR}/devel/log4j -USES= zip +USES= dos2unix zip USE_ANT= yes USE_JAVA= 1.3+ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_DOS2UNIX= build.xml +DOS2UNIX_FILES= build.xml ALL_TARGET= package MAKE_ENV+= CLASSPATH=${JYTHON_PREFIX} diff --git a/print/fpdf/Makefile b/print/fpdf/Makefile index 0fe19a7780f5..39512a4f0fef 100644 --- a/print/fpdf/Makefile +++ b/print/fpdf/Makefile @@ -16,7 +16,7 @@ COMMENT= A free PHP class to generate PDF files with pure PHP USE_PHP= zlib FETCH_CMD= ${FETCH_BINARY} -ARr -o ${DISTDIR}/${DISTFILES} -USE_DOS2UNIX= yes +USES= dos2unix NO_BUILD= yes FPDF_DIR?= share/fpdf diff --git a/print/yatex/Makefile b/print/yatex/Makefile index 8e9ed45f9fe4..99cebb690407 100644 --- a/print/yatex/Makefile +++ b/print/yatex/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= Yet Another LaTeX mode and html mode on Emacs -USE_DOS2UNIX= yes +USES= dos2unix USE_EMACS= yes EMACS_NO_RUN_DEPENDS= yes EMACS_NO_BUILD_DEPENDS= yes diff --git a/science/py-pydicom/Makefile b/science/py-pydicom/Makefile index b8e0545056bc..ac99fa183219 100644 --- a/science/py-pydicom/Makefile +++ b/science/py-pydicom/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-0.9.4-1 MAINTAINER= wen@FreeBSD.org COMMENT= Read, modify, and write DICOM files with Python code -USE_DOS2UNIX= yes +USES= dos2unix USE_PYTHON= yes USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGVERSION= 0.9.4_1 diff --git a/security/dradis/Makefile b/security/dradis/Makefile index 42e3f2abc69f..2a0bf4b02c3a 100644 --- a/security/dradis/Makefile +++ b/security/dradis/Makefile @@ -36,7 +36,7 @@ USE_RUBY_FEATURES= iconv RUBY_SHEBANG_FILES= server/script/rails server/script/delayed_job RUBY_NO_BUILD_DEPENDS= yes -USE_DOS2UNIX= yes +USES= dos2unix DOS2UNIX_REGEX= .*(css|rb|txt|js|RELEASE_NOTES)$$ pre-install: diff --git a/security/hmap/Makefile b/security/hmap/Makefile index 92ff7c70b9af..54790a523ee2 100644 --- a/security/hmap/Makefile +++ b/security/hmap/Makefile @@ -14,7 +14,7 @@ COMMENT= Web server fingerprinting utility LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/GPL -USE_DOS2UNIX= yes +USES= dos2unix USE_PYTHON= yes NO_WRKSUBDIR= yes diff --git a/security/libsparkcrypto/Makefile b/security/libsparkcrypto/Makefile index be5d2e690e2f..afb67feaa5b2 100644 --- a/security/libsparkcrypto/Makefile +++ b/security/libsparkcrypto/Makefile @@ -13,8 +13,8 @@ COMMENT= Cryptographic library implemented in SPARK LICENSE= BSD3CLAUSE -USES= ada gmake -USE_DOS2UNIX= Makefile build/libsparkcrypto.gpr +USES= ada dos2unix gmake +DOS2UNIX_FILES= Makefile build/libsparkcrypto.gpr SPARKARCH:= ${ARCH:S/amd64/x86_64/:S/i386/i686/} MAKE_ENV+= SPARKARCH=${SPARKARCH} \ diff --git a/security/p5-Business-PayPal-EWP/Makefile b/security/p5-Business-PayPal-EWP/Makefile index 76f1eba07369..158e6b752070 100644 --- a/security/p5-Business-PayPal-EWP/Makefile +++ b/security/p5-Business-PayPal-EWP/Makefile @@ -13,10 +13,9 @@ COMMENT= Perl extension for PayPal Encrypted Website Payments RUN_DEPENDS= p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay BUILD_DEPENDS= p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay -USES= perl5 +USES= dos2unix perl5 USE_PERL5= configure USE_OPENSSL= yes CONFIGURE_ARGS= ${OPENSSLBASE} -USE_DOS2UNIX= yes .include <bsd.port.mk> diff --git a/security/phpdeadlock/Makefile b/security/phpdeadlock/Makefile index 9b2e69b0d9fe..c1110784b239 100644 --- a/security/phpdeadlock/Makefile +++ b/security/phpdeadlock/Makefile @@ -16,7 +16,7 @@ DLURL?= ${PORTNAME} DLDIR= www/${DLURL} PORTDOCS= CHANGES.txt COPYING.txt UPGRADE.txt -USE_DOS2UNIX= yes +USES= dos2unix USE_APACHE_RUN= 22+ USE_PHP= mysql session ctype pcre NO_BUILD= yes diff --git a/security/rainbowcrack/Makefile b/security/rainbowcrack/Makefile index 2d8b6d6303b4..def80d7c36dd 100644 --- a/security/rainbowcrack/Makefile +++ b/security/rainbowcrack/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://www.semprixd.com/shares/ports/ MAINTAINER= semprix@gmx.com COMMENT= Hash cracker that precomputes plaintext - ciphertext pairs in advance -USE_DOS2UNIX= yes +USES= dos2unix NO_STAGE= yes .include <bsd.port.pre.mk> diff --git a/sysutils/ciso/Makefile b/sysutils/ciso/Makefile index 4aa4d87987d6..7418f8449b67 100644 --- a/sysutils/ciso/Makefile +++ b/sysutils/ciso/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF MAINTAINER= blttll@gmail.com COMMENT= A tool to compress ISO images to CSO format -USE_DOS2UNIX= yes +USES= dos2unix PLIST_FILES= bin/ciso .include <bsd.port.mk> diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile index 5055c2b1e24e..ffeb6b5a9e59 100644 --- a/sysutils/cronolog/Makefile +++ b/sysutils/cronolog/Makefile @@ -32,7 +32,8 @@ MASTER_SITES+= http://cronolog.org/patches/:patches DISTFILES= ${DISTNAME}${EXTRACT_SUFX} cronolog-setugid-patch.txt:patches EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRA_PATCHES+= ${WRKDIR}/cronolog-setugid-patch.txt -USE_DOS2UNIX= ../cronolog-setugid-patch.txt +USES+= dos2unix +DOS2UNIX_FILES= ../cronolog-setugid-patch.txt post-extract: @${CP} ${DISTDIR}/cronolog-setugid-patch.txt ${WRKDIR}/ diff --git a/sysutils/synergy-devel/Makefile b/sysutils/synergy-devel/Makefile index a7439748582b..1bc738cf1eeb 100644 --- a/sysutils/synergy-devel/Makefile +++ b/sysutils/synergy-devel/Makefile @@ -14,9 +14,8 @@ COMMENT= Mouse and keyboard sharing utility LICENSE= GPLv2 CONFLICTS= synergy-[0-9]* -USES= cmake +USES= cmake dos2unix USE_XORG= ice xtst x11 sm -USE_DOS2UNIX= yes CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile index ee017a1f8f7b..2d02e9365b05 100644 --- a/textproc/p5-XML-Catalog/Makefile +++ b/textproc/p5-XML-Catalog/Makefile @@ -20,8 +20,8 @@ BUILD_DEPENDS= p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= perl5 +USES= dos2unix perl5 USE_PERL5= configure -USE_DOS2UNIX= Catalog.pm +DOS2UNIX_FILES= Catalog.pm .include <bsd.port.mk> diff --git a/textproc/pear-XML_DTD/Makefile b/textproc/pear-XML_DTD/Makefile index b05b5d5e24be..3a91d50e25aa 100644 --- a/textproc/pear-XML_DTD/Makefile +++ b/textproc/pear-XML_DTD/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser -USE_DOS2UNIX= yes +USES= dos2unix PEAR_AUTOINSTALL= yes .include <bsd.port.pre.mk> diff --git a/www/ajaxplorer/Makefile b/www/ajaxplorer/Makefile index e4c5d6edcddf..803fad6c2ba9 100644 --- a/www/ajaxplorer/Makefile +++ b/www/ajaxplorer/Makefile @@ -12,13 +12,12 @@ COMMENT= Ajax web file management system LICENSE= AGPLv3 NO_BUILD= yes -USES= shebangfix +USES= dos2unix shebangfix php_OLD_CMD= /php SHEBANG_FILES= plugins/core.mq/ws-server.php \ plugins/core.mq/vendor/phpws/demo_ssl.php \ plugins/core.mq/vendor/phpws/demo.php USE_PHP= dom mcrypt gd -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.php WANT_PHP_WEB= yes SUB_FILES= pkg-deinstall pkg-install pkg-message diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile index 6dd930169c10..9e0867562dc5 100644 --- a/www/autoindex2/Makefile +++ b/www/autoindex2/Makefile @@ -11,7 +11,7 @@ COMMENT= PHP 5.x script that makes a table that lists the files in a directory WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_DOS2UNIX= yes +USES= dos2unix USE_PHP= session DEFAULT_PHP_VER= 5 CONFLICTS= AutoIndex-1* diff --git a/www/pear-HTTP_Session2/Makefile b/www/pear-HTTP_Session2/Makefile index 3177703bd411..59dc53953847 100644 --- a/www/pear-HTTP_Session2/Makefile +++ b/www/pear-HTTP_Session2/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear -USE_DOS2UNIX= yes +USES= dos2unix PEAR_AUTOINSTALL= yes .include <bsd.port.pre.mk> diff --git a/www/pear-Services_Delicious/Makefile b/www/pear-Services_Delicious/Makefile index 43034626f929..bf11f64e7014 100644 --- a/www/pear-Services_Delicious/Makefile +++ b/www/pear-Services_Delicious/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer \ ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request -USE_DOS2UNIX= yes +USES= dos2unix USE_PHP= openssl PEAR_AUTOINSTALL= yes diff --git a/www/sahi/Makefile b/www/sahi/Makefile index f27b01709899..0abee1d8eefa 100644 --- a/www/sahi/Makefile +++ b/www/sahi/Makefile @@ -59,7 +59,8 @@ REINPLACE_ARGS= -i '' -E \ SUB_FILES= ${PORTNAME}.sh SUB_LIST= BROWSER=${BROWSER} JAVA_HOME=${JAVA_HOME} -USE_DOS2UNIX= linux.xml os.properties sahi.properties +USES= dos2unix +DOS2UNIX_FILES= linux.xml os.properties sahi.properties post-patch: @${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bat" \) -delete diff --git a/www/tickr/Makefile b/www/tickr/Makefile index 9682f9d09d71..d034a2f53013 100644 --- a/www/tickr/Makefile +++ b/www/tickr/Makefile @@ -19,9 +19,9 @@ PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} REINPLACE_ARGS= -e 's,%%PREFIX%%,${PREFIX},1' -i.bak -USE_DOS2UNIX= tickr.h +DOS2UNIX_FILES= tickr.h USE_GNOME= desktopfileutils gtk20 libxml2 -USES= pkgconfig +USES= dos2unix pkgconfig NO_STAGE= yes post-patch: diff --git a/www/xpi-live_http_headers/Makefile b/www/xpi-live_http_headers/Makefile index 71eb8bed8b32..5f7ca2b8c39d 100644 --- a/www/xpi-live_http_headers/Makefile +++ b/www/xpi-live_http_headers/Makefile @@ -31,7 +31,7 @@ XPI_DIRS= chrome/icons/default \ defaults/preferences \ defaults -USE_DOS2UNIX= yes +USES= dos2unix DOS2UNIX_REGEX= .*\.(js|rdf|txt) post-patch: diff --git a/www/zen-cart/Makefile b/www/zen-cart/Makefile index f31ba46119de..a25cdad1d3a7 100644 --- a/www/zen-cart/Makefile +++ b/www/zen-cart/Makefile @@ -14,10 +14,9 @@ COMMENT= PHP-based user-friendly, open source shopping cart LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt -USES= zip +USES= dos2unix zip USE_PHP= yes WANT_PHP_WEB= yes -USE_DOS2UNIX= yes DOS2UNIX_REGEX= .*\.php EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME} diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile index 7be9e87de7ae..c7e532b1ba1e 100644 --- a/x11-toolkits/hs-wxc/Makefile +++ b/x11-toolkits/hs-wxc/Makefile @@ -12,12 +12,12 @@ USE_CABAL= wxdirect>=0.90 BROKEN= does not build with any of the supported wx +USES= dos2unix USE_WX= 3.0 WX_COMPS= wx WX_UNICODE= yes NOPORTDOCS= yes -USE_DOS2UNIX= yes post-patch:: @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-2.9-config"| ; \ diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 5a754dd5e629..026c194b9faf 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -21,7 +21,7 @@ USE_XORG= x11 xpm USE_GL= gl USE_PERL5= run USE_GNOME= gnomehier libglade2 gnomehack -USES= gettext gmake perl5 pkgconfig +USES= dos2unix gettext gmake perl5 pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ --with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \ @@ -112,7 +112,7 @@ CONFIGURE_ARGS+= --with-setuid-hacks CFLAGS+= -O0 .endif -USE_DOS2UNIX= hacks/glx/topblock.c +DOS2UNIX_FILES= hacks/glx/topblock.c post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|malloc.h|stdlib.h|g ; \ |