Oops, committed to portcheck instead of portimport. This reverts
the accidental changes that need some discussion.
This commit is contained in:
parent
c477d718be
commit
1769aeb25d
@ -1,6 +1,6 @@
|
||||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: portcheck,v 1.51 2013/12/11 15:54:03 zhuk Exp $
|
||||
# $OpenBSD: portcheck,v 1.52 2013/12/11 16:07:44 zhuk Exp $
|
||||
# Copyright (c) 2013 Vadim Zhukov
|
||||
#
|
||||
# Permission to use, copy, modify, and distribute this software for any
|
||||
@ -561,7 +561,7 @@ check_port_dir() {
|
||||
check_distfiles "$dir" "$dist_subdir" $distfiles
|
||||
check_master_sites "$dir" $master_sites
|
||||
$pkg_exists && check_pkg_dir "$dir"/pkg "$subst_cmd"
|
||||
$existing_port || check_shlibs_versions "$dir" $shared_libs
|
||||
$existing_port || check_shlibs "$dir" $shared_libs
|
||||
|
||||
for _s in $multi_packages; do
|
||||
sub_checks "$dir" "$_s" "$fullpkgname" "${check_flavors[@]}"
|
||||
@ -585,8 +585,8 @@ check_newline_at_eof() {
|
||||
|
||||
# Checks made:
|
||||
# * Every library in SHARED_LIBS has 0.0 version.
|
||||
check_shlibs_versions() {
|
||||
$debugging && echo "CALLED: check_shlibs_versions($*)" >&2
|
||||
check_shlibs() {
|
||||
$debugging && echo "CALLED: check_shlibs($*)" >&2
|
||||
|
||||
local dir=$1; shift
|
||||
local lib
|
||||
@ -1345,10 +1345,8 @@ check_subst_vars() {
|
||||
# Checks made:
|
||||
# * Contains OpenBSD RCS tag at the top line.
|
||||
# * No REVISION marks present in given file (unless in update mode).
|
||||
# * No non-subpackaged REVISIONs in subpackaged port.
|
||||
# * BUILD_DEPENDS and MODULES are not defined in VAR-subpkg manner.
|
||||
# * No trailing whitespace.
|
||||
# * SHARED_LIBS are not defined inside ".if" statements.
|
||||
check_makefile() {
|
||||
$debugging && echo "CALLED: check_makefile($*)" >&2
|
||||
|
||||
@ -1358,13 +1356,8 @@ check_makefile() {
|
||||
egrep -q '^#[[:space:]]*\$OpenBSD.*\$' ||
|
||||
err "$F does not have \$OpenBSD\$ RCS tag at the top"
|
||||
|
||||
local l lnum=0 iflevel=0
|
||||
local tab="$(print '\t')"
|
||||
local l lnum=0
|
||||
while read -r l; do ((++lnum)); case $l in
|
||||
*(" ")REVISION-*)
|
||||
$existing_port ||
|
||||
err "REVISION mark found at $1:$lnum"
|
||||
;;
|
||||
*(" ")REVISION*)
|
||||
$existing_port ||
|
||||
err "REVISION mark found at $1:$lnum"
|
||||
@ -1372,17 +1365,6 @@ check_makefile() {
|
||||
*(" ")@(BUILD_DEPENDS|MODULES)-*)
|
||||
err "${l%%-*} is not a subpackageble variable, see $1:$lnum"
|
||||
;;
|
||||
*(" ").*(" "|"$tab")if*)
|
||||
((++iflevel))
|
||||
;;
|
||||
*(" ").*(" "|"$tab")endif*)
|
||||
((iflevel--))
|
||||
;;
|
||||
*(" ")SHARED_LIBS*(" "|"$tab")*(+|:|!)=*)
|
||||
if (($iflevel > 0)); then
|
||||
err "should not be inside .if block ($1:$lnum): $l"
|
||||
fi
|
||||
;;
|
||||
esac; done <"$1"
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user