svn commit: r439485 - in head: Mk Mk/Uses databases/p5-DBD-cego devel/kBuild emulators/virtualbox-ose irc/ii lang/rust security/xmlsec1
Alex Kozlov
ak at FreeBSD.org
Wed Apr 26 19:04:33 UTC 2017
Author: ak
Date: Wed Apr 26 19:04:30 2017
New Revision: 439485
URL: https://svnweb.freebsd.org/changeset/ports/439485
Log:
- Remove checks for .PARSEDIR and vestiges of pmake support
PR: 218832
Approved by: portmgr (antoine)
Modified:
head/Mk/Uses/compiler.mk
head/Mk/Uses/fmake.mk
head/Mk/Uses/objc.mk
head/Mk/bsd.port.mk
head/databases/p5-DBD-cego/Makefile
head/devel/kBuild/Makefile
head/emulators/virtualbox-ose/Makefile
head/irc/ii/Makefile
head/lang/rust/Makefile
head/security/xmlsec1/Makefile
Modified: head/Mk/Uses/compiler.mk
==============================================================================
--- head/Mk/Uses/compiler.mk Wed Apr 26 18:46:35 2017 (r439484)
+++ head/Mk/Uses/compiler.mk Wed Apr 26 19:04:30 2017 (r439485)
@@ -67,11 +67,7 @@ _COMPILER_ARGS+= features
.endif
_CCVERSION!= ${CC} --version
-.if defined(.PARSEDIR)
COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
-.else
-COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u}
-.endif
.if ${_CCVERSION:Mclang}
COMPILER_TYPE= clang
.else
@@ -89,11 +85,7 @@ _ALTCCVERSION!= /usr/bin/clang --version
_ALTCCVERSION!= /usr/bin/gcc --version
.endif
-.if defined(.PARSEDIR)
ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
-.else
-ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u}
-.endif
.if ${_ALTCCVERSION:Mclang}
ALT_COMPILER_TYPE= clang
.elif !empty(_ALTCCVERSION)
Modified: head/Mk/Uses/fmake.mk
==============================================================================
--- head/Mk/Uses/fmake.mk Wed Apr 26 18:46:35 2017 (r439484)
+++ head/Mk/Uses/fmake.mk Wed Apr 26 19:04:30 2017 (r439485)
@@ -14,10 +14,8 @@ _INCLUDE_USES_FMAKE_MK= yes
IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments
.endif
-.if defined(.PARSEDIR)
FMAKE= ${LOCALBASE}/bin/fmake
BUILD_DEPENDS+= ${FMAKE}:devel/fmake
CONFIGURE_ENV+= MAKE=${FMAKE}
MAKE_CMD= ${FMAKE}
.endif
-.endif
Modified: head/Mk/Uses/objc.mk
==============================================================================
--- head/Mk/Uses/objc.mk Wed Apr 26 18:46:35 2017 (r439484)
+++ head/Mk/Uses/objc.mk Wed Apr 26 19:04:30 2017 (r439485)
@@ -16,11 +16,7 @@ IGNORE= USES=objc only accepts no argume
.endif
_CCVERSION!= ${CC} --version
-.if defined(.PARSEDIR)
COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
-.else
-COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u}
-.endif
.if ${_CCVERSION:Mclang}
COMPILER_TYPE= clang
.else
@@ -36,11 +32,7 @@ _ALTCCVERSION!= /usr/bin/clang --version
_ALTCCVERSION!= /usr/bin/gcc --version
.endif
-.if defined(.PARSEDIR)
ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
-.else
-ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u}
-.endif
.if ${_ALTCCVERSION:Mclang}
ALT_COMPILER_TYPE= clang
.elif !empty(_ALTCCVERSION)
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Wed Apr 26 18:46:35 2017 (r439484)
+++ head/Mk/bsd.port.mk Wed Apr 26 19:04:30 2017 (r439485)
@@ -1035,9 +1035,7 @@ FreeBSD_MAINTAINER= portmgr at FreeBSD.org
LANG= C
LC_ALL= C
-.if defined(.PARSEDIR)
.export LANG LC_ALL
-.endif
# These need to be absolute since we don't know how deep in the ports
# tree we are and thus can't go relative. They can, of course, be overridden
@@ -1065,9 +1063,6 @@ _PORTS_DIRECTORIES+= ${PKG_DBDIR} ${PREF
.include "${PORTSDIR}/Mk/bsd.commands.mk"
.if defined(CROSS_TOOLCHAIN)
-.if !defined(.PARSEDIR)
-IGNORE= Cross building can only be done when using bmake(1) as make(1)
-.endif
.if !defined(CROSS_SYSROOT)
IGNORE= CROSS_SYSROOT should be defined
.endif
@@ -3854,14 +3849,8 @@ _UNIFIED_DEPENDS=${PKG_DEPENDS} ${EXTRAC
_DEPEND_SPECIALS= ${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,}
.for d in ${_UNIFIED_DEPENDS:M*\:/*}
-# Fight .for variable interpolation differently for each version of make...
-.if defined(.PARSEDIR)
_PORTSDIR_STR= $${PORTSDIR}/
DEV_WARNING+= "It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it."
-.else
-_PORTSDIR_STR= $$$${PORTSDIR}/
-DEV_WARNING+= "It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it."
-.endif
.endfor
all-depends-list:
Modified: head/databases/p5-DBD-cego/Makefile
==============================================================================
--- head/databases/p5-DBD-cego/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/databases/p5-DBD-cego/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -16,11 +16,7 @@ BUILD_DEPENDS= p5-DBI>=1.631:databases/p
RUN_DEPENDS= p5-DBI>=1.631:databases/p5-DBI
LIB_DEPENDS= libcego.so:databases/cego
-.if defined(.PARSEDIR)
-USES= gmake
-.endif
-
-USES+= perl5
+USES= gmake perl5
USE_PERL5= configure
CC:= ${CXX}
Modified: head/devel/kBuild/Makefile
==============================================================================
--- head/devel/kBuild/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/devel/kBuild/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -40,13 +40,8 @@ KBUILD_BINS= kDepIDB kDepPre kObjCache k
PORTDOCS= QuickReference-kmk.html \
QuickReference-kmk.txt
-# bmake doesn't know about unsetenv=true
-.if defined(.PARSEDIR)
ENV=
.export ENV
-.else
-.SHELL: path="/bin/sh" unsetenv=true
-.endif
OPTIONS_DEFINE= DOCS
Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/emulators/virtualbox-ose/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -93,13 +93,8 @@ VPX_CONFIGURE_OFF= --disable-libvpx
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
X11_CONFIGURE_OFF= --build-headless
-# bmake doesn't know about unsetenv=true
-.if defined(.PARSEDIR)
ENV=
.export ENV
-.else
-.SHELL: path="/bin/sh" unsetenv=true
-.endif
PLIST_SUB= GUEST_VER=${PORTVERSION} \
PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
Modified: head/irc/ii/Makefile
==============================================================================
--- head/irc/ii/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/irc/ii/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -15,9 +15,6 @@ LICENSE= MIT
PLIST_FILES= bin/ii man/man1/ii.1.gz
PORTDOCS= CHANGES FAQ README
PORTEXAMPLES= query.sh
-.if !defined(.PARSEDIR)
-MAKE_ARGS= -E CC
-.endif
OPTIONS_DEFINE= DOCS EXAMPLES
Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/lang/rust/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -53,9 +53,7 @@ CARGO_BOOTSTRAP_VERSION?= nightly
CARGO_BOOTSTRAP= ${CARGO_BOOTSTRAP_DIR}/cargo-${CARGO_BOOTSTRAP_VERSION}-${RUST_TARGET}.tar.gz
CARGO_REGISTRY= ${PORTNAME}-registry-${DISTVERSIONFULL}.tar.xz
-.if defined(.PARSEDIR) # fixes |make describe| on 9.x (which is BROKEN)
RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//}
-.endif
# Rust's target arch string is different from *BSD arch strings
RUST_ARCH_x86_64= x86_64 # dragonfly
Modified: head/security/xmlsec1/Makefile
==============================================================================
--- head/security/xmlsec1/Makefile Wed Apr 26 18:46:35 2017 (r439484)
+++ head/security/xmlsec1/Makefile Wed Apr 26 19:04:30 2017 (r439485)
@@ -54,10 +54,6 @@ NSS_LIB_DEPENDS= libnss3.so:security/nss
libplds4.so:devel/nspr \
libplc4.so:devel/nspr
-.if !defined(.PARSEDIR)
-MAKE_ARGS+= -EABS_BUILDDIR
-.endif
-
post-patch-GNUTLS-on:
# Don't rely on broken autodetection
@${REINPLACE_CMD} -e '/^GNUTLS_FOUND/s/no/yes/' \
More information about the svn-ports-all
mailing list