aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.options.mk4
-rw-r--r--Mk/bsd.port.mk9
-rw-r--r--Mk/bsd.sanity.mk6
-rw-r--r--Mk/bsd.tex.mk4
4 files changed, 7 insertions, 16 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index c2fe02b54533..475f05d98b28 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -138,7 +138,7 @@
# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES
# EXTRACT_ONLY GH_ACCOUNT GH_PROJECT GH_TAGNAME IGNORE INFO INSTALL_TARGET
# LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS
-# PLIST_DIRSTRY PLIST_FILES PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST
+# PLIST_FILES PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST
# TEST_TARGET USES,
# defining ${opt}_${variable} will add its content to the actual variable when
# the option is enabled. Defining ${opt}_${variable}_OFF will add its content
@@ -165,7 +165,7 @@ _OPTIONS_FLAGS= ALL_TARGET BROKEN CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES EXTRACT_ONLY \
GH_ACCOUNT GH_PROJECT GH_TAGNAME GH_TUPLE IGNORE INFO \
INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV MASTER_SITES \
- PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \
+ PATCHFILES PATCH_SITES PLIST_DIRS PLIST_FILES \
PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST \
TEST_TARGET USES
_OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 7c5bebf3e249..6534f85c2c18 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1404,10 +1404,6 @@ USES+= gnome
USES+= mate
.endif
-.if defined(USE_BDB)
-USES+=bdb:${USE_BDB}
-.endif
-
.if defined(USE_MYSQL)
USE_MYSQL:= ${USE_MYSQL:N[yY][eE][sS]:Nclient}
.if defined(WANT_MYSQL_VER)
@@ -4461,11 +4457,6 @@ generate-plist: ${WRKDIR}
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
fi
-# Keep PLIST_DIRSTRY as compatibility
-.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY}
- @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
-.endfor
-
.if defined(USE_LINUX_PREFIX)
.if defined(USE_LDCONFIG)
@${ECHO_CMD} "@postexec ${LDCONFIG_CMD}" >> ${TMPPLIST}
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index e17753187253..f72707b25c62 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -177,9 +177,9 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \
UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD USE_PHPEXT \
- USE_ZENDEXT USE_PHP_BUILD
-SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \
- USE_BDB USE_MYSQL WANT_MYSQL_VER USE_OPENSSL \
+ USE_ZENDEXT USE_PHP_BUILD USE_BDB PLIST_DIRSTRY
+SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS \
+ USE_MYSQL WANT_MYSQL_VER USE_OPENSSL \
USE_PHPIZE WANT_PHP_CLI WANT_PHP_CGI WANT_PHP_MOD \
WANT_PHP_WEB WANT_PHP_EMB
SANITY_NOTNEEDED= WX_UNICODE
diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index c0e5e27b03dc..55bc46e786f9 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -271,12 +271,12 @@ do-fmtutil-$F:
${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c || ${TRUE}
${RMDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR} || ${TRUE}
_PLIST_FILES+= ${TEX_FORMAT_${F:tu}_FILES}
-_PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS}
+_PLIST_DIRS+=${TEX_FORMAT_${F:tu}_DIRS}
_PLIST_FILES+= ${TEX_FORMAT_${F:tu}_BIN}
. endfor
post-install-script: do-fmtutil
PLIST_FILES= ${_PLIST_FILES:O:u}
-PLIST_DIRSTRY= ${_PLIST_DIRSTRY:O:u} ${TEXMFVARDIR}/web2c
+PLIST_DIRS= ${_PLIST_DIRS:O:u} ${TEXMFVARDIR}/web2c
.endif
.if !empty(USE_TEX:Mupdmap)