aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/portmk/Mk/bsd.port.mk
diff options
context:
space:
mode:
Diffstat (limited to 'ports-mgmt/portmk/Mk/bsd.port.mk')
-rw-r--r--ports-mgmt/portmk/Mk/bsd.port.mk74
1 files changed, 47 insertions, 27 deletions
diff --git a/ports-mgmt/portmk/Mk/bsd.port.mk b/ports-mgmt/portmk/Mk/bsd.port.mk
index 43253d0a46f5..f6cd809a5e89 100644
--- a/ports-mgmt/portmk/Mk/bsd.port.mk
+++ b/ports-mgmt/portmk/Mk/bsd.port.mk
@@ -398,10 +398,10 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# USE_OPENSSL - If set, this port relies on the OpenSSL package.
##
# USE_OPENLDAP - If set, this port uses the OpenLDAP libraries.
-# Implies: WANT_OPENLDAP_VER?=23
+# Implies: WANT_OPENLDAP_VER?=24
# WANT_OPENLDAP_VER
# - Legal values are: 23, 24
-# If set to an unkown value, the port is marked BROKEN.
+# If set to an unknown value, the port is marked BROKEN.
# WANT_OPENLDAP_SASL
# - If set, the system should use OpenLDAP libraries
# with SASL support.
@@ -766,6 +766,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# config-recursive
# - Configure options for this port for this port and all dependencies.
# showconfig - Display options config for this port.
+# showconfig-recursive
+# - Display options config for this port and all dependencies.
# rmconfig - Remove the options config for this port.
# rmconfig-recursive
# - Remove the options config for this port and all dependencies.
@@ -1877,27 +1879,19 @@ SUB_FILES+= ${USE_RC_SUBR}
.if defined(USE_RCORDER)
SUB_FILES+= ${USE_RCORDER}
.endif
-.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
+.if (${OSVERSION} >= 700007 || ${OSVERSION} < 700000)
RC_SUBR_SUFFIX?=
.else
RC_SUBR_SUFFIX?= .sh
.endif
.endif
-.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
-.if !defined(INSTALL_AS_USER) && ( ( ${OSVERSION} < 504105 ) || \
- ( ${OSVERSION} >= 700000 && ${OSVERSION} < 700012 ) || \
- ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600104 ) )
-RUN_DEPENDS+= ${LOCALBASE}/${LDCONFIG_DIR}:${PORTSDIR}/misc/ldconfig_compat
-NO_LDCONFIG_MTREE= yes
-.endif
.if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes"
USE_LDCONFIG= ${PREFIX}/lib
.endif
.if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:L} == "yes"
IGNORE= has USE_LDCONFIG32 set to yes, which is not correct
.endif
-.endif
.if defined(USE_ICONV)
LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
@@ -2503,22 +2497,22 @@ SCRIPTS_ENV+= ${INSTALL_MACROS}
COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
${CHOWN} -R ${BINOWN}:${BINGRP} $$1 && \
- ${FIND} $$1 -type d -exec chmod 755 {} \; && \
- ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' --
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${BINMODE} $$1/{} \;' --
COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
- ${FIND} $$1/ -type d -exec chmod 755 {} \; && \
- ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' --
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' --
.else
COPYTREE_BIN= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
- ${FIND} $$1 -type d -exec chmod 755 {} \; && \
- ${FIND} $$1 -type f -exec chmod ${BINMODE} {} \;' --
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${BINMODE} $$1/{} \;' --
COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
2>&1) && \
- ${FIND} $$1/ -type d -exec chmod 755 {} \; && \
- ${FIND} $$1/ -type f -exec chmod ${SHAREMODE} {} \;' --
+ ${FIND} -d $$0 $$2 -type d -exec chmod 755 $$1/{} \; && \
+ ${FIND} -d $$0 $$2 -type f -exec chmod ${SHAREMODE} $$1/{} \;' --
.endif
# The user can override the NO_PACKAGE by specifying this from
@@ -2544,10 +2538,7 @@ PORTDIRNAME?= ${_PORTDIRNAME}
PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME}
-.if ((${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install") || exists(${LOCALBASE}/sbin/pkg_info)
-.if (${OSVERSION} < 504105 || (${OSVERSION} >= 600000 && ${OSVERSION} < 600103) || (${OSVERSION} >= 700000 && ${OSVERSION} < 700012)) && ${PKGORIGIN} != "ports-mgmt/pkg_install"
-EXTRACT_DEPENDS+= ${LOCALBASE}/sbin/pkg_info:${PORTSDIR}/ports-mgmt/pkg_install
-.endif
+.if exists(${LOCALBASE}/sbin/pkg_info)
PKG_CMD?= ${LOCALBASE}/sbin/pkg_create
PKG_ADD?= ${LOCALBASE}/sbin/pkg_add
PKG_DELETE?= ${LOCALBASE}/sbin/pkg_delete
@@ -3386,9 +3377,9 @@ ignorelist:
.if defined(IGNORE) || defined(NO_PACKAGE)
ignorelist-verbose:
.if defined(IGNORE)
- @${ECHO_MSG} "${PKGNAME}|IGNORE: "${IGNORE:Q}
+ @${ECHO_CMD} "${PKGNAME}|IGNORE: "${IGNORE:Q}
.else
- @${ECHO_MSG} "${PKGNAME}|NO_PACKAGE: "${NO_PACKAGE:Q}
+ @${ECHO_CMD} "${PKGNAME}|NO_PACKAGE: "${NO_PACKAGE:Q}
.endif
.else
ignorelist-verbose:
@@ -3454,7 +3445,7 @@ DEPENDS_ARGS+= NOCLEANDEPENDS=yes
# target or not.
#
################################################################
-.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
+.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
defined(PACKAGE_BUILDING) || defined(BATCH))
_OPTIONS_OK=yes
.endif
@@ -4389,7 +4380,7 @@ fetch: ${_FETCH_DEP} ${_FETCH_SEQ}
${target}: ${${target:U}_COOKIE}
.elif !target(${target})
${target}: config-conditional
- @cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
+ @cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
.elif target(${target}) && defined(IGNORE)
.endif
@@ -5088,6 +5079,7 @@ ${deptype:L}-depends:
fi; \
fi; \
else \
+ fileneeded="$$prog"; \
${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \
notfound=1; \
fi; \
@@ -5106,6 +5098,7 @@ ${deptype:L}-depends:
notfound=0; \
fi; \
else \
+ pkgneeded="$$prog"; \
${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \
notfound=1; \
fi; \
@@ -5128,6 +5121,7 @@ ${deptype:L}-depends:
notfound=0; \
fi; \
else \
+ execneeded="$$prog"; \
${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - not found"; \
notfound=1; \
fi; \
@@ -5138,6 +5132,24 @@ ${deptype:L}-depends:
${ECHO_MSG} " => No directory for $$prog. Skipping.."; \
else \
${_INSTALL_DEPENDS} \
+ if [ "$$fileneeded" != "${NONEXISTENT}" ]; then \
+ if [ ! -z "$$fileneeded" ]; then \
+ if [ ! -e "$$prog" ]; then \
+ ${ECHO_MSG} "Error: file \"$$prog\" does not exist"; \
+ ${FALSE}; \
+ fi; \
+ elif [ ! -z "$$pkgneeded" ]; then \
+ if ! ${PKG_INFO} "$$prog" > /dev/null 2>&1 ; then \
+ ${ECHO_MSG} "Error: package \"$$prog\" does not exist"; \
+ ${FALSE}; \
+ fi; \
+ elif [ ! -z "$$execneeded" ]; then \
+ if ! ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
+ ${ECHO_MSG} "Error: executable \"$$prog\" does not exist"; \
+ ${FALSE}; \
+ fi; \
+ fi; \
+ fi; \
fi; \
fi; \
done
@@ -6215,6 +6227,14 @@ showconfig:
.endif
.endif
+.if !target(showconfig-recursive)
+showconfig-recursive:
+ @${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and dependencies";
+ @for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ (cd $$dir; ${MAKE} showconfig); \
+ done
+.endif
+
.if !target(rmconfig)
rmconfig:
.if defined(OPTIONS) && exists(${OPTIONSFILE})
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:45:01 +0000