Import of pkgsrc-2015Q3

This commit is contained in:
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.53 2014/10/09 14:06:49 wiz Exp $
# $NetBSD: Makefile,v 1.54 2015/08/17 08:18:31 wiz Exp $
PKGNAME= pkg_comp-1.37
PKGNAME= pkg_comp-1.38
CATEGORIES= pkgtools
MAINTAINER= jmmv@NetBSD.org

View File

@@ -1,4 +1,4 @@
.\" $NetBSD: pkg_comp.8,v 1.39 2013/12/31 17:22:40 wiz Exp $
.\" $NetBSD: pkg_comp.8,v 1.40 2015/08/17 08:18:31 wiz Exp $
.\"
.\" pkg_comp - Build packages inside a clean chroot environment
.\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd December 31, 2013
.Dd August 17, 2015
.Dt PKG_COMP 8
.Os
.Sh NAME
@@ -368,19 +368,6 @@ environment and used to build all packages, using the
package.
Defaults to
.Ql no .
.It USE_XPKGWEDGE
If set to
.Ql yes ,
you want xpkgwedge to be compiled and installed automatically inside the
chroot.
This takes care of setting up
.Pa /etc/profile
and
.Pa /etc/csh.login
for xpkgwedge to work.
Has no effect if X is unconfigured.
Defaults to
.Ql yes .
.El
.Ss Mounted file systems
In order to avoid duplicating huge system trees,

View File

@@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: pkg_comp.sh,v 1.41 2012/05/19 10:54:40 jmmv Exp $
# $NetBSD: pkg_comp.sh,v 1.42 2015/08/17 08:18:31 wiz Exp $
#
# pkg_comp - Build packages inside a clean chroot environment
# Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -42,7 +42,7 @@ ProgName="`basename $0`"
_MKCONF_VARS="WRKDIR_BASENAME MKOBJDIRS BSDSRCDIR WRKOBJDIR DISTDIR PACKAGES \
PKG_DEVELOPER CLEANDEPENDS LOCALBASE PKG_SYSCONFBASE \
CFLAGS CPPFLAGS CXXFLAGS USE_AUDIT_PACKAGES PKGVULNDIR \
USE_XPKGWEDGE PKGSRC_COMPILER \
PKGSRC_COMPILER \
LIBKVER_STANDALONE_PREFIX PKG_DBDIR"
_TEMPLATE_VARS="DESTDIR ROOTSHELL COPYROOTCFG BUILD_TARGET DISTRIBDIR SETS \
@@ -97,7 +97,6 @@ env_setdefaults()
: ${USE_GCC3:=no}
: ${USE_AUDIT_PACKAGES:=yes}
: ${PKGVULNDIR:=/usr/pkg/share}
: ${USE_XPKGWEDGE:=yes}
: ${PKGSRC_COMPILER:=gcc}
: ${PKG_DBDIR:=/var/db/pkg}
@@ -636,16 +635,10 @@ makeroot_libkver()
# makeroot_x11
#
# If X11 is enabled, installs x11-links inside the sandbox.
# If USE_XPKGWEDGE is yes, configures xpkgwedge too (but does not
# install it; pkgsrc will take care of that when needed).
#
makeroot_x11()
{
if [ "$SETS_X11" != "no" ]; then
if [ "$USE_XPKGWEDGE" = "yes" ]; then
echo "export XAPPLRESDIR=${LOCALBASE}/lib/X11/app-defaults" >> $DESTDIR/etc/profile
echo "setenv XAPPLRESDIR ${LOCALBASE}/lib/X11/app-defaults" >> $DESTDIR/etc/csh.login
fi
[ "$Nflag" = "no" ] && build_and_install pkgtools/x11-links
fi
}