Framework: partially sync with upstream

Taken from: FreeBSD
opnsense2 · Feb 6, 2017 · 5686d14 · 5686d14
1 parent 12f1e29
commit 5686d14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/MOVED b/MOVED
@@ -9058,3 +9058,6 @@ devel/p5-IO-Detect|devel/p5-Scalar-Does|2017-01-31|Has expired: Use devel/p5-Sca
 devel/pear-PHPUnit3|devel/phpunit|2017-01-31|Has expired: Deprecated by upstream, use devel/phpunit instead
 devel/rubygem-bio|biology/rubygem-bio|2017-02-05|Move to a better place
 devel/libcheck|devel/check|2017-02-05|Rename to match upstream naming
+devel/p5-JIRA-Client||2017-02-05|Has expired: Deprecated by upstream due to deprecated JIRA's SOAP API
+sysutils/puppet37||2017-02-05|Has expired: Upstream support ended, see http://tinyurl.com/puppet3eol
+net-im/ttytter||2017-02-05|Has expired: Upstream no longer active, see net-im/oysttyer
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
@@ -41,7 +41,7 @@ FPC_DEFAULT?=		3.0.0
 GCC_DEFAULT?=		4.9
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
-.if defined(ARCH) && ${ARCH} == amd64
+.if ${ARCH} == amd64
 # Possible values: c6, c6_64, c7
 LINUX_DEFAULT?=		c6_64
 .else

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
@@ -1266,8 +1266,6 @@ GROUPS_BLACKLIST=	_dhcp _pflogd _ypldap audit authpf bin bind daemon dialer ftp
 LDCONFIG_DIR=	libdata/ldconfig
 LDCONFIG32_DIR=	libdata/ldconfig32
 
-.endif
-
 # At least KDE needs TMPDIR for the package building,
 # so we're setting it to the known default value.
 .if defined(PACKAGE_BUILDING)
@@ -1280,9 +1278,13 @@ WITH_DEBUG=	yes
 .endif
 .endif
 
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .include "${PORTSDIR}/Mk/bsd.hardening.mk"
 .include "${PORTSDIR}/Mk/bsd.options.mk"
 
+.endif
+# End of options section.
+
 # Start of pre-makefile section.
 .if !defined(AFTERPORTMK) && !defined(INOPTIONSMK)
 
@@ -1292,8 +1294,6 @@ WITH_DEBUG=	yes
 
 _PREMKINCLUDED=	yes
 
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
 .if defined(PORTVERSION)
 .if ${PORTVERSION:M*[-_,]*}x != x
 IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','

diff --git a/Tools/scripts/chkversion.pl b/Tools/scripts/chkversion.pl
@@ -127,7 +127,6 @@ sub readfrom {
     my @cachedenv = readfrom $portsdir, $make, "-V$_";
     $ENV{$_} = $cachedenv[0];
 }
-$ENV{WITH_OPENSSL_BASE} = 'yes';
 
 my %pkgname;
 my %pkgorigin;