Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,4 +1,4 @@
$NetBSD: README,v 1.1 2011/10/15 00:23:09 reed Exp $
$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz Exp $
= Introduction =
@@ -38,7 +38,6 @@ ones are useful. Document them.)
* PKG_CREATE
* PKG_DELETE
* PKG_INFO
* PKG_VIEW
* LINKFARM
* PKG_BEST_EXISTS

View File

@@ -1,4 +1,4 @@
# $NetBSD: metadata.mk,v 1.8 2014/03/02 07:18:36 obache Exp $
# $NetBSD: metadata.mk,v 1.11 2015/02/16 10:17:47 jperkin Exp $
######################################################################
### The targets below are all PRIVATE.
@@ -207,26 +207,25 @@ ${_DESCR_FILE}: ${DESCR_SRC}
### This file contains important messages which apply to this package,
### and are shown during installation.
###
.if !defined(MESSAGE_SRC)
. if exists(${PKGDIR}/MESSAGE)
MESSAGE_SRC= ${PKGDIR}/MESSAGE
. else
. if exists(${PKGDIR}/MESSAGE.common)
MESSAGE_SRC= ${PKGDIR}/MESSAGE.common
. endif
. if exists(${PKGDIR}/MESSAGE.${OPSYS})
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
. endif
. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g})
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}
. endif
. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
. endif
.if exists(${PKGDIR}/MESSAGE)
MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE
.else
. if exists(${PKGDIR}/MESSAGE.common)
MESSAGE_SRC_DFLT= ${PKGDIR}/MESSAGE.common
. endif
. if exists(${PKGDIR}/MESSAGE.${OPSYS})
MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS}
. endif
. if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g})
MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}
. endif
. if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
MESSAGE_SRC_DFLT+= ${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
. endif
.endif
MESSAGE_SRC?= ${MESSAGE_SRC_DFLT}
.if defined(MESSAGE_SRC)
.if !empty(MESSAGE_SRC)
_MESSAGE_FILE= ${PKG_DB_TMPDIR}/+DISPLAY
_METADATA_TARGETS+= ${_MESSAGE_FILE}

View File

@@ -1,4 +1,4 @@
# $NetBSD: package.mk,v 1.3 2013/08/10 06:05:57 obache Exp $
# $NetBSD: package.mk,v 1.9 2015/02/16 10:50:33 jperkin Exp $
.if defined(PKG_SUFX)
WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -14,7 +14,13 @@ 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
@@ -38,7 +44,7 @@ package-check-installed:
### package-create creates the binary package.
###
.PHONY: package-create
package-create: package-remove ${PKGFILE} package-links
package-create: ${PKGFILE} package-links
######################################################################
### stage-package-create (PRIVATE, pkgsrc/mk/package/package.mk)
@@ -62,9 +68,6 @@ _PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
. endif
.endif
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
_PKG_ARGS_PACKAGE+= -E
.endif
${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
${RUN} ${MKDIR} ${.TARGET:H}
@@ -76,12 +79,21 @@ ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode; \
fi
.if ${_USE_DESTDIR} != "no"
.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 || \
${CP} -pf ${STAGE_PKGFILE} ${PKGFILE}
. endif
.endif
######################################################################
@@ -184,6 +196,7 @@ real-package-install:
@${DO_NADA}
.endif
MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q}
su-real-package-install:
@${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])

View File

