Move the check-shlibs target from bsd.pkg.mk to bsd.pkg.check.mk where

it will live with other "check" targets run after package installation.

Get rid of SHLIB_HANDLING, whose meaning had mutated over the years
from one thing to another.  Currently, it is used to basically note
whether the system's "ldd" command can be usefully run on the package's
binaries and libraries.  Rename this variable to CHECK_SHLIBS_SUPPORTED
for more clarity.

CHECK_SHLIBS is now a variable set exclusively by the user in /etc/mk.conf
to note whether the check for missing run-time search paths is performed
after a package is installed.  It defaults to "no" unless PKG_DEVELOPER
is set.

4 files changed, 24 insertions, 27 deletions

diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index bdab1f294b1..1c0b15960c3 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/22 09:22:13 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2006/05/22 22:22:04 jlam Exp $
 
 DISTNAME=	acroread	# Overridden below
 PKGNAME=	acroread-4.05
@@ -18,9 +18,8 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 LICENSE=	adobe-acrobat-license
 
-CHECK_SHLIBS=	NO
-NO_BUILD=	YES
-SHLIB_HANDLING=	NO
+CHECK_SHLIBS_SUPPORTED=	no
+NO_BUILD=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index fd7235b4cc4..c4ff548970b 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/05/22 08:19:06 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2006/05/22 22:22:04 jlam Exp $
 
 PKGNAME=	acroread3-3.01
 PKGREVISION=	2
@@ -16,8 +16,9 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 LICENSE=		adobe-acrobat-license
 
-WRKSRC=		${WRKDIR}
-NO_BUILD=	YES
+WRKSRC=			${WRKDIR}
+CHECK_SHLIBS_SUPPORTED=	no
+NO_BUILD=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,7 +29,6 @@ DEPENDS+=	suse_libc5>=6.3:../../emulators/${SUSE_DIR_PREFIX}_libc5
 DEPENDS+=	suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
 DISTNAME=	acroread_linux_301
 PLATFORM=	intellinux
-CHECK_SHLIBS=	no
 .  elif (${MACHINE_ARCH} == "alpha")
 .    if !exists(/emul/osf1/sbin/loader)
 PKG_FAIL_REASON+=	"${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index d84c8940ae3..a70e0fbcdc3 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/22 09:22:13 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2006/05/22 22:22:04 jlam Exp $
 
 DISTNAME=	acroread5	# Overridden below
 PKGNAME=	acroread5-5.10
@@ -15,17 +15,16 @@ CONFLICTS+=	acroread-5.*
 CONFLICTS+=	acroread-7.*
 CONFLICTS+=	acroread7-7.*
 
-RESTRICTED=	Original installer required to redistribute.
+RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-LICENSE=	adobe-acrobat-license
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+LICENSE=		adobe-acrobat-license
 
-WRKSRC=		${WRKDIR}/installers
-CHECK_SHLIBS=	NO
-NO_BUILD=	YES
-SHLIB_HANDLING=	NO
+WRKSRC=			${WRKDIR}/installers
+CHECK_SHLIBS_SUPPORTED=	no
+NO_BUILD=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index ab54773c774..da29ca85e4d 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 21:40:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:04 jlam Exp $
 
 DISTNAME=	acroread7	# Overridden below
 PKGNAME=	acroread7-7.0.5
@@ -15,17 +15,16 @@ CONFLICTS+=	acroread-5.*
 # maybe should do ALTERNATIVES?
 CONFLICTS+=	acroread5-5.*
 
-RESTRICTED=	Original installer required to redistribute.
+RESTRICTED=		Original installer required to redistribute.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-LICENSE=	adobe-acrobat-license
-
-WRKSRC=		${WRKDIR}/AdobeReader
-CHECK_SHLIBS=	NO
-NO_BUILD=	YES
-SHLIB_HANDLING=	NO
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+LICENSE=		adobe-acrobat-license
+
+WRKSRC=			${WRKDIR}/AdobeReader
+CHECK_SHLIBS_SUPPORTED=	NO
+NO_BUILD=		YES
 
 .include "../../mk/bsd.prefs.mk"