mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Update to 2.13.5.

Browse Source 
* Check for the direct assignment of BUILD_DEPENDS to RUN_DEPENDS [1]
* Add a deprecated pointer for USE_XPM. [2]
* CPPFLAGS is now passed to CONFIGURE_ENV automatically. [3]

PR:		154896 [1]
		155550 [3]
Submitted by:	eadler [2]
This commit is contained in:
Joe Marcus Clarke 2011-03-21 01:00:11 +00:00
parent 40691da394
commit fa0ae8e3fb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=271373
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports-mgmt/portlint/Makefile
View File

@ -8,8 +8,7 @@
#
PORTNAME= portlint
PORTVERSION= 2.13.4
PORTREVISION= 1
PORTVERSION= 2.13.5
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

20
ports-mgmt/portlint/src/portlint.pl
View File

@ -17,7 +17,7 @@
# OpenBSD and NetBSD will be accepted.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.212 2011/02/15 16:12:07 marcus Exp $
# $MCom: portlint/portlint.pl,v 1.216 2011/03/21 00:58:39 marcus Exp $
#
use strict;
@ -52,7 +52,7 @@ $portdir = '.';
# version variables
my $major = 2;
my $minor = 13;
my $micro = 4;
my $micro = 5;
sub l { '[{(]'; }
sub r { '[)}]'; }
@ -1750,6 +1750,7 @@ sub checkmakefile {
USE_RCORDER => 'USE_RC_SUBR',
INSTALLS_SHLIB => 'USE_LDCONFIG',
APACHE_COMPAT => 'USE_APACHE',
USE_XPM => 'USE_X11=xpm',
);
@deplist = (\%deprecated);
@ -2081,8 +2082,8 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
if ((defined($cflags) && $cflags =~ /-I/) ||
(defined($cxxflags) && $cxxflags =~ /-I/)) {
&perror("WARN", $file, -1, "Consider passing include paths ".
"to configure via CPPFLAGS environment variable ".
"i.e. CPPFLAGS=\"-I...\" in CONFIGURE_ENV)");
"to configure via the CPPFLAGS macro ".
"(i.e. CPPFLAGS=-I...)");
}
}
@ -2100,6 +2101,7 @@ ruby sed sh sort sysctl touch tr which xargs xmkmf
if ($configure_env =~ /(FC)=/ ||
$configure_env =~ /(F77)=/ ||
$configure_env =~ /(CPPFLAGS)=/ ||
$configure_env =~ /(FFLAGS)=/) {
&perror("FATAL", $file, -1, "$1 is already ".
"passed in CONFIGURE_ENV via bsd.gcc.mk. If you need to ".
@ -2765,6 +2767,16 @@ MAINTAINER COMMENT
if ($verbose);
$tmp = $sections[$idx];
# Check for direct assignment of BUILD_DEPENDS to RUN_DEPENDS.
if ($tmp =~ /\nRUN_DEPENDS=[ \t]*\${BUILD_DEPENDS}/) {
&perror("FATAL", $file, -1, "RUN_DEPENDS should not be set to ".
"\${BUILD_DEPENDS} as \${BUILD_DEPENDS} includes other ".
"implicit dependencies. Instead, copy the explicit dependencies ".
"from BUILD_DEPENDS to RUN_DEPENDS. See ".
"http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-depend.html#AEN2154 ".
"for more details.");
}
# NOTE: EXEC_DEPENDS is obsolete, so it should not be listed.
@linestocheck = qw(
EXTRACT_DEPENDS LIB_DEPENDS PATCH_DEPENDS BUILD_DEPENDS RUN_DEPENDS