pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Use new automatic flag; depend on appropriate pkg_i...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ced6e1f7bae
branches:  trunk
changeset: 502506:8ced6e1f7bae
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Nov 05 13:31:43 2005 +0000

description:
Use new automatic flag; depend on appropriate pkg_install version.

diffstat:

 mk/bsd.pkg.mk |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 6c363816d9e4 -r 8ced6e1f7bae mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Nov 05 13:30:52 2005 +0000
+++ b/mk/bsd.pkg.mk     Sat Nov 05 13:31:43 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1745 2005/11/05 09:37:10 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1746 2005/11/05 13:31:43 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -167,7 +167,7 @@
 
 # Latest versions of tools required for correct pkgsrc operation.
 DIGEST_REQD=           20010302
-PKGTOOLS_REQD=         ${_OPSYS_PKGTOOLS_REQD:U20050204}
+PKGTOOLS_REQD=         ${_OPSYS_PKGTOOLS_REQD:U20051103}
 
 PKG_DB_TMPDIR=         ${WRKDIR}/.pkgdb
 DDIR=                  ${WRKDIR}/.DDIR
@@ -3498,6 +3498,9 @@
 PKG_ARGS_ADD=          -W ${LOCALBASE} -w ${DEFAULT_VIEW}
 .endif
 _BIN_INSTALL_FLAGS=    ${BIN_INSTALL_FLAGS}
+.if defined(_AUTOMATIC) && !empty(_AUTOMATIC:Myes)
+_BIN_INSTALL_FLAGS+=   -a
+.endif
 _BIN_INSTALL_FLAGS+=   ${PKG_ARGS_ADD}
 
 # Install binary pkg, without strict uptodate-check first
@@ -3670,7 +3673,7 @@
                        ${ECHO_MSG} "=> No directory for $$dir.  Skipping.."; \
                else                                                    \
                        cd $$dir ;                                      \
-                       ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD=\'$$pkg\' ${MAKE} ${MAKEFLAGS} $$target || exit 1; \
+                       ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" PKGNAME_REQD=\'$$pkg\' ${MAKE} ${MAKEFLAGS} _AUTOMATIC=YES $$target || exit 1; \
                        ${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \
                fi;                                                     \
        fi
@@ -4410,6 +4413,9 @@
                esac;                                                   \
                ${MKDIR} ${_PKG_DBDIR}/${PKGNAME};                      \
                ${CP} ${PKG_DB_TMPDIR}/+* ${_PKG_DBDIR}/${PKGNAME};     \
+               if [ "${_AUTOMATIC}" = "YES" ]; then                    \
+                       ${PKG_ADMIN} set automatic=yes ${PKGNAME};      \
+               fi;                                                     \
                ;;                                                      \
        esac
 .  if (${PKG_INSTALLATION_TYPE} == "pkgviews") && \



Home | Main Index | Thread Index | Old Index