Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mk/pkgformat/pkg/depends.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: depends.mk,v 1.4 2014/03/08 11:46:14 obache Exp $
# $NetBSD: depends.mk,v 1.5 2016/07/18 09:57:10 leot Exp $
# This command prints out the dependency patterns for all full (run-time)
# dependencies of the package.
@@ -21,7 +21,7 @@
#
# "pkg" is the match for "pattern" used to fulfill the dependency.
#
# ${_RRDEPENDS_FILE} is like ${_RPDENDS_FILE}, but all build dependencies
# ${_RRDEPENDS_FILE} is like ${_RDEPENDS_FILE}, but all build dependencies
# are dropped, if they are dependencies of one of the full dependencies.
#
_DEPENDS_FILE= ${WRKDIR}/.depends

70
mk/pkgformat/pkg/install.mk
View File

@@ -1,75 +1,7 @@
# $NetBSD: install.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
#
# _pkgformat-check-conflicts:
# Checks for conflicts between the package and installed packages.
#
# XXX: Needs WRKDIR.
#
# _pkgformat-check-installed:
# Checks if the package (or an older version of it) is already
# installed on the system.
#
# XXX: Needs WRKDIR.
#
# _pkgformat-register:
# Populates the package database with the appropriate entries to
# register the package as being installed on the system.
# $NetBSD: install.mk,v 1.2 2016/04/10 15:58:03 joerg Exp $
#
# _pkgformat-install-clean:
# Removes the state files from the run of an ``install'' target.
#
_pkgformat-check-conflicts: .PHONY error-check
${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
.for _conflict_ in ${CONFLICTS}
${RUN} \
found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`"; \
case "$$found" in \
"") ;; \
*) ${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;; \
esac
.endfor
${RUN} \
${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0; \
exec 1>${ERROR_DIR}/${.TARGET}; \
${ECHO} "${PKGNAME} conflicts with installed package(s):"; \
${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^| |"; \
${ECHO} "They install the same files into the same place."; \
${ECHO} "Please remove conflicts first with pkg_delete(1)."; \
${RM} -f ${WRKDIR}/.CONFLICTS
_pkgformat-check-installed: .PHONY error-check
${RUN} \
found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`"; \
${TEST} -n "$$found" || exit 0; \
exec 1>${ERROR_DIR}/${.TARGET}; \
${ECHO} "$$found is already installed - perhaps an older version?"; \
${ECHO} "If so, you may use either of:"; \
${ECHO} " - \"pkg_delete $$found\" and \"${MAKE} reinstall\""; \
${ECHO} " to upgrade properly"; \
${ECHO} " - \"${MAKE} update\" to rebuild the package and all"; \
${ECHO} " of its dependencies"; \
${ECHO} " - \"${MAKE} replace\" to replace only the package without"; \
${ECHO} " re-linking dependencies, risking various problems."
_REGISTER_DEPENDENCIES= \
${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q} \
AWK=${TOOLS_AWK:Q} \
${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/register-dependencies
_pkgformat-register: .PHONY _pkgformat-generate-metadata ${_RDEPENDS_FILE}
@${STEP_MSG} "Registering installation for ${PKGNAME}"
${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
${RUN}${PKG_ADMIN} add ${PKGNAME}
${RUN} \
case ${_AUTOMATIC:Q}"" in \
[yY][eE][sS]) ${PKG_ADMIN} set automatic=yes ${PKGNAME} ;; \
esac
${RUN}${_FULL_DEPENDS_CMD} | \
${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
${RUN}${GREP} '^@pkgdir ' < ${_PKG_DBDIR}/${PKGNAME}/+CONTENTS | \
while read tag dir; do ${MKDIR} ${PREFIX}/$$dir; done
_pkgformat-install-clean: .PHONY _pkgformat-clean-metadata

27
mk/pkgformat/pkg/metadata.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: metadata.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $
# $NetBSD: metadata.mk,v 1.13 2016/04/10 15:58:03 joerg Exp $
######################################################################
### The targets below are all PRIVATE.
@@ -247,27 +247,6 @@ ${_MESSAGE_FILE}: ${MESSAGE_SRC}
${RUN}${MKDIR} ${.TARGET:H}
${RUN}${CAT} ${.ALLSRC} | \
${SED} ${_MESSAGE_SUBST_SED} > ${.TARGET}
# Display MESSAGE file and optionally mail the contents to
# PKGSRC_MESSAGE_RECIPIENTS.
#
.PHONY: install-display-message
_pkgformat-register: install-display-message
install-display-message: ${_MESSAGE_FILE}
@${STEP_MSG} "Please note the following:"
@${ECHO_MSG} ""
@${CAT} ${_MESSAGE_FILE}
@${ECHO_MSG} ""
. if !empty(PKGSRC_MESSAGE_RECIPIENTS)
${RUN} \
(${ECHO} "The ${PKGNAME} package was installed on `${HOSTNAME_CMD}` at `date`"; \
${ECHO} ""; \
${ECHO} "Please note the following:"; \
${ECHO} ""; \
${CAT} ${_MESSAGE_FILE}; \
${ECHO} "") | \
${MAIL_CMD} -s"Package ${PKGNAME} installed on `${HOSTNAME_CMD}`" ${PKGSRC_MESSAGE_RECIPIENTS}
. endif
.endif # MESSAGE_SRC
######################################################################
@@ -364,11 +343,7 @@ _PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}}
_PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}}
_PKG_ARGS_INSTALL+= ${_PKG_CREATE_ARGS}
.if ${_USE_DESTDIR} == "no"
_PKG_ARGS_INSTALL+= -p ${PREFIX}
.else
_PKG_ARGS_INSTALL+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
.endif
_DEINSTALL_ARG_cmd= if ${TEST} -f ${DEINSTALL_FILE}; then \
${ECHO} "-k "${DEINSTALL_FILE:Q}; \

