summaryrefslogtreecommitdiff
path: root/mk/bsd.pkg.mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-07-23 15:23:46 +0000
committerjlam <jlam@pkgsrc.org>2007-07-23 15:23:46 +0000
commit9bb51d11c7a706d988fd8d7cdb5cdc1bbb787e43 (patch)
treec34cd2489f7e43887b1320196af63f73935f78d2 /mk/bsd.pkg.mk
parenta3551a926266267a1504c935ab7c2bd8a4efcfe9 (diff)
downloadpkgsrc-9bb51d11c7a706d988fd8d7cdb5cdc1bbb787e43.tar.gz
Putting bsd.pkginstall.mk under bsd.tools.mk was a bad idea -- the
former set several USE_TOOLS lines that were being missed by bsd.tools.mk. Rearrange the +SHLIBS code so that bsd.tools.mk can now be included after bsd.pkginstall.mk again. The +SHLIBS code has now been moved over to the plist module, which is so far the repository for all of the shlib-type handling. This should fix the problem with fonts handling being broken.
Diffstat (limited to 'mk/bsd.pkg.mk')
-rw-r--r--mk/bsd.pkg.mk17
1 files changed, 4 insertions, 13 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 67d43e82753..3e3e7552e02 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1914 2007/07/20 14:25:03 rillig Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1915 2007/07/23 15:23:46 jlam Exp $
#
# This file is in the public domain.
#
@@ -432,24 +432,15 @@ USE_TOOLS+= expr
USE_TOOLS+= tee tsort
.endif
+# INSTALL/DEINSTALL script framework
+.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
+
# Locking
.include "${.PARSEDIR}/internal/locking.mk"
# Tools
.include "${.PARSEDIR}/tools/bsd.tools.mk"
-# SHLIB_TYPE
-# The type of shared library supported by the platform.
-#
-SHLIB_TYPE= ${_SHLIB_TYPE_cmd:sh}
-_SHLIB_TYPE_cmd= \
- ${SETENV} ECHO=${TOOLS_ECHO:Q} FILE_CMD=${TOOLS_FILE_CMD:Q} \
- TEST=${TOOLS_TEST:Q} PKG_INFO_CMD=${PKG_INFO_CMD:Q} \
- ${SH} ${PKGSRCDIR}/mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q}
-
-# INSTALL/DEINSTALL script framework
-.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
-
# Barrier
.include "${.PARSEDIR}/bsd.pkg.barrier.mk"