svn commit: r334194 - in head: archivers/unalz audio/faac audio/faad audio/libgme benchmarks/imb benchmarks/xdd biology/povchem comms/cdr_read comms/tcpser databases/mysql-workbench51 deskutils/lau...
Baptiste Daroussin
bapt at FreeBSD.org
Mon Nov 18 13:45:48 UTC 2013
Author: bapt
Date: Mon Nov 18 13:45:44 2013
New Revision: 334194
URL: http://svnweb.freebsd.org/changeset/ports/334194
Log:
Convert to USES=dos2unix
While here stagify some of the ports
Modernize LIB_DEPENDS
Extract zip with bsdtar when possible
Modified:
head/archivers/unalz/Makefile
head/audio/faac/Makefile
head/audio/faad/Makefile
head/audio/libgme/Makefile
head/benchmarks/imb/Makefile
head/benchmarks/xdd/Makefile
head/biology/povchem/Makefile
head/comms/cdr_read/Makefile
head/comms/tcpser/Makefile
head/databases/mysql-workbench51/Makefile
head/deskutils/launchy/Makefile
head/devel/bncsutil-ghost++/Makefile
head/devel/codeworker/Makefile
head/devel/initutil/Makefile
head/devel/p65/Makefile
head/x11/xorg-edit/Makefile
Modified: head/archivers/unalz/Makefile
==============================================================================
--- head/archivers/unalz/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/archivers/unalz/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/readme.txt
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= iconv
-USE_DOS2UNIX= yes
+USES= dos2unix iconv
MAKE_ARGS+= CPP="${CXX}" CC="${CC}" OBJ="${UNALZ_OBJS}" \
LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
ALL_TARGET= posix-utf8
Modified: head/audio/faac/Makefile
==============================================================================
--- head/audio/faac/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/audio/faac/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -14,9 +14,8 @@ LIB_DEPENDS= libmp4v2.so:${PORTSDIR}/mul
RESTRICTED= Distribution in binary form is prohibited
-USES= gmake
+USES= dos2unix gmake
USE_BZIP2= yes
-USE_DOS2UNIX= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
Modified: head/audio/faad/Makefile
==============================================================================
--- head/audio/faad/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/audio/faad/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -11,9 +11,8 @@ MASTER_SITES= SF/faac/${PORTNAME}-src/${
MAINTAINER= multimedia at FreeBSD.org
COMMENT= MPEG-2 and MPEG-4 AAC audio decoder
-USES= gmake
+USES= dos2unix gmake
USE_BZIP2= yes
-USE_DOS2UNIX= yes
USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
Modified: head/audio/libgme/Makefile
==============================================================================
--- head/audio/libgme/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/audio/libgme/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -14,13 +14,8 @@ LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
PROJECTHOST= game-music-emu
-USE_DOS2UNIX= yes
-NO_STAGE= yes
USE_BZIP2= yes
-USES= cmake
+USES= cmake dos2unix
USE_LDCONFIG= yes
-# XXX: dialog(1) doesn't like ^M in LICENSE_FILE
-post-extract: patch-dos2unix
-
.include <bsd.port.mk>
Modified: head/benchmarks/imb/Makefile
==============================================================================
--- head/benchmarks/imb/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/benchmarks/imb/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -15,8 +15,7 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Intel MPI Benchmark
WRKSRC= ${WRKDIR}/IMB_3.0/src/
-USES= gmake
-USE_DOS2UNIX= yes
+USES= dos2unix gmake
MAKEFILE= make_mpich
ALL_TARGET= all
# Intel hardcodes -O3 in make_mpich. Replacing it with system defaults
Modified: head/benchmarks/xdd/Makefile
==============================================================================
--- head/benchmarks/xdd/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/benchmarks/xdd/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -14,19 +14,16 @@ COMMENT= Tool for measuring and characte
WRKSRC= ${WRKDIR}/${DISTNAME}
PLIST_FILES= bin/xdd bin/timeserver bin/gettime
-USE_DOS2UNIX= yes
+USES= dos2unix
DOS2UNIX_REGEX= .*\.(c|cpp|h)
+MAKEFILE= freebsd.makefile
-NO_STAGE= yes
post-extract:
${CP} ${FILESDIR}/freebsd.makefile ${WRKSRC}
-do-build:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f freebsd.makefile
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/xdd.freebsd ${PREFIX}/bin/xdd
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/timeserver.freebsd ${PREFIX}/bin/timeserver
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/gettime.freebsd ${PREFIX}/bin/gettime
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/xdd.freebsd ${STAGEDIR}${PREFIX}/bin/xdd
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/timeserver.freebsd ${STAGEDIR}${PREFIX}/bin/timeserver
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/gettime.freebsd ${STAGEDIR}${PREFIX}/bin/gettime
.include <bsd.port.mk>
Modified: head/biology/povchem/Makefile
==============================================================================
--- head/biology/povchem/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/biology/povchem/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -19,7 +19,7 @@ RUN_DEPENDS= povray:${PORTSDIR}/graphics
NO_WRKSUBDIR= yes
-USE_DOS2UNIX= povchem.c
+USES= dos2unix
CPPFLAGS+= -DDATADIR=\"${DATADIR}\" \
-DSYSCONFDIR=\"${PREFIX}/etc\"
@@ -27,7 +27,6 @@ CPPFLAGS+= -DDATADIR=\"${DATADIR}\" \
PLIST_FILES= bin/povchem etc/povchem.cfg %%DATADIR%%/periodic.tab
PLIST_DIRS= %%DATADIR%%
-NO_STAGE= yes
post-extract:
@(cd ${DISTDIR}/${DIST_SUBDIR} && ${TAR} -cf - ${DISTFILES}) | \
(cd ${WRKSRC} && ${TAR} -xf -)
@@ -40,9 +39,9 @@ do-build:
cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o povchem povchem.c -lm
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/povchem ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/povchem.cfg ${PREFIX}/etc
- @${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/periodic.tab ${DATADIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/povchem ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/povchem.cfg ${STAGEDIR}${PREFIX}/etc
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/periodic.tab ${STAGEDIR}${DATADIR}
.include <bsd.port.mk>
Modified: head/comms/cdr_read/Makefile
==============================================================================
--- head/comms/cdr_read/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/comms/cdr_read/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -10,14 +10,13 @@ DISTNAME= cdrr${PORTVERSION:S/.//}
MAINTAINER= ports at FreeBSD.org
COMMENT= Utility for reading of the call detail records from PBX
-USE_DOS2UNIX= readme_eng.txt
+USES= dos2unix
+DOS2UNIX_FILES= readme_eng.txt
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
NO_WRKSUBDIR= yes
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/comms/tcpser/Makefile
==============================================================================
--- head/comms/tcpser/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/comms/tcpser/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
OPTIONS_DEFINE= DOCS
LDFLAGS+= -pthread
-USE_DOS2UNIX= yes
-USES= gmake
+USES= dos2unix gmake
WRKSRC= ${WRKDIR}/tcpser
PORTDOCS= README CHANGES
Modified: head/databases/mysql-workbench51/Makefile
==============================================================================
--- head/databases/mysql-workbench51/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/databases/mysql-workbench51/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -12,13 +12,13 @@ PKGNAMESUFFIX?= 51
MAINTAINER= ports at FreeBSD.org
COMMENT= The MySQL Workbench
-LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
- pcre.3:${PORTSDIR}/devel/pcre \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
- zip:${PORTSDIR}/archivers/libzip \
- sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
- cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
+ libpcre.so:${PORTSDIR}/devel/pcre \
+ libxml2.so:${PORTSDIR}/textproc/libxml2 \
+ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
+ libzip.so:${PORTSDIR}/archivers/libzip \
+ libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+ libcairo.so:${PORTSDIR}/graphics/cairo
MAKE_JOBS_UNSAFE= yes
@@ -30,10 +30,10 @@ ACLOCAL_ARGS=
AUTOCONF_ARGS=
USE_LDCONFIG= ${PREFIX}/lib/mysql-workbench
SUBDIRS= ext/yassl/taocrypt ext/yassl .
-USE_DOS2UNIX= yes
-DOS2UNIX_REGEX= .*ext/yassl/.*(Makefile.am|configure.in)
AUTOTOOLSFILES= configure.in
+USES= dos2unix
+DOS2UNIX_REGEX= .*ext/yassl/.*(Makefile.am|configure.in)
USE_GL= gl glu
USE_GNOME= libglade2 intltool libgnome gtk20 pango orbit2
USE_LUA= 5.1
Modified: head/deskutils/launchy/Makefile
==============================================================================
--- head/deskutils/launchy/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/deskutils/launchy/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -13,15 +13,13 @@ COMMENT= Open source keystroke launcher
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
-USES= qmake
-USE_DOS2UNIX= readme.lyx readme.txt
+USES= dos2unix qmake
+DOS2UNIX_FILES= readme.lyx readme.txt
USE_QT4= qmake_build moc_build rcc_build uic_build gui network
PORTDOCS= *
MAKE_JOBS_UNSAFE= yes
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} 's,/usr,${PREFIX},' \
${WRKSRC}/platforms/unix/unix.pro \
@@ -33,9 +31,7 @@ post-patch:
${WRKSRC}/src/src.pro
post-install:
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/?eadme.* ${STAGEDIR}${DOCSDIR}
-.endif
.include <bsd.port.mk>
Modified: head/devel/bncsutil-ghost++/Makefile
==============================================================================
--- head/devel/bncsutil-ghost++/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/devel/bncsutil-ghost++/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -6,21 +6,20 @@ PORTVERSION= 1.3.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PKGNAMESUFFIX= -ghost++
+EXTRACT_SUFX= .zip
DISTNAME= ${PROJECTHOST}_${PROJECTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= Utility library for Battle.net clients in C++
-LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
PROJECTHOST= ghostplusplus
PROJECTVERSION= 17.1
-USE_ZIP= yes
-USE_DOS2UNIX= yes
+USES= dos2unix gmake
WRKSRC= ${WRKDIR}/ghost/bncsutil/src/bncsutil
-USE_GMAKE= yes
USE_LDCONFIG= yes
NO_STAGE= yes
Modified: head/devel/codeworker/Makefile
==============================================================================
--- head/devel/codeworker/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/devel/codeworker/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -6,6 +6,7 @@ PORTVERSION= 4.5.3
CATEGORIES= devel
MASTER_SITES= http://codeworker.free.fr/downloads/
DISTNAME= CodeWorker_SRC${PORTVERSION:S/./_/g}
+EXTRACT_SUFX= .zip
MAINTAINER= ports at FreeBSD.org
COMMENT= Versatile parsing tool and source code generator
@@ -14,9 +15,7 @@ LICENSE= LGPL21
WRKSRC= ${WRKDIR}/CodeWorker${PORTVERSION:S/./_/g}
-USES= gmake
-USE_ZIP= yes
-USE_DOS2UNIX= yes
+USES= dos2unix gmake
MAKE_ARGS= CC="${CXX}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LFLAGS="-lm"
ALL_TARGET= build
Modified: head/devel/initutil/Makefile
==============================================================================
--- head/devel/initutil/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/devel/initutil/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -6,20 +6,20 @@ PORTVERSION= 2.1.b
CATEGORIES= devel
MASTER_SITES= http://www.bdsoft.com/dist/
DISTNAME= ${PORTNAME}2
+EXTRACT_SUFX= .zip
MAINTAINER= ports at FreeBSD.org
-COMMENT= An STL Container Initialization Library
+COMMENT= STL Container Initialization Library
-USE_ZIP= yes
+USES= dos2unix
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_DOS2UNIX= InitUtil.h
+DOS2UNIX_FILES= InitUtil.h
PLIST_FILES= include/InitUtil.h
-NO_STAGE= yes
do-install:
- @${INSTALL_DATA} ${WRKSRC}/InitUtil.h ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/InitUtil.h ${STAGEDIR}${PREFIX}/include
.include <bsd.port.mk>
Modified: head/devel/p65/Makefile
==============================================================================
--- head/devel/p65/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/devel/p65/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -13,14 +13,13 @@ COMMENT= An assembler for the 6502 micro
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= ${WRKSRC}
-USES= perl5
-USE_DOS2UNIX= yes
+USES= dos2unix perl5 shebangfix
+SHEBANG_FILES= ${DISTNAME}
NO_WRKSUBDIR= yes
NO_BUILD= yes
PLIST_FILES= bin/p65
-NO_STAGE= yes
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PORTNAME}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
.include <bsd.port.mk>
Modified: head/x11/xorg-edit/Makefile
==============================================================================
--- head/x11/xorg-edit/Makefile Mon Nov 18 13:44:22 2013 (r334193)
+++ head/x11/xorg-edit/Makefile Mon Nov 18 13:45:44 2013 (r334194)
@@ -15,10 +15,10 @@ LICENSE= GPLv3
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
-USE_DOS2UNIX= *.cpp *.h
+DOS2UNIX_GLOB= *.cpp *.h
USE_WX= 2.6+
WX_UNICODE= yes
-USES= gmake
+USES= dos2unix gmake
PLIST_FILES= bin/xorg-edit \
lib/xorg-edit/de_DE/LC_MESSAGES/xorg-edit.mo \
More information about the svn-ports-head
mailing list