107
mk/pkgformat/pkg/package.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: package.mk,v 1.11 2015/09/07 11:02:28 jperkin Exp $
# $NetBSD: package.mk,v 1.15 2016/05/09 00:07:23 joerg Exp $
.if defined(PKG_SUFX)
WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -13,38 +13,17 @@ WARNINGS+= "Unsupported value for PKG_SUFX"
PKG_SUFX?= .tgz
FILEBASE?= ${PKGBASE}
PKGFILE?= ${PKGREPOSITORY}/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
.if ${_USE_DESTDIR} == "no"
. if !empty(SIGN_PACKAGES:Mgpg)
STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
. elif !empty(SIGN_PACKAGES:Mx509)
STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
. else
STAGE_PKGFILE?= ${PKGFILE}
. endif
.else
STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
.endif
PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR}
PKGREPOSITORYSUBDIR?= All
######################################################################
### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk)
######################################################################
### package-check-installed verifies that the package is installed on
### the system.
###
.PHONY: package-check-installed
package-check-installed:
${RUN} ${PKG_INFO} -qe ${PKGNAME} \
|| ${FAIL_MSG} "${PKGNAME} is not installed."
######################################################################
### package-create (PRIVATE, pkgsrc/mk/package/package.mk)
######################################################################
### package-create creates the binary package.
###
.PHONY: package-create
package-create: ${PKGFILE} package-links
package-create: ${PKGFILE}
######################################################################
### stage-package-create (PRIVATE, pkgsrc/mk/package/package.mk)
@@ -52,48 +31,42 @@ package-create: ${PKGFILE} package-links
### stage-package-create creates the binary package for stage install.
###
.PHONY: stage-package-create
.if ${_USE_DESTDIR} == "no"
stage-package-create: package-create
.else
stage-package-create: stage-install ${STAGE_PKGFILE}
.endif
_PKG_ARGS_PACKAGE+= ${_PKG_CREATE_ARGS}
_PKG_ARGS_PACKAGE+= -F ${PKG_COMPRESSION}
.if ${_USE_DESTDIR} == "no"
_PKG_ARGS_PACKAGE+= -p ${PREFIX}
.else
_PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
. if ${_USE_DESTDIR} == "user-destdir"
.if ${_USE_DESTDIR} == "user-destdir"
_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
. endif
.endif
${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
${RUN} ${MKDIR} ${.TARGET:H}
@${STEP_MSG} "Creating binary package ${.TARGET}"
${RUN} ${_ULIMIT_CMD} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \
${MV} -f "$$tmpname" ${.TARGET}; \
else \
${RUN} ${MKDIR} ${.TARGET:H}; ${_ULIMIT_CMD} \
tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
if ! ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \
exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode; \
fi
.if !empty(SIGN_PACKAGES:U:Mgpg)
@${STEP_MSG} "Signing binary package ${.TARGET} (GPG)"
${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
${PKG_ADMIN} gpg-sign-package "$$tmpname" ${.TARGET}
.elif !empty(SIGN_PACKAGES:U:Mx509)
@${STEP_MSG} "Signing binary package ${.TARGET} (X509)"
${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
${PKG_ADMIN} x509-sign-package "$$tmpname" ${.TARGET} \
${X509_KEY} ${X509_CERTIFICATE}
.else
${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
${MV} -f "$$tmpname" ${.TARGET}
.endif
.if ${PKGFILE} != ${STAGE_PKGFILE}
${PKGFILE}: ${STAGE_PKGFILE}
${RUN} ${MKDIR} ${.TARGET:H}
. if !empty(SIGN_PACKAGES:U:Mgpg)
@${STEP_MSG} "Creating signed binary package ${.TARGET} (GPG)"
${PKG_ADMIN} gpg-sign-package ${STAGE_PKGFILE} ${PKGFILE}
. elif !empty(SIGN_PACKAGES:U:Mx509)
@${STEP_MSG} "Creating signed binary package ${.TARGET} (X509)"
${PKG_ADMIN} x509-sign-package ${STAGE_PKGFILE} ${PKGFILE} \
${X509_KEY} ${X509_CERTIFICATE}
. else
@${STEP_MSG} "Creating binary package ${.TARGET}"
${LN} -f ${STAGE_PKGFILE} ${PKGFILE} 2>/dev/null || \
${RUN} ${MKDIR} ${.TARGET:H}; \
${LN} -f ${STAGE_PKGFILE} ${PKGFILE} 2>/dev/null || \
${CP} -pf ${STAGE_PKGFILE} ${PKGFILE}
. endif
.endif
######################################################################
@@ -115,31 +88,6 @@ package-remove:
stage-package-remove:
${RUN} ${RM} -f ${STAGE_PKGFILE}
######################################################################
### package-links (PRIVATE)
######################################################################
### package-links creates symlinks to the binary package from the
### non-primary categories to which the package belongs.
###
package-links: delete-package-links
.for _dir_ in ${CATEGORIES:S/^/${PACKAGES}\//}
${RUN} ${MKDIR} ${_dir_:Q}
${RUN} [ -d ${_dir_:Q} ] \
|| ${FAIL_MSG} "Can't create directory "${_dir_:Q}"."
${RUN} ${RM} -f ${_dir_:Q}/${PKGFILE:T}
${RUN} ${LN} -s ../${PKGREPOSITORYSUBDIR}/${PKGFILE:T} ${_dir_:Q}
.endfor
######################################################################
### delete-package-links (PRIVATE)
######################################################################
### delete-package-links removes the symlinks to the binary package from
### the non-primary categories to which the package belongs.
###
delete-package-links:
${RUN} ${FIND} ${PACKAGES}/*/${PKGFILE:T} -type l -print \
2>/dev/null | ${XARGS} ${RM} -f
######################################################################
### tarup (PUBLIC)
######################################################################
@@ -149,7 +97,7 @@ delete-package-links:
_PKG_TARUP_CMD= ${LOCALBASE}/bin/pkg_tarup
.PHONY: tarup
tarup: package-remove tarup-pkg package-links
tarup: package-remove tarup-pkg
######################################################################
### tarup-pkg (PRIVATE)
@@ -185,20 +133,15 @@ stage-package-install: stage-package-create real-package-install
stage-package-install: barrier
.endif
.if ${_USE_DESTDIR} != "no"
. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
real-package-install: su-real-package-install
. else
real-package-install: su-target
. endif
.else
real-package-install:
@${DO_NADA}
real-package-install: su-target
.endif
MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q}
su-real-package-install:
@${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
@${PHASE_MSG} "Installing binary package of "${PKGNAME:Q}
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
@${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}

6
mk/pkgformat/pkg/pkgformat-vars.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pkgformat-vars.mk,v 1.5 2014/12/30 15:13:20 wiz Exp $
# $NetBSD: pkgformat-vars.mk,v 1.6 2016/04/10 15:20:26 joerg Exp $
#
# This Makefile fragment is included indirectly by bsd.prefs.mk and
# defines some variables which must be defined earlier than where
@@ -32,11 +32,7 @@ PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info
LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm
# Latest versions of tools required for correct pkgsrc operation.
.if make(replace) && ${_USE_DESTDIR} != "no"
PKGTOOLS_REQD= 20100914
.else
PKGTOOLS_REQD= 20090528
.endif
# Latest version of pkg_install required to extract packages
PKGTOOLS_VERSION_REQD= 20091115

12
mk/pkgformat/pkg/pkgformat.mk
View File

@@ -1,19 +1,13 @@
# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz Exp $
# $NetBSD: pkgformat.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $
#
# This Makefile fragment provides variable and target overrides that are
# specific to the pkgsrc native package format.
#
# PKG_FILELIST_CMD outputs the list of files owned by ${PKGNAME} as
# registered on the system.
# PKG_FILELIST_CMD outputs the list of files in the package based on
# _DEPENDS_PLIST.
#
# For DESTDIR support, just use _DEPENDS_PLIST instead.
#
.if ${_USE_DESTDIR} == "no"
PKG_FILELIST_CMD= ${PKG_INFO} -qL ${PKGNAME:Q}
.else
PKG_FILELIST_CMD= ${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST}
.endif
.include "depends.mk"
.include "check.mk"

13
mk/pkgformat/pkg/replace.mk
View File

@@ -1,19 +1,14 @@
# $NetBSD: replace.mk,v 1.2 2013/05/23 13:18:56 obache Exp $
# $NetBSD: replace.mk,v 1.4 2016/09/19 12:26:08 gdt Exp $
#
# _pkgformat-replace:
# Updates a package in-place on the system (USE_DESTDIR=no).
#
# _pkgformat-destdir-replace:
# Updates a package in-place on the system (USE_DESTDIR=yes).
# Updates a package in-place on the system.
#
# See also:
# replace
#
# XXX: The whole replacement, from deinstalling the old package up
# to installing the new package, should be one transaction. It
# currently isn't, and the check-files target for other packages
# can be confused when a +REQUIRED_BY files suddenly disappears.
# to installing the new package, should be one transaction.
#
_pkgformat-replace: \
replace-names \
@@ -27,9 +22,9 @@ _pkgformat-replace: \
replace-fixup-installed-info \
.PHONY
# tarup is omitted for DESTDIR, because the benefits are very small
_pkgformat-destdir-replace: \
replace-names \
replace-tarup \
replace-destdir \
.PHONY