Index: Mk/Uses/compiler.mk =================================================================== --- Mk/Uses/compiler.mk (revision 439254) +++ Mk/Uses/compiler.mk (working copy) @@ -67,11 +67,7 @@ .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/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) Index: Mk/Uses/fmake.mk =================================================================== --- Mk/Uses/fmake.mk (revision 439254) +++ Mk/Uses/fmake.mk (working copy) @@ -14,10 +14,8 @@ 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 Index: Mk/Uses/objc.mk =================================================================== --- Mk/Uses/objc.mk (revision 439254) +++ Mk/Uses/objc.mk (working copy) @@ -16,11 +16,7 @@ .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/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) Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 439254) +++ Mk/bsd.port.mk (working copy) @@ -1035,9 +1035,7 @@ 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 @@ .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 @@ _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: Index: databases/p5-DBD-cego/Makefile =================================================================== --- databases/p5-DBD-cego/Makefile (revision 439254) +++ databases/p5-DBD-cego/Makefile (working copy) @@ -16,11 +16,7 @@ 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} Index: devel/kBuild/Makefile =================================================================== --- devel/kBuild/Makefile (revision 439254) +++ devel/kBuild/Makefile (working copy) @@ -40,13 +40,8 @@ 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 Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile (revision 439254) +++ emulators/virtualbox-ose/Makefile (working copy) @@ -93,13 +93,8 @@ 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} \ Index: irc/ii/Makefile =================================================================== --- irc/ii/Makefile (revision 439254) +++ irc/ii/Makefile (working copy) @@ -15,9 +15,6 @@ 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 Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile (revision 439254) +++ lang/rust/Makefile (working copy) @@ -53,9 +53,7 @@ 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 Index: security/xmlsec1/Makefile =================================================================== --- security/xmlsec1/Makefile (revision 439254) +++ security/xmlsec1/Makefile (working copy) @@ -54,10 +54,6 @@ 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/' \