diff options
| author | jlam <jlam> | 2006-05-22 22:22:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-05-22 22:22:02 +0000 |
| commit | c534f2167664e9746737a15a375724fdf1455d5e (patch) | |
| tree | ca98d60e91b0d89b789e521e62fea00e9c068707 | |
| parent | 60e5ffaa4fc2a320e32b01fb6dedf22aaa79288e (diff) | |
| download | pkgsrc-c534f2167664e9746737a15a375724fdf1455d5e.tar.gz | |
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.
54 files changed, 163 insertions, 184 deletions
diff --git a/archivers/rar-bin/Makefile b/archivers/rar-bin/Makefile index b9aab174d9f..225ad1bd0e0 100644 --- a/archivers/rar-bin/Makefile +++ b/archivers/rar-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/03/03 22:36:09 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= rarlinux-3.5.1 @@ -28,7 +28,6 @@ DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat NO_BUILD= YES NO_CONFIGURE= YES -CHECK_SHLIBS= NO INSTALLATION_DIRS= bin lib diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile index 8aa2f239e28..3d861bf094f 100644 --- a/archivers/stuffit/Makefile +++ b/archivers/stuffit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/04/22 09:22:05 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2006/05/22 22:22:02 jlam Exp $ DISTNAME= stuffit520.611linux-i386 PKGNAME= stuffit-5.2.0.611 @@ -25,7 +25,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR} -CHECK_SHLIBS= NO NO_CONFIGURE= yes NO_BUILD= yes diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile index 59c775032c9..dd318933f04 100644 --- a/archivers/unace-bin/Makefile +++ b/archivers/unace-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/05/17 06:12:27 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= linunace25 @@ -28,7 +28,6 @@ DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat NO_BUILD= YES NO_CONFIGURE= YES -CHECK_SHLIBS= NO INSTALLATION_DIRS= bin diff --git a/cad/eagle/Makefile b/cad/eagle/Makefile index 0bffd93cb70..454634006c7 100644 --- a/cad/eagle/Makefile +++ b/cad/eagle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/04/22 09:22:06 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= eagle-lin-eng-4.14 @@ -19,7 +19,6 @@ DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 .endif ONLY_FOR_PLATFORM= *-*-i386 -CHECK_SHLIBS= NO # this is Linux software RESTRICTED= Redistribution not permitted LICENSE= fee-based-commercial-use diff --git a/chat/aim/Makefile b/chat/aim/Makefile index 5436cdaeb7b..6389c2855ce 100644 --- a/chat/aim/Makefile +++ b/chat/aim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:23 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:02 jlam Exp $ DISTNAME= aim-1.5.286 PKGREVISION= 1 @@ -33,7 +33,6 @@ DEPENDS+= suse_gtk>=${SUSE_VERSION}:../../emulators/${SUSE_DIR_PREFIX}_gtk ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR} -CHECK_SHLIBS= NO NO_BUILD= YES EXTRACT_ONLY= # nothing diff --git a/chat/ymessenger/Makefile b/chat/ymessenger/Makefile index c9b5989dac4..8e0821b6f87 100644 --- a/chat/ymessenger/Makefile +++ b/chat/ymessenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/05/02 14:13:11 gdt Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:02 jlam Exp $ DISTNAME= ymessenger-1.0.4 CATEGORIES= chat @@ -23,8 +23,6 @@ DEPENDS+= suse_gdk-pixbuf>=6.4:../../emulators/${SUSE_DIR_PREFIX}_gdk-pixbuf ONLY_FOR_PLATFORM= *-*-i386 -CHECK_SHLIBS= no - DIST_SUBDIR= . LICENSE= generic-nonlicense diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile index 3afccf8a32e..f58789615f6 100644 --- a/cross/i386-linux/Makefile +++ b/cross/i386-linux/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:07 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2006/05/22 22:22:02 jlam Exp $ # DISTVERSION= 2.0.7.1 @@ -12,7 +12,7 @@ COMMENT= Cross-compile environment for iX86 Linux, libc v6 BUILD_DEPENDS+= rpm-[0-9]*:../../misc/rpm -CHECK_SHLIBS= no +CHECK_SHLIBS_SUPPORTED= no WRKSRC= ${WRKDIR} USE_CROSS_BINUTILS= yes diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile index 3bf448e1f81..8d6a9a92121 100644 --- a/devel/eclipse/Makefile +++ b/devel/eclipse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/02/06 22:51:09 abs Exp $ +# $NetBSD: Makefile,v 1.20 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV} @@ -39,8 +39,8 @@ INSTALLATION_DIRS= bin do-build: cd ${WRKDIR} && ${MAKE_ENV} ${SH} build -os linux -ws motif -arch x86 .else -NO_BUILD= yes -CHECK_SHLIBS= NO +NO_BUILD= yes +CHECK_SHLIBS_SUPPORTED= no do-extract: ${MKDIR} ${WRKDIR}/result diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile index 43d67ba8ab7..65a565ddb7c 100644 --- a/devel/pvs/Makefile +++ b/devel/pvs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/05/13 03:44:23 minskim Exp $ +# $NetBSD: Makefile,v 1.29 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= pvs-${VERSION} @@ -22,8 +22,7 @@ DEPENDS+= tk>=8.0:../../x11/tk WRKSRC= ${WRKDIR} VERSION= 3.2 NO_BUILD= yes -CHECK_SHLIBS= NO -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no INFO_FILES= # PLIST TEX_ACCEPTED= teTeX2 teTeX3 diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile index a34da03361a..b7cf006fd05 100644 --- a/emulators/compat12/Makefile +++ b/emulators/compat12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat12-${MACHINE_ARCH} @@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-ns32k \ NO_BUILD= yes NO_MTREE= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index 77b43164d67..f4c2b523efd 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/03/14 01:14:27 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat13-${MACHINE_ARCH}${PKGMINOR} @@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile index 3d86b1cf952..6022c78bbc9 100644 --- a/emulators/compat14-crypto/Makefile +++ b/emulators/compat14-crypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat14-crypto-${MACHINE_ARCH}-${VERSION} @@ -22,7 +22,7 @@ CRYPTO= YES NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile index 2fc10b63203..310180524b1 100644 --- a/emulators/compat14/Makefile +++ b/emulators/compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:02 jlam Exp $ # DISTNAME= compat14-${MACHINE_ARCH}-${VERSION} @@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= NetBSD-1.3*-* NetBSD-1.4*-* NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile index 798ef4185a4..08193f88ef7 100644 --- a/emulators/compat16/Makefile +++ b/emulators/compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= compat16-${MACHINE_ARCH}-${VERSION} @@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.6[A-Z]*-i386 NetBSD-[2-9]*-i386 NO_MTREE= yes NO_BUILD= yes NO_CONFIGURE= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no EMULSUBDIR= emul/netbsd16 diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile index b1877327807..84d8845bcd5 100644 --- a/emulators/linuxppc_lib/Makefile +++ b/emulators/linuxppc_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:01 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2006/05/22 22:22:03 jlam Exp $ DISTNAME= linuxppc_lib-2000.4.6 PKGREVISION= 1 @@ -27,8 +27,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \ NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc WRKSRC= ${WRKDIR}/${DISTNAME} -SHLIB_HANDLING= NO -CHECK_SHLIBS= NO +CHECK_SHLIBS_SUPPORTED= no DIST_SUBDIR= linuxppc_lib PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/emulators/m1/Makefile b/emulators/m1/Makefile index cffc15f1799..b665d5bd609 100644 --- a/emulators/m1/Makefile +++ b/emulators/m1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:02 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= m1074b2-lnx @@ -22,7 +22,6 @@ ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR}/m1-0.7.4 NO_BUILD= yes -CHECK_SHLIBS= no INSTALLATION_DIRS= bin diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile index 943ff88ff7c..b75ad964c88 100644 --- a/emulators/netbsd32_compat14/Makefile +++ b/emulators/netbsd32_compat14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= compat14-${MACHINE32_ARCH}-${VERSION} @@ -28,7 +28,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} FILES_SUBST+= COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q} diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile index ef41429b455..c932bd5b17c 100644 --- a/emulators/netbsd32_compat15/Makefile +++ b/emulators/netbsd32_compat15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-sparc64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} FILES_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile index 71387c927f8..8caad2b3c16 100644 --- a/emulators/netbsd32_compat16/Makefile +++ b/emulators/netbsd32_compat16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ # .if ${MACHINE_ARCH} == "sparc64" @@ -31,7 +31,7 @@ ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64 NO_MTREE= yes NO_BUILD= yes -SHLIB_HANDLING= NO +CHECK_SHLIBS_SUPPORTED= no FILES_SUBST+= COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q} FILES_SUBST+= MACHINE_ARCH=${MACHINE_ARCH:Q} diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile index 454874ba25a..79a9c7c6c67 100644 --- a/emulators/osf1_lib/Makefile +++ b/emulators/osf1_lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:08 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:03 jlam Exp $ DISTNAME= netscape-4.7-3.alpha PKGNAME= osf1_lib-1.1 @@ -34,8 +34,7 @@ DEINSTALL_SRC= # empty RPMARGS= -i usr/lib -i usr/bin ${DISTDIR}/${DISTFILES} -CHECK_SHLIBS= no -SHLIB_HANDLING= no +CHECK_SHLIBS_SUPPORTED= no .include "../../mk/x11.buildlink3.mk" diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 013b80fb609..f81390ac8ed 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/10 23:45:14 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2006/05/22 22:22:03 jlam Exp $ DISTNAME= ski-0.9.81-l6-i686 PKGNAME= ski-0.9.81.6 @@ -25,7 +25,6 @@ DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 WRKSRC= ${WRKDIR} INTERACTIVE_STAGE= fetch extract -CHECK_SHLIBS= NO NO_BUILD= YES DOWNLOAD= http://www.hpl.hp.com/research/linux/ski/download.php diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index 83dc9a93be4..7eae8b8cab0 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.application,v 1.18 2006/03/09 20:42:38 tonio Exp $ +# $NetBSD: Makefile.application,v 1.19 2006/05/22 22:22:03 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -28,4 +28,10 @@ USE_NATIVE_LINUX= # empty SUSE_DIR_PREFIX= suse SUSE_VERSION= 0 PKG_SKIP_REASON+= "${PKGNAME} requires compat_linux, which is not available for ${MACHINE_PLATFORM}" +# +# By default, we can't check for missing shared libraries nor note which +# shared libraries are provided and/or required by the package since the +# library support is via syscall emulation. +# +CHECK_SHLIBS_SUPPORTED?= no .endif diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile index 6540cfdce0d..c7964c3e182 100644 --- a/emulators/vmware/Makefile +++ b/emulators/vmware/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:37 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/05/22 22:22:03 jlam Exp $ DISTNAME= VMware-2.0.4-1142 PKGNAME= vmware-2.0.4 @@ -25,7 +25,6 @@ DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license WRKSRC= ${WRKDIR}/vmware-distrib -CHECK_SHLIBS= NO ONLY_FOR_PLATFORM= NetBSD-*-i386 diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 1cd4e813429..b5d674a6ce3 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/26 21:37:12 veego Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:03 jlam Exp $ DISTNAME= VMware-workstation-3.2.1-2242 PKGNAME= vmware-3.2.1pl1 @@ -30,7 +30,6 @@ DEPENDS+= suse_vmware>=6.4nb1:../../emulators/${SUSE_DIR_PREFIX}_vmware LICENSE= vmware-license WRKSRC= ${WRKDIR}/vmware-distrib -CHECK_SHLIBS= NO ONLY_FOR_PLATFORM= NetBSD-*-i386 # There is a kernel bug in NetBSD 3.0 for vmware. diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile index 38fc5494e8d..02d972cb14e 100644 --- a/emulators/xyame/Makefile +++ b/emulators/xyame/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/05 23:09:05 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= xyame038 @@ -21,8 +21,6 @@ WRKSRC= ${WRKDIR} NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no - ONLY_FOR_PLATFORM+= *-*-i386 INSTALLATION_DIRS= bin man/man6 diff --git a/games/adom/Makefile b/games/adom/Makefile index 729d47c58e4..07339edca63 100644 --- a/games/adom/Makefile +++ b/games/adom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:12 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= adom-111-elf @@ -16,7 +16,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386 WRKSRC= ${WRKDIR}/adom NO_BUILD= YES NO_CONFIGURE= YES -CHECK_SHLIBS= NO .include "../../emulators/suse_linux/Makefile.application" diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index ff716ca74f8..4a7442d53ed 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:09:21 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/05/22 22:22:03 jlam Exp $ DISTNAME= linuxq3apoint-1.32b.x86 PKGREVISION= 2 @@ -25,7 +25,6 @@ DEPENDS+= suse_glx>=6.4:../../emulators/${SUSE_DIR_PREFIX}_glx NO_SRC_ON_FTP= no NO_BIN_ON_FTP= no NO_CONFIGURE= yes -CHECK_SHLIBS= NO USE_TOOLS+= gtar gunzip tail diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile index 6a8566f6729..ab935a09338 100644 --- a/games/rollemup/Makefile +++ b/games/rollemup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/03/11 04:36:59 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2006/05/22 22:22:03 jlam Exp $ DISTNAME= Rollemup PKGNAME= rollemup-1.0 @@ -39,7 +39,6 @@ ONLY_FOR_PLATFORM= *-*-i386 .if ${OPSYS} == "NetBSD" DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11 -CHECK_SHLIBS= no .endif INSTALLATION_DIRS= bin diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile index 68dd6e64140..e494486d024 100644 --- a/games/rtcw/Makefile +++ b/games/rtcw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:09 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:03 jlam Exp $ DISTNAME= wolf-linux-1.33.x86 PKGNAME= rtcw-1.33 @@ -14,7 +14,6 @@ COMMENT= Return to Castle Wolfenstein for Linux ONLY_FOR_PLATFORM= *-*-i386 NOT_FOR_PLATFORM= NetBSD-*-* -CHECK_SHLIBS= no NO_BUILD= yes RTCWDIR= ${PREFIX}/lib/lokigames/rtcw RESTRICTED= Size; the data set is much too big diff --git a/graphics/ns-cult3d/Makefile b/graphics/ns-cult3d/Makefile index 6f280bd2f41..1f70761b607 100644 --- a/graphics/ns-cult3d/Makefile +++ b/graphics/ns-cult3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:21 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= Cult3D_NS4_5.2b1 @@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR}/cult3d-5.2-b1-linux-x86 NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no +CHECK_SHLIBS_SUPPORTED= no CRYPTO= yes do-install: diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile index be6b23ba984..a69bd5cc499 100644 --- a/lang/Cg-compiler/Makefile +++ b/lang/Cg-compiler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:43 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/05/22 22:22:03 jlam Exp $ # DISTNAME= CgLinux-1.3.0408-0400 @@ -14,7 +14,6 @@ COMMENT= NVIDIA Cg Compiler for Linux ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR} -CHECK_SHLIBS= no NO_BUILD= yes .include "../../mk/bsd.prefs.mk" diff --git a/lang/blackdown-jre13/Makefile.common b/lang/blackdown-jre13/Makefile.common index 18a8c073ad1..3a2a7ef1336 100644 --- a/lang/blackdown-jre13/Makefile.common +++ b/lang/blackdown-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2006/04/30 16:43:59 joerg Exp $ +# $NetBSD: Makefile.common,v 1.26 2006/05/22 22:22:03 jlam Exp $ # RELVERSION= 1.3.1 @@ -38,8 +38,8 @@ NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} -WRKSRC= ${WRKDIR}/${BD_BASENAME}${RELVERSION} -CHECK_SHLIBS= NO # This would use NetBSD ldd on Linux shlibs. +WRKSRC= ${WRKDIR}/${BD_BASENAME}${RELVERSION} +CHECK_SHLIBS_SUPPORTED= no .include "../../mk/bsd.prefs.mk" diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index 0e603b59659..51826d9e84b 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2006/04/22 09:22:10 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2006/05/22 22:22:04 jlam Exp $ # VERSION= 1.1.8 @@ -34,8 +34,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST MESSAGE_SUBST+= JAVA_HOME=${JAVA_HOME:Q} -CHECK_SHLIBS= no - +CHECK_SHLIBS_SUPPORTED= no ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 RESTRICTED= No redistribution of the Java(tm) Development Kit diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile index b1b865a2053..cde6bdc9876 100644 --- a/lang/mit-scheme-bin/Makefile +++ b/lang/mit-scheme-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/04/13 21:37:29 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2006/05/22 22:22:04 jlam Exp $ # DISTNAME= mit-scheme-7.7.1-ix86-gnu-linux @@ -12,11 +12,7 @@ COMMENT= MIT/GNU Scheme (Linux binary) DEPENDS+= suse_base>=6.0:../../emulators/${SUSE_DIR_PREFIX}_base -WRKSRC= ${WRKDIR} - -CHECK_SHLIBS= NO -SHLIB_HANDLING= NO - +WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin do-build: diff --git a/misc/latin-words-bin/Makefile b/misc/latin-words-bin/Makefile index f37ed5e64c1..4efe2e237ea 100644 --- a/misc/latin-words-bin/Makefile +++ b/misc/latin-words-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:12 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/05/22 22:22:04 jlam Exp $ # DISTNAME= words-1.97-linux @@ -12,9 +12,7 @@ HOMEPAGE= http://users.erols.com/whitaker/wordslux.htm COMMENT= Latin-to-English dictionary program (Linux binary) WRKSRC= ${WRKDIR}/words-1.97 -NO_CONFIGURE= YES - -CHECK_SHLIBS= NO +NO_CONFIGURE= YES .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index 23c3cc7f9cc..4c564abf9ce 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:10:13 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/22 22:22:04 jlam Exp $ PKGNAME= openoffice-bin-${OO_VER} PKGREVISION= 2 @@ -33,7 +33,7 @@ ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 ONLY_FOR_PLATFORM+= SunOS-*-* TEMP?= ${WRKDIR} -CHECK_SHLIBS= no +CHECK_SHLIBS_SUPPORTED= no .include "../../mk/bsd.prefs.mk" diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile index cad68cefded..95f3d850057 100644 --- a/misc/openoffice2-bin/Makefile +++ b/misc/openoffice2-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/14 01:14:31 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/05/22 22:22:04 jlam Exp $ PKGNAME= openoffice-bin-2.0.2 CATEGORIES= misc @@ -31,7 +31,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 DragonFly-*-i386 TEMP?= ${WRKSRC} -CHECK_SHLIBS= no +CHECK_SHLIBS_SUPPORTED= no PLIST_SRC= ${PKGDIR}/PLIST.proglinks PLIST_SRC+= ${WRKDIR}/PLIST diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index abd1b6bf0c5..19fb74708ac 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.34 2006/05/22 16:54:54 joerg Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.35 2006/05/22 22:22:02 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the various install-time "check" @@ -13,6 +13,10 @@ # CHECK_FILES_STRICT makes the file checks very strict on errors if # it is any value other than "no". Defaults to "no". # +# CHECK_SHLIBS checks that all shared libraries that are used by +# binaries and shared libraries within the package can be found +# at run-time. Defaults to "no". +# # CHECK_WRKREF is a list of options that trigger the checks for # ${WRKDIR} or ${TOOLS_DIR} in the package's installed files. # Valid values are "work", which checks for ${WRKDIR}, and @@ -21,6 +25,13 @@ # CHECK_INTERPRETER can be set to "yes" to check that installed # #!-scripts will find their interpreter. # +# The following variables may be set by a package and control which +# checks can be run: +# +# CHECK_SHLIBS_SUPPORTED notes whether the package supports running +# the check-shlibs target. Defaults to "yes", but is often set +# to "no" for syscall-emulation packages. +# # The following targets are defined by bsd.pkg.check.mk: # # check-files-pre & check-files-post generate the list of files on the @@ -39,13 +50,15 @@ # For PKG_DEVELOPERs, cause some checks to be run automatically by default. .if defined(PKG_DEVELOPER) -CHECK_WRKREF?= tools CHECK_FILES?= yes +CHECK_WRKREF?= tools +CHECK_SHLIBS?= yes .endif CHECK_FILES?= no CHECK_FILES_STRICT?= no CHECK_WRKREF?= no +CHECK_SHLIBS?= no CHECK_INTERPRETER?= no USE_TOOLS+= awk cat cmp diff echo find grep rm sed test \ @@ -469,3 +482,45 @@ check-interpreter: fi; \ done; \ exit $$exitcode; } + +########################################################################### +### check-shlibs ########################################################## +########################################################################### + +# All binaries and shared libraries. +_CHECK_SHLIBS_ERE= /(bin/|sbin/|libexec/|lib/lib.*\.so|lib/lib.*\.dylib) + +CHECK_SHLIBS_SUPPORTED?= yes + +########################################################################### +# check-shlibs target +# +.PHONY: check-shlibs +check-shlibs: +.if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS]) && !defined(NO_PKG_REGISTER) + ${_PKG_SILENT}${_PKG_DEBUG}${STEP_MSG} \ + "Checking for missing run-time search paths in ${PKGNAME}" + ${_PKG_SILENT}${_PKG_DEBUG} \ + case ${LDD:Q}"" in \ + "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \ + *) ldd=${LDD:Q} ;; \ + esac; \ + ${TEST} -x "$$ldd" || exit 0; \ + ${PKG_INFO} -qL ${PKGNAME} | \ + { ${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} || ${TRUE}; } | \ + { while read file; do \ + ${TEST} -z ${PKG_VERBOSE:Q}"" || ${ECHO} "$$ldd $$file"; \ + err=`{ $$ldd $$file 2>&1 || ${TRUE}; } | { ${GREP} "not found" || ${TRUE}; }`; \ + if ${TEST} -n "$$err"; then \ + ${ECHO} "$$file: $$err"; \ + error=1; \ + fi; \ + done; \ + if ${TEST} "$$error" = 1; then \ + ${ECHO} "*** The above programs/libs will not find the listed shared libraries"; \ + ${ECHO} " at runtime. Please fix the package (add -Wl,-R.../lib in the right"; \ + ${ECHO} " places)!"; \ + ${SHCOMMENT} Might not error-out for non-pkg-developers; \ + exit 1; \ + fi; } +.endif diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b0b06375feb..d7723ca9190 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1824 2006/05/21 23:50:15 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1825 2006/05/22 22:22:02 jlam Exp $ # # This file is in the public domain. # @@ -58,12 +58,10 @@ build-defs-message: ${WRKDIR} # Transform package Makefile variables and set defaults ############################################################################ -CHECK_SHLIBS?= YES # run check-shlibs after install DEINSTALLDEPENDS?= NO # add -R to pkg_delete MKCRYPTO?= YES # build crypto packages by default NOCLEAN?= NO # don't clean up after update REINSTALL?= NO # reinstall upon update -SHLIB_HANDLING?= YES # do automatic shared lib handling CREATE_WRKDIR_SYMLINK?= yes # create a symlink to WRKOBJDIR ##### Variant spellings @@ -2010,7 +2008,7 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} register-pkg .endif # !NO_PKG_REGISTER ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${_INSTALL_COOKIE} -.if defined(PKG_DEVELOPER) && (${CHECK_SHLIBS} == "YES") +.if empty(CHECK_SHLIBS:M[nN][oO]) ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} check-shlibs .endif .if empty(CHECK_WRKREF:M[nN][oO]) @@ -2023,47 +2021,6 @@ real-su-install: ${MESSAGE} ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} check-interpreter .endif -# Check if all binaries and shlibs find their needed libs -# Must be run after "make install", so that files are installed, and -# ${PLIST} exists. -# -.PHONY: check-shlibs -check-shlibs: -.if !defined(NO_PKG_REGISTER) - ${_PKG_SILENT}${_PKG_DEBUG} \ - bins=`${PKG_INFO} -qL ${PKGNAME} | { ${EGREP} -h '/(bin|sbin|libexec)/' || ${TRUE}; }`; \ - if [ "${OBJECT_FMT}" = "ELF" ]; then \ - shlibs=`${PKG_INFO} -qL ${PKGNAME} | { ${EGREP} -h '/lib/lib.*.so' || ${TRUE}; }`; \ - elif [ "${OBJECT_FMT}" = "Mach-O" ]; then \ - shlibs=`${PKG_INFO} -qL ${PKGNAME} | { ${EGREP} -h '/lib/lib.*.dylib' || ${TRUE}; }`; \ - else \ - shlibs=""; \ - fi; \ - if [ "X${LDD}" = X ]; then \ - ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'`;\ - else \ - ldd="${LDD}"; \ - fi; \ - if [ -x "$$ldd" ]; then \ - for i in $${bins} $${shlibs}; do \ - err=`{ $$ldd $$i 2>&1 || ${TRUE}; } | { ${GREP} "not found" || ${TRUE}; }`; \ - if [ "${PKG_VERBOSE}" != "" ]; then \ - ${ECHO} "$$ldd $$i"; \ - fi; \ - if [ "$$err" != "" ]; then \ - ${ECHO} "$${i}: $$err"; \ - error=1; \ - fi; \ - done; \ - fi; \ - if [ "$$error" = 1 ]; then \ - ${ECHO} "*** The above programs/libs will not find the listed shared libraries"; \ - ${ECHO} " at runtime. Please fix the package (add -Wl,-R.../lib in the right places)!"; \ - ${SHCOMMENT} Might not error-out for non-pkg-developers; \ - exit 1; \ - fi -.endif # NO_PKG_REGISTER - .PHONY: acquire-tools-lock .PHONY: acquire-wrapper-lock acquire-configure-lock acquire-build-lock .PHONY: acquire-install-lock acquire-package-lock @@ -3582,7 +3539,7 @@ post-install-fake-pkg: ${PLIST} ${DESCR} ${MESSAGE} pkgview) ${TOUCH} ${PKG_DB_TMPDIR}/+VIEWS ;; \ esac ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${SIZE_PKG_FILE} ${SIZE_ALL_FILE} -. if ${SHLIB_HANDLING} == "YES" && ${CHECK_SHLIBS} == "YES" +. if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS]) ${_PKG_SILENT}${_PKG_DEBUG} \ case "${LDD}" in \ "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'`;; \ diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile index 414e8e7a80f..8b2c06bccaf 100644 --- a/multimedia/divxplayer/Makefile +++ b/multimedia/divxplayer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:15 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/05/22 22:22:04 jlam Exp $ DISTNAME= divx-player-installer PKGNAME= divxplayer-0.2.0 @@ -20,7 +20,6 @@ DEPENDS+= suse_x11>=7.3:../../emulators/suse_linux ONLY_FOR_PLATFORM= *-*-i386 WRKSRC= ${WRKDIR}/divx-player-installer -CHECK_SHLIBS= NO NO_BUILD= YES USE_X11BASE= YES diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile index 40f7450abe3..e7b33de20bd 100644 --- a/multimedia/ns-flash/Makefile +++ b/multimedia/ns-flash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/22 09:22:12 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2006/05/22 22:22:04 jlam Exp $ CATEGORIES= multimedia www MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/ @@ -46,7 +46,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no CRYPTO= yes NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile index b740de4553c..f1c4ced006f 100644 --- a/net/edonkey2k/Makefile +++ b/net/edonkey2k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:18 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/05/22 22:22:04 jlam Exp $ # DISTNAME= donkey @@ -24,7 +24,6 @@ DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat WRKSRC= ${WRKDIR} NO_BUILD= YES NO_CONFIGURE= YES -CHECK_SHLIBS= NO INSTALLATION_DIRS= bin diff --git a/net/overnet/Makefile b/net/overnet/Makefile index b37ccd2fb0f..132ff73a754 100644 --- a/net/overnet/Makefile +++ b/net/overnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:28 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/05/22 22:22:04 jlam Exp $ # DISTNAME= overnetclc-1.0.1 @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR} EXTRACT_ONLY= # empty NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no EVAL_PREFIX= RPM2PKGDIR=rpm2pkg diff --git a/net/skype/Makefile b/net/skype/Makefile index c959a469940..86a17a5e267 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/05/09 09:31:42 abs Exp $ +# $NetBSD: Makefile,v 1.17 2006/05/22 22:22:04 jlam Exp $ # DISTNAME= skype_staticQT-1.2.0.18 @@ -27,7 +27,6 @@ DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 ONLY_FOR_PLATFORM= *-*-i386 NO_CONFIGURE= yes -CHECK_SHLIBS= no USE_DIRS+= xdg-1.1 WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} diff --git a/pkgtools/x11-links/openwin.mk b/pkgtools/x11-links/openwin.mk index 88b1f3943cc..dd91d66921c 100644 --- a/pkgtools/x11-links/openwin.mk +++ b/pkgtools/x11-links/openwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: openwin.mk,v 1.3 2005/02/20 07:48:48 grant Exp $ +# $NetBSD: openwin.mk,v 1.4 2006/05/22 22:22:04 jlam Exp $ FILES_LIST= ${FILESDIR}/openwin @@ -23,4 +23,5 @@ CREATE_X11LINK= case $$file in \ # disable checking of shared library dependencies, as openwin/dt can # have some libraries missing in a "normal" installation and this # shouldn't break the package. -CHECK_SHLIBS= no +# +CHECK_SHLIBS_SUPPORTED= no 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" diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile index 5b76903358a..ab8a5de1269 100644 --- a/security/uvscan/Makefile +++ b/security/uvscan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/04/22 09:22:14 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2006/05/22 22:22:05 jlam Exp $ DISTNAME= vlnx440e PKGNAME= uvscan-4.40 @@ -20,7 +20,6 @@ DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat .endif ONLY_FOR_PLATFORM= *-*-i386 -CHECK_SHLIBS= NO WRKSRC= ${WRKDIR} NO_BUILD= yes diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile index 5cc5f7ff91e..34b9c105378 100644 --- a/sysutils/storage-manager/Makefile +++ b/sysutils/storage-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/04/22 09:22:15 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2006/05/22 22:22:05 jlam Exp $ DISTNAME= sm_linux_v314_install PKGNAME= storage-manager-3.14 @@ -29,7 +29,6 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/sm_linux_v314_install -CHECK_SHLIBS= NO _STRIPFLAG_INSTALL= # defined NO_CONFIGURE= yes NO_BUILD= yes diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile index 35d0d0b3d22..4da41f48812 100644 --- a/www/asWedit/Makefile +++ b/www/asWedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2006/05/22 22:22:05 jlam Exp $ DISTNAME= asWedit-4.0.1-i386.linux PKGNAME= ${DISTNAME:S/-i386.linux//} @@ -28,7 +28,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} NO_BUILD= yes -CHECK_SHLIBS= no INSTALLATION_DIRS= bin libdata do-configure: diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common index 6a56677e9ce..b6a80693bb3 100644 --- a/www/firefox-bin-flash/Makefile.common +++ b/www/firefox-bin-flash/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile.common,v 1.13 2006/05/22 22:22:05 jlam Exp $ DISTNAME= install_flash_player_7_${DISTUNAME} PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./} @@ -29,7 +29,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NO_CONFIGURE= yes NO_BUILD= yes -CHECK_SHLIBS= no +CHECK_SHLIBS_SUPPORTED= no CRYPTO= yes MOZ_NAME?= firefox-linux diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile index 10b1b5abbeb..44c92b285cb 100644 --- a/www/ns-plugger-common/Makefile +++ b/www/ns-plugger-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/02/05 23:11:26 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2006/05/22 22:22:05 jlam Exp $ DISTNAME= plugger-4.0-linux-x86-glibc PKGNAME= ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS} @@ -36,7 +36,6 @@ DOCDIR= ${PREFIX}/share/doc/plugger PLIST_SUBST+= NS_PLUGINS_DIR=${NS_PLUGINS_DIR:S/${PREFIX}\///} -CHECK_SHLIBS= no INSTALLATION_DIRS= bin man/man7 do-install: |