Date: Mon, 03 Jul 2006 00:52:13 +0400 From: Sergey Matveychuk <sem@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99724: bsd.ports.mk: get rid of DEPENDS. We don't need it now. Message-ID: <E1Fx8vN-0009zs-7R@pandor.sem-home.ciam.ru> Resent-Message-ID: <200607022100.k62L0Zfq010652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99724
>Category: ports
>Synopsis: bsd.ports.mk: get rid of DEPENDS. We don't need it now.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 02 21:00:35 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD pandor.sem-home.ciam.ru 6.1-STABLE FreeBSD 6.1-STABLE #32: Sat May 27 19:09:48 MSD 2006 root@pandor.sem-home.ciam.ru:/usr/obj/usr/src/sys/CURRENT i386
>Description:
There is nothing now what we can't do with *_DEPENDS.
Unconditional DEPENDS is obsoleted now.
A patch for bsd.ports.mk and for three ports that use
DEPENDS included.
>How-To-Repeat:
>Fix:
--- get-rid-of-depends.patch begins here ---
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.535
diff -u -r1.535 bsd.port.mk
--- Mk/bsd.port.mk 26 Jun 2006 23:39:09 -0000 1.535
+++ Mk/bsd.port.mk 2 Jul 2006 20:18:17 -0000
@@ -265,12 +265,6 @@
# package depends on. "lib" is the name of a shared library.
# make will use "ldconfig -r" to search for the library.
# lib can contain extended regular expressions.
-# DEPENDS - A list of "dir[:target]" tuples of other ports this
-# package depends on being made first. Use this only for
-# things that don't fall into the above four categories.
-# If the second field ("target") exists, it will be used
-# instead of ${DEPENDS_TARGET}.
-#
# DEPENDS_TARGET
# - The default target to execute when a port is calling a
# dependency.
@@ -2696,8 +2690,8 @@
SCRIPTS_ENV+= CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
- PORTSDIR=${PORTSDIR} DEPENDS="${DEPENDS}" \
- PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+ PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
+ X11BASE=${X11BASE}
.if defined(BATCH)
SCRIPTS_ENV+= BATCH=yes
@@ -2971,9 +2965,8 @@
DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
- DEPENDS="${DEPENDS}" BUILD_DEPENDS="${BUILD_DEPENDS}" \
- RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \
- CONFLICTS="${CONFLICTS}" \
+ BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" \
+ X11BASE=${X11BASE} CONFLICTS="${CONFLICTS}" \
${ALL_HOOK}
.endif
@@ -2991,12 +2984,6 @@
DEPENDS_TARGET+= clean
DEPENDS_ARGS+= NOCLEANDEPENDS=yes
.endif
-.else
-DEPENDS_ARGS+= FORCE_PKG_REGISTER=yes
-.endif
-.if defined(DEPENDS)
-# pretty much guarantees overwrite of existing installation
-.MAKEFLAGS: FORCE_PKG_REGISTER=yes
.endif
################################################################
@@ -3864,7 +3851,7 @@
_PATCH_SEQ= patch-message patch-depends patch-dos2unix pre-patch \
pre-patch-script do-patch post-patch post-patch-script
_CONFIGURE_DEP= patch
-_CONFIGURE_SEQ= build-depends lib-depends misc-depends configure-message \
+_CONFIGURE_SEQ= build-depends lib-depends configure-message \
pre-configure pre-configure-script \
run-autotools do-configure post-configure post-configure-script
_BUILD_DEP= configure
@@ -4464,7 +4451,7 @@
################################################################
.if !target(depends)
-depends: extract-depends patch-depends lib-depends misc-depends fetch-depends build-depends run-depends
+depends: extract-depends patch-depends lib-depends fetch-depends build-depends run-depends
.if defined(ALWAYS_BUILD_DEPENDS)
_DEPEND_ALWAYS= 1
@@ -4620,37 +4607,12 @@
done
.endif
-misc-depends:
-.if defined(DEPENDS)
-.if !defined(NO_DEPENDS)
- @for dir in ${DEPENDS}; do \
- if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
- target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \
- dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \
- else \
- target="${DEPENDS_TARGET}"; \
- depends_args="${DEPENDS_ARGS}"; \
- fi; \
- ${ECHO_MSG} "===> ${PKGNAME} depends on: $$dir"; \
- ${ECHO_MSG} "===> Verifying $$target for $$dir"; \
- if [ ! -d $$dir ]; then \
- ${ECHO_MSG} " => No directory for $$dir. Skipping.."; \
- else \
- (cd $$dir; ${MAKE} $$target $$depends_args) ; \
- fi \
- done
- @${ECHO_MSG} "===> Returning to build of ${PKGNAME}"
-.endif
-.else
- @${DO_NADA}
-.endif
-
.endif
# Dependency lists: both build and runtime, recursive. Print out directory names.
_UNIFIED_DEPENDS=${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}
-_DEPEND_DIRS= ${_UNIFIED_DEPENDS:C,^[^:]*:([^:]*).*$,\1,} ${DEPENDS:C,:.*,,}
+_DEPEND_DIRS= ${_UNIFIED_DEPENDS:C,^[^:]*:([^:]*).*$,\1,}
all-depends-list:
@${ALL-DEPENDS-LIST}
@@ -4783,12 +4745,12 @@
# Dependency lists: build and runtime. Print out directory names.
build-depends-list:
-.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
+.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
@${BUILD-DEPENDS-LIST}
.endif
BUILD-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4797,12 +4759,12 @@
done | ${SORT} -u
run-depends-list:
-.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
+.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
@${RUN-DEPENDS-LIST}
.endif
RUN-DEPENDS-LIST= \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \
+ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u); do \
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
@@ -4814,7 +4776,7 @@
# and package names.
package-depends-list:
-.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
+.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS)
@${PACKAGE-DEPENDS-LIST}
.endif
@@ -4833,7 +4795,7 @@
done; \
fi; \
checked="${PARENT_CHECKED}"; \
- for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
+ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':'); do \
dir=$$(${REALPATH} $$dir); \
if [ -d $$dir ]; then \
if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
@@ -4899,7 +4861,6 @@
@fdirs = map((split /:/)[1], split(q{ }, q{${FETCH_DEPENDS}})); \
@bdirs = map((split /:/)[1], split(q{ }, q{${BUILD_DEPENDS}})); \
@rdirs = map((split /:/)[1], split(q{ }, q{${RUN_DEPENDS}})); \
- @ddirs = map((split /:/)[0], split(q{ }, q{${DEPENDS}})); \
@ldirs = map((split /:/)[1], split(q{ }, q{${LIB_DEPENDS}})); \
for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs) { \
my @dirs = @$$i; \
@@ -5001,16 +4962,14 @@
.if !target(pretty-print-build-depends-list)
pretty-print-build-depends-list:
.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || \
- defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
- defined(LIB_DEPENDS) || defined(DEPENDS)
+ defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS)
@${_PRETTY_PRINT_DEPENDS_LIST}
.endif
.endif
.if !target(pretty-print-run-depends-list)
pretty-print-run-depends-list:
-.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || \
- defined(DEPENDS)
+.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS)
@${_PRETTY_PRINT_DEPENDS_LIST}
.endif
.endif
Index: audio/klira/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/klira/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- audio/klira/Makefile 29 Apr 2006 23:02:49 -0000 1.7
+++ audio/klira/Makefile 2 Jul 2006 20:18:17 -0000
@@ -15,7 +15,7 @@
MAINTAINER= lioux@FreeBSD.org
COMMENT= A gstreamer based audio converter for KDE
-DEPENDS= ${PORTSDIR}/misc/kdehier
+RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier
LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib
USE_BZIP2= yes
Index: www/caudium12/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/caudium12/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/caudium12/Makefile 14 Apr 2006 13:39:40 -0000 1.7
+++ www/caudium12/Makefile 2 Jul 2006 20:18:17 -0000
@@ -15,10 +15,11 @@
MAINTAINER= kiwi@oav.net
COMMENT= A free webserver which is based on the Roxen Challenger 1.3 code base
-BUILD_DEPENDS= pike:${PORTSDIR}/lang/pike72/
+BUILD_DEPENDS= pike:${PORTSDIR}/lang/pike72/ \
+ pexts>0:${PORTSDIR}/lang/pexts/
LIB_DEPENDS= sablot.70:${PORTSDIR}/textproc/sablotron/
-RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof/
-DEPENDS= ${PORTSDIR}/lang/pexts/
+RUN_DEPENDS= lsof:${PORTSDIR}/sysutils/lsof/ \
+ pexts>0:${PORTSDIR}/lang/pexts/
WRKSRC= ${WRKDIR}/${DISTNAME}
Index: x11/kdelibs3/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/kdelibs3/Makefile,v
retrieving revision 1.199
diff -u -r1.199 Makefile
--- x11/kdelibs3/Makefile 5 Jun 2006 19:24:25 -0000 1.199
+++ x11/kdelibs3/Makefile 2 Jul 2006 20:18:17 -0000
@@ -17,7 +17,6 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-DEPENDS= ${PORTSDIR}/misc/kdehier
BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
@@ -31,7 +30,8 @@
tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
xslt.2:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \
+RUN_DEPENDS= kdehier>0:${PORTSDIR}/misc/kdehier \
+ iceauth:${X_CLIENTS_PORT} \
${FONTSCALE}:${X_FONTS_TTF_PORT} \
${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
--- get-rid-of-depends.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Fx8vN-0009zs-7R>