@@ -1,4 +1,4 @@
# $NetBSD: pkgformat-vars.mk,v 1.3 2013/05/09 23:37:26 riastradh Exp $
# $NetBSD: pkgformat-vars.mk,v 1.5 2014/12/30 15:13:20 wiz Exp $
#
# This Makefile fragment is included indirectly by bsd.prefs.mk and
# defines some variables which must be defined earlier than where
@@ -21,20 +21,14 @@ PKG_DBDIR?= /var/db/pkg
# _PKG_DBDIR is the actual packages database directory where we register
# packages.
#
.if ${PKG_INSTALLATION_TYPE} == "overwrite"
_PKG_DBDIR= ${_CROSS_DESTDIR}${PKG_DBDIR}
_HOST_PKG_DBDIR= ${HOST_PKG_DBDIR:U${PKG_DBDIR}}
.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
_PKG_DBDIR= ${_CROSS_DESTDIR}${DEPOTBASE}
_HOST_PKG_DBDIR= ${HOST_DEPOTBASE:U${DEPOTBASE}}
.endif
PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add
PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_admin
PKG_CREATE_CMD?= ${PKG_TOOLS_BIN}/pkg_create
PKG_DELETE_CMD?= ${PKG_TOOLS_BIN}/pkg_delete
PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info
PKG_VIEW_CMD?= ${PKG_TOOLS_BIN}/pkg_view
LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm
# Latest versions of tools required for correct pkgsrc operation.
@@ -71,27 +65,18 @@ _AUDIT_CONFIG_OPTION= IGNORE_URL
PKGTOOLS_ARGS?= -K ${_PKG_DBDIR}
HOST_PKGTOOLS_ARGS?= -K ${_HOST_PKG_DBDIR}
# Views are rooted in ${LOCALBASE}, all packages are depoted in
# ${DEPOTBASE}, and the package database directory for the default view
# is in ${PKG_DBDIR}.
#
PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${_CROSS_DESTDIR}${PKG_DBDIR}
HOST_PKG_VIEW_ARGS?= -W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR}
PKG_ADD?= ${PKG_ADD_CMD} ${PKGTOOLS_ARGS}
PKG_ADMIN?= ${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS}
PKG_CREATE?= ${PKG_CREATE_CMD} ${PKGTOOLS_ARGS}
PKG_DELETE?= ${PKG_DELETE_CMD} ${PKGTOOLS_ARGS}
PKG_INFO?= ${PKG_INFO_CMD} ${PKGTOOLS_ARGS}
PKG_VIEW?= ${PKG_VIEW_CMD} ${PKG_VIEW_ARGS}
LINKFARM?= ${LINKFARM_CMD}
HOST_PKG_ADD?= ${PKG_ADD_CMD} ${HOST-PKGTOOLS_ARGS}
HOST_PKG_ADD?= ${PKG_ADD_CMD} ${HOST_PKGTOOLS_ARGS}
HOST_PKG_ADMIN?= ${PKG_ADMIN_CMD} ${HOST_PKGTOOLS_ARGS}
HOST_PKG_CREATE?= ${PKG_CREATE_CMD} ${HOST_PKGTOOLS_ARGS}
HOST_PKG_DELETE?= ${PKG_DELETE_CMD} ${HOST_PKGTOOLS_ARGS}
HOST_PKG_INFO?= ${PKG_INFO_CMD} ${HOST_PKGTOOLS_ARGS}
HOST_PKG_VIEW?= ${PKG_VIEW_CMD} ${HOST_PKG_VIEW_ARGS}
HOST_LINKFARM?= ${LINKFARM_CMD}
# "${_PKG_BEST_EXISTS} pkgpattern" prints out the name of the installed

View File

@@ -1,4 +1,4 @@
# $NetBSD: pkgformat.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz Exp $
#
# This Makefile fragment provides variable and target overrides that are
# specific to the pkgsrc native package format.
@@ -22,6 +22,5 @@ PKG_FILELIST_CMD= ${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST}
.include "deinstall.mk"
.include "replace.mk"
.include "package.mk"
.include "views.mk"
.include "utility.mk"

View File

