diff options
author | ak <ak@FreeBSD.org> | 2017-04-27 03:04:30 +0800 |
---|---|---|
committer | ak <ak@FreeBSD.org> | 2017-04-27 03:04:30 +0800 |
commit | 2f8c37f37f7248797891f59774ac72741b2b18b5 (patch) | |
tree | c119ef7886120593f69e838c87979a476096d9a1 | |
parent | 6ed4f9040f06fc33977b80dd4acc68ca41e6ce36 (diff) | |
download | freebsd-ports-gnome-2f8c37f37f7248797891f59774ac72741b2b18b5.tar.gz freebsd-ports-gnome-2f8c37f37f7248797891f59774ac72741b2b18b5.tar.zst freebsd-ports-gnome-2f8c37f37f7248797891f59774ac72741b2b18b5.zip |
- Remove checks for .PARSEDIR and vestiges of pmake support
PR: 218832
Approved by: portmgr (antoine)
-rw-r--r-- | Mk/Uses/compiler.mk | 8 | ||||
-rw-r--r-- | Mk/Uses/fmake.mk | 2 | ||||
-rw-r--r-- | Mk/Uses/objc.mk | 8 | ||||
-rw-r--r-- | Mk/bsd.port.mk | 11 | ||||
-rw-r--r-- | databases/p5-DBD-cego/Makefile | 6 | ||||
-rw-r--r-- | devel/kBuild/Makefile | 5 | ||||
-rw-r--r-- | emulators/virtualbox-ose/Makefile | 5 | ||||
-rw-r--r-- | irc/ii/Makefile | 3 | ||||
-rw-r--r-- | lang/rust/Makefile | 2 | ||||
-rw-r--r-- | security/xmlsec1/Makefile | 4 |
10 files changed, 1 insertions, 53 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index b4575f235573..b2b3acf7eb14 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -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) diff --git a/Mk/Uses/fmake.mk b/Mk/Uses/fmake.mk index 8209a56b4ff6..5afa3fc71d1a 100644 --- a/Mk/Uses/fmake.mk +++ b/Mk/Uses/fmake.mk @@ -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 diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 9934c92742a3..c055378a63bb 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -16,11 +16,7 @@ IGNORE= USES=objc only accepts no arguments or 'compiler' .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) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0515bf8f2eee..719aef6a1853 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1035,9 +1035,7 @@ FreeBSD_MAINTAINER= portmgr@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} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} \ .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} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPE _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: diff --git a/databases/p5-DBD-cego/Makefile b/databases/p5-DBD-cego/Makefile index 69022055fb7e..793ade8e5d6a 100644 --- a/databases/p5-DBD-cego/Makefile +++ b/databases/p5-DBD-cego/Makefile @@ -16,11 +16,7 @@ BUILD_DEPENDS= p5-DBI>=1.631:databases/p5-DBI 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} diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile index e10feb4bbba0..b6c563784a29 100644 --- a/devel/kBuild/Makefile +++ b/devel/kBuild/Makefile @@ -40,13 +40,8 @@ KBUILD_BINS= kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \ 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 diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index bddec644ff6c..65b05934c4c1 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -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} \ diff --git a/irc/ii/Makefile b/irc/ii/Makefile index 4a413306933c..215e328c0629 100644 --- a/irc/ii/Makefile +++ b/irc/ii/Makefile @@ -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 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 0de339f3a6e9..c98a7de559f5 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -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 diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index b4806d182efe..c4f0b9ab750b 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -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/' \ |