diff options
| author | marcus <marcus@FreeBSD.org> | 2005-07-03 12:52:12 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2005-07-03 12:52:12 +0800 |
| commit | c06060a25a77c3263f79e30d470dfc44aa1c4e22 (patch) | |
| tree | c5c8d1ce5fd8bdec47a0d0de34666f3c2ba6f3a3 | |
| parent | 8fd92ffda7cde4f55d7e0ee91e95d1f1c8451fc1 (diff) | |
| download | freebsd-ports-gnome-c06060a25a77c3263f79e30d470dfc44aa1c4e22.tar.gz freebsd-ports-gnome-c06060a25a77c3263f79e30d470dfc44aa1c4e22.tar.zst freebsd-ports-gnome-c06060a25a77c3263f79e30d470dfc44aa1c4e22.zip | |
Fix a mismerge in the last OPTIONS patch. I forgot a line, but perl -cw
didn't catch the missing ';'. This should fix the erroneous messages
about OPTIONS misuse.
| -rw-r--r-- | devel/portlint/Makefile | 1 | ||||
| -rw-r--r-- | devel/portlint/src/portlint.pl | 3 | ||||
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile index d562f8d2ced6..64d1b08a7a6e 100644 --- a/devel/portlint/Makefile +++ b/devel/portlint/Makefile @@ -9,6 +9,7 @@ PORTNAME= portlint PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl index a4938121a8e5..6f533a254a37 100644 --- a/devel/portlint/src/portlint.pl +++ b/devel/portlint/src/portlint.pl @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.78 2005/07/02 20:31:33 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.79 2005/07/03 04:49:07 marcus Exp $ # use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /; @@ -1115,6 +1115,7 @@ sub checkmakefile { my $lineno = &linenumber($`) + 1; &perror("FATAL: $file [$lineno]: option WITH(OUT)_$1 is used before ". "including bsd.port.pre.mk.") + if (scalar(@oopt) && $lineno < $pre_mk_line); } foreach my $i (@oopt) { if (!grep(/^$i$/, @mopt)) { diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index d562f8d2ced6..64d1b08a7a6e 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -9,6 +9,7 @@ PORTNAME= portlint PORTVERSION= 2.7.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index a4938121a8e5..6f533a254a37 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -17,7 +17,7 @@ # OpenBSD and NetBSD will be accepted. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.78 2005/07/02 20:31:33 marcus Exp $ +# $MCom: portlint/portlint.pl,v 1.79 2005/07/03 04:49:07 marcus Exp $ # use vars qw/ $opt_a $opt_A $opt_b $opt_C $opt_c $opt_h $opt_t $opt_v $opt_M $opt_N $opt_B $opt_V /; @@ -1115,6 +1115,7 @@ sub checkmakefile { my $lineno = &linenumber($`) + 1; &perror("FATAL: $file [$lineno]: option WITH(OUT)_$1 is used before ". "including bsd.port.pre.mk.") + if (scalar(@oopt) && $lineno < $pre_mk_line); } foreach my $i (@oopt) { if (!grep(/^$i$/, @mopt)) { |