@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
# $NetBSD: reduce-depends.awk,v 1.2 2013/05/12 05:24:28 obache Exp $
# $NetBSD: reduce-depends.awk,v 1.3 2014/10/08 10:04:45 jperkin Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -84,13 +84,14 @@ BEGIN {
cmd = TEST " -d " dir
if (system(cmd) == 0) {
cmd = "cd " dir " && " PWD_CMD
while (cmd | getline pkgpath)
while ((cmd | getline pkgpath) > 0) {
if (!(pkgpath in pkgsrcdirs)) {
pkgpaths[P++] = pkgpath
pkgsrcdirs[pkgpath] = dir
}
depends[pkgpath, 0]++;
depends[pkgpath, depends[pkgpath, 0]] = pattern
}
close(cmd)
} else {
print "ERROR: [" PROGNAME "] " dir " does not exist." | ERRCAT

View File

@@ -1,90 +0,0 @@
# $NetBSD: views.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
# By default, all packages attempt to link into the views.
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
BUILD_VIEWS?= yes
.endif
# DEFAULT_VIEW.${PKGBASE} default view for ${PKGBASE}
# VIEWBASE base location of files at run-time
#
DEFAULT_VIEW.${PKGBASE}?= ${DEFAULT_VIEW}
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
. if empty(DEFAULT_VIEW.${PKGBASE}:M"")
VIEWBASE= ${LOCALBASE}/${DEFAULT_VIEW.${PKGBASE}}
. else
VIEWBASE= ${LOCALBASE}
. endif
.elif ${PKG_INSTALLATION_TYPE} == "overwrite"
VIEWBASE= ${PREFIX}
.endif
MAKE_ENV+= VIEWBASE=${VIEWBASE}
PKGVIEWS+= ${DEFAULT_VIEW.${PKGBASE}}
.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
privileged-install-hook: build-views
.endif
######################################################################
### build-views, su-build-views (PRIVATE)
######################################################################
### build-views adds the package to each view in PKGVIEWS.
###
.PHONY: build-views su-build-views
build-views: su-target
@${STEP_MSG} "Building views for ${PKGNAME}"
su-build-views:
${RUN} \
${MKDIR} ${LOCALBASE}; \
for v in ${PKGVIEWS}; do \
case "$$v" in \
"") dbdir=${PKG_DBDIR}; viewname=standard ;; \
*) dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;; \
esac; \
${STEP_MSG} "Performing package view clash check for ${PKGNAME} in $$viewname view"; \
pkg=`${PKG_INFO_CMD} -K $$dbdir -e ${PKGBASE} || ${TRUE}`; \
case "$$pkg" in \
"") ;; \
*) ${WARNING_MSG} "${PKGBASE} exists in $$viewname view - package $$pkg ***"; \
${WARNING_MSG} "Not hoisting ${PKGNAME} into $$viewname view"; \
continue; \
;; \
esac; \
${STEP_MSG} "Performing package view overwrite check for ${PKGNAME} in $$viewname view"; \
dups=`${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v check ${PKGNAME} || ${TRUE}`; \
case "$$dups" in \
"") ;; \
*) ${WARNING_MSG} "***********************************************************"; \
${WARNING_MSG} "**** The following symbolic links will be overwritten *****"; \
for f in $$dups; do \
${LS} -l ${LOCALBASE}/$$v/$$f | ${WARNING_CAT}; \
done; \
${WARNING_MSG} "***********************************************************"; \
;; \
esac; \
${STEP_MSG} "Linking package into $$viewname view"; \
${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v add ${PKGNAME}; \
done
######################################################################
### remove-views, su-remove-views (PRIVATE)
######################################################################
### remove-views removes the package from each view in PKGVIEWS.
###
.PHONY: remove-views su-remove-views
remove-views: su-target
@${STEP_MSG} "Removing ${PKGNAME} from views"
su-remove-views:
${RUN} \
for v in "" ${PKGVIEWS}; do \
${TEST} -n "$$v" || continue; \
case "$$v" in \
"") dbdir=${PKG_DBDIR}; viewname=standard ;; \
*) dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;; \
esac; \
${STEP_MSG} "Removing package from $$viewname view"; \
${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v delete ${PKGNAME}; \
done