cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop whining about libiconv port module, and do not talk about

Browse Source 
devel/gettext as MODULES item, only as RUN_DEPENDS.

A better solution is in works.

Somewhat prodded by a different patch from tsg@/sthen@
This commit is contained in:
zhuk 2016-04-28 17:30:28 +00:00
parent f7002704c9
commit 135bd57d83
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
infrastructure/bin/portcheck
View File

@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: portcheck,v 1.109 2016/04/26 10:56:59 sthen Exp $
# $OpenBSD: portcheck,v 1.110 2016/04/28 17:30:28 zhuk Exp $
# Copyright (c) 2013 Vadim Zhukov
#
# Permission to use, copy, modify, and distribute this software for any
@ -1314,7 +1314,7 @@ check_plist() {
$translation_found && ! $gettext_dep && ! $is_static &&
[[ $fullpkgname != gettext-* ]] &&
err "${portref}translation file(s) found without" \
"devel/gettext dependency in MODULES or RUN_DEPENDS"
"devel/gettext dependency in RUN_DEPENDS"
# dbus,-suid
if $dbus_suid_dep_needed && ! $dbus_suid_dep; then
@ -1390,19 +1390,15 @@ check_plist() {
}
# Checks made:
# * devel/gettext and converters/libiconv MODULES are not forgotten.
# * devel/gettext dependency is not forgotten.
# * lib/kde/ and lib/kde4/ prefixes not missing where applicable.
# * stdc++ doesn't get into WANTLIB when gcc4.port.mk is used.
check_wantlib() {
local portref="$1"; shift
local modules="$1"; shift
local iconv_wantlib=false
local intl_wantlib=false
local phonon_s_wantlib=false
local gettext_module=false
local iconv_module=false
local kde3_module=false
local kde4_module=false
local phonon_module=false
@ -1411,8 +1407,6 @@ check_wantlib() {
local v
for v in $modules; do case $v in
converters/libiconv) iconv_module=true;;
devel/gettext) gettext_module=true;;
gcc4) gcc4_module=true;;
multimedia/phonon) phonon_module=true;;
x11/kde) kde3_module=true;;
@ -1420,14 +1414,6 @@ check_wantlib() {
esac; done
for v; do case $v in
iconv?(?(">")=+([0-9])))
iconv_wantlib=true
;;
intl?(?(">")=+([0-9])))
intl_wantlib=true
;;
phonon_s?(?(">")=+([0-9])))
phonon_s_wantlib=true
;;
@ -1463,12 +1449,6 @@ check_wantlib() {
fi
esac; done
if $intl_wantlib && ! $gettext_module; then
err "${portref}missing devel/gettext in MODULES"
elif $iconv_wantlib && ! $gettext_module && ! $iconv_module; then
err "${portref}missing converters/libiconv in MODULES"
fi
if $phonon_s_wantlib && ! $phonon_module; then
err "${portref}missing multimedia/phonon in MODULES"
fi

2
tests/portcheck/t5.sample
View File

@ -14,4 +14,4 @@ no distinfo in .
non-empty WANTLIB for arch-independent package
patches/patch-xyz does not have $OpenBSD$ RCS tag at the top
pkg/PLIST contains empty lines
translation file(s) found without devel/gettext dependency in MODULES or RUN_DEPENDS
translation file(s) found without devel/gettext dependency in RUN_DEPENDS