Date: Fri, 20 Sep 2013 10:54:23 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327683 - in head: cad/salome databases/ldb databases/tdb devel/subversion devel/subversion16 devel/subversion17 devel/talloc devel/tevent graphics/digikam-kde4 lang/gnat-aux multimedia... Message-ID: <201309201054.r8KAsNKj073195@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Fri Sep 20 10:54:22 2013 New Revision: 327683 URL: http://svnweb.freebsd.org/changeset/ports/327683 Log: - Remove last vestiges of MAKE_JOBS_SAFE knob Approved by: portmgr (bapt) Modified: head/cad/salome/Makefile.ext head/databases/ldb/Makefile head/databases/tdb/Makefile head/devel/subversion/Makefile.common head/devel/subversion16/Makefile.common (contents, props changed) head/devel/subversion17/Makefile.common head/devel/talloc/Makefile head/devel/tevent/Makefile head/graphics/digikam-kde4/Makefile.common head/lang/gnat-aux/Makefile.common (contents, props changed) head/multimedia/mplayer/Makefile.shared head/net/opal3/Makefile head/net/samba4/Makefile Modified: head/cad/salome/Makefile.ext ============================================================================== --- head/cad/salome/Makefile.ext Fri Sep 20 10:21:11 2013 (r327682) +++ head/cad/salome/Makefile.ext Fri Sep 20 10:54:22 2013 (r327683) @@ -295,8 +295,6 @@ CXXFLAGS+= ${QSCIFLAGS} ${QTFLAGS} .include <bsd.port.pre.mk> -#MAKE_JOBS_SAFE= yes - .if ${SAL_MODULE} == "kernel" post-patch: . if ${PYTHON_REL} > 260 Modified: head/databases/ldb/Makefile ============================================================================== --- head/databases/ldb/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/databases/ldb/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -87,11 +87,9 @@ CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} _MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER} .endif -.endif USE_PYTHON_RUN= yes PLIST_FILES+= include/pyldb.h \ Modified: head/databases/tdb/Makefile ============================================================================== --- head/databases/tdb/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/databases/tdb/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -54,11 +54,9 @@ CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} _MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER} .endif -.endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON_RUN= yes Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Fri Sep 20 10:21:11 2013 (r327682) +++ head/devel/subversion/Makefile.common Fri Sep 20 10:54:22 2013 (r327683) @@ -12,7 +12,6 @@ DIST_SUBDIR= subversion18 MASTER_SITE_SUBDIR= subversion/:main \ lev/:book -MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled Modified: head/devel/subversion16/Makefile.common ============================================================================== --- head/devel/subversion16/Makefile.common Fri Sep 20 10:21:11 2013 (r327682) +++ head/devel/subversion16/Makefile.common Fri Sep 20 10:54:22 2013 (r327683) @@ -11,7 +11,6 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${E DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} -MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled Modified: head/devel/subversion17/Makefile.common ============================================================================== --- head/devel/subversion17/Makefile.common Fri Sep 20 10:21:11 2013 (r327682) +++ head/devel/subversion17/Makefile.common Fri Sep 20 10:54:22 2013 (r327683) @@ -12,7 +12,6 @@ DIST_SUBDIR= subversion17 MASTER_SITE_SUBDIR= subversion/:main \ lev/:book -MAKE_JOBS_SAFE= yes USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled Modified: head/devel/talloc/Makefile ============================================================================== --- head/devel/talloc/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/devel/talloc/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -48,11 +48,9 @@ CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} _MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER} .endif -.endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON_RUN= yes Modified: head/devel/tevent/Makefile ============================================================================== --- head/devel/tevent/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/devel/tevent/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -51,11 +51,9 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --bundled-libraries=!talloc .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} _MAKE_JOBS= --jobs=${MAKE_JOBS_NUMBER} .endif -.endif .if ${PORT_OPTIONS:MPYTHON} USE_PYTHON_RUN= yes Modified: head/graphics/digikam-kde4/Makefile.common ============================================================================== --- head/graphics/digikam-kde4/Makefile.common Fri Sep 20 10:21:11 2013 (r327682) +++ head/graphics/digikam-kde4/Makefile.common Fri Sep 20 10:54:22 2013 (r327683) @@ -117,7 +117,6 @@ USE_BZIP2= yes USES+= cmake USE_KDE4+= automoc4 kdehier kdeprefix kdelibs USE_QT4+= qmake_build moc_build rcc_build uic_build -MAKE_JOBS_SAFE= yes WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME} Modified: head/lang/gnat-aux/Makefile.common ============================================================================== --- head/lang/gnat-aux/Makefile.common Fri Sep 20 10:21:11 2013 (r327682) +++ head/lang/gnat-aux/Makefile.common Fri Sep 20 10:54:22 2013 (r327683) @@ -11,7 +11,6 @@ USE_BZIP2= yes USES= gmake iconv perl5 USE_PERL5= build ALL_TARGET= default -MAKE_JOBS_SAFE= yes SNAPSHOT= 20130412 GCC_BRANCH= 4.6 Modified: head/multimedia/mplayer/Makefile.shared ============================================================================== --- head/multimedia/mplayer/Makefile.shared Fri Sep 20 10:21:11 2013 (r327682) +++ head/multimedia/mplayer/Makefile.shared Fri Sep 20 10:54:22 2013 (r327683) @@ -47,5 +47,3 @@ CONFIGURE_ARGS= --cc="${CC}" \ WANT_GNOME= yes WANT_SDL= yes - -MAKE_JOBS_SAFE= yes Modified: head/net/opal3/Makefile ============================================================================== --- head/net/opal3/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/net/opal3/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -25,7 +25,6 @@ USE_BZIP2= yes USES= pathfix gmake pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes -#MAKE_JOBS_SAFE= yes CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Fri Sep 20 10:21:11 2013 (r327682) +++ head/net/samba4/Makefile Fri Sep 20 10:54:22 2013 (r327683) @@ -16,7 +16,6 @@ LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* - SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 SAMBA4_VERSION= 4.0.8 @@ -388,11 +387,9 @@ CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes .if !defined(DISABLE_MAKE_JOBS) && !defined(MAKE_JOBS_UNSAFE) -.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} _MAKE_JOBS+= --jobs=${MAKE_JOBS_NUMBER} .endif -.endif MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309201054.r8KAsNKj073195>