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

6
mk/alternatives.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: alternatives.mk,v 1.11 2009/06/14 22:58:05 joerg Exp $
# $NetBSD: alternatives.mk,v 1.12 2015/11/25 13:05:47 jperkin Exp $
#
# This Makefile fragment handles the alternatives system, registering a
# package in the database.
@@ -62,9 +62,7 @@ ${WRKDIR}/.altdeinstall: ${ALTERNATIVES_SRC}
PRINT_PLIST_AWK+= /^libdata\/alternatives\// { next; }
EVAL_PREFIX+= PREFIX.pkg_alternatives=pkg_alternatives
PREFIX.alternatives_DEFAULT= ${LOCALBASE}
PKG_ALTERNATIVES= ${PREFIX.pkg_alternatives}/sbin/pkg_alternatives
PKG_ALTERNATIVES= ${LOCALBASE}/sbin/pkg_alternatives
INSTALL_TEMPLATES+= ${WRKDIR}/.altinstall
DEINSTALL_TEMPLATES+= ${WRKDIR}/.altdeinstall

4
mk/bdb.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bdb.buildlink3.mk,v 1.25 2015/01/01 18:55:10 ryoon Exp $
# $NetBSD: bdb.buildlink3.mk,v 1.26 2016/04/11 04:22:34 dbj Exp $
#
# This Makefile fragment is meant to be included by packages that
# require a Berkeley DB (BDB) implementation and that are not restricted
@@ -131,7 +131,7 @@ BUILD_DEFS_EFFECTS+= BDBBASE BDB_LIBS BDB_TYPE
.endif # BDB_BUILDLINK3_MK
.if ${BDB_TYPE} == "none"
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"[bdb.buildlink3.mk] ${_BDB_TYPE} is not an acceptable Berkeley DB type for ${PKGNAME}."
.elif ${BDB_TYPE} == "db1"
BUILDLINK_TREE+= db1 -db1

12
mk/bsd.options.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.options.mk,v 1.71 2013/06/07 00:41:39 obache Exp $
# $NetBSD: bsd.options.mk,v 1.72 2016/03/23 11:50:01 jperkin Exp $
#
# This Makefile fragment provides boilerplate code for standard naming
# conventions for handling per-package build options.
@@ -178,6 +178,16 @@ PKG_SUPPORTED_OPTIONS?= # none
PKG_FAIL_REASON+= "[bsd.options.mk] The package has no options, but includes this file."
.endif
# Handle OPSYSVARS here for package options as we need to test PKG_OPTIONS
# in options.mk and cannot wait for lazy evaluation from bsd.pkg.mk.
.for _var_ in PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS
. if defined(${_var_}.${OPSYS})
${_var_}+= ${${_var_}.${OPSYS}}
. elif defined(${_var_}.*)
${_var_}+= ${${_var_}.*}
. endif
.endfor
#
# create map of option to group and add group options to PKG_SUPPORTED_OPTIONS
#

37
mk/bsd.pkg.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.2013 2015/04/29 14:23:23 jperkin Exp $
# $NetBSD: bsd.pkg.mk,v 1.2021 2016/08/26 16:51:56 joerg Exp $
#
# This file is in the public domain.
#
@@ -139,6 +139,9 @@ PKG_FAIL_REASON+='Please unset PKG_PATH before doing pkgsrc work!'
# Allow variables to be set on a per-OS basis
OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS
OPSYSVARS+= CMAKE_ARGS CONFIGURE_ARGS CONFIGURE_ENV
OPSYSVARS+= BUILDLINK_TRANSFORM SUBST_CLASSES
OPSYSVARS+= BUILD_TARGET MAKE_ENV MAKE_FLAGS USE_TOOLS
.for _var_ in ${OPSYSVARS:O}
. if defined(${_var_}.${OPSYS})
${_var_}+= ${${_var_}.${OPSYS}}
@@ -177,6 +180,7 @@ ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
ALL_ENV+= PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
ALL_ENV+= PREFIX=${PREFIX}
ALL_ENV+= MAKELEVEL=0
ALL_ENV+= CONFIG_SITE=
# This variable can be added to MAKE_ENV to ease installation of packages
# that use BSD-style Makefiles.
@@ -360,7 +364,7 @@ _BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
#
USE_TOOLS+= \
[ awk basename cat chgrp chmod chown cmp cp cut dirname echo \
egrep env false find grep head hostname id install ln ls \
egrep env false fgrep find grep head hostname id install ln ls \
mkdir mv printf pwd rm rmdir sed sh sort \
tail test touch tr true wc xargs
@@ -422,12 +426,6 @@ _BUILD_DEFS+= USE_ABI_DEPENDS
. endif
.endif
# Find out the PREFIX of dependencies where the PREFIX is needed at build time.
.if defined(EVAL_PREFIX)
FIND_PREFIX:= ${EVAL_PREFIX}
. include "find-prefix.mk"
.endif
.if !defined(_PATH_ORIG)
_PATH_ORIG:= ${PATH}
MAKEFLAGS+= _PATH_ORIG=${_PATH_ORIG:Q}
@@ -580,7 +578,7 @@ all: ${_PKGSRC_BUILD_TARGETS}
.endif
.PHONY: makedirs
makedirs: ${WRKDIR}
makedirs: ${WRKDIR} ${FAKEHOMEDIR}
${WRKDIR}:
.if !defined(KEEP_WRKDIR)
@@ -681,23 +679,34 @@ _SHORT_UNAME_R= ${:!${UNAME} -r!:C@\.([0-9]*)[_.-].*@.\1@} # n.n[_.]anything =>
.include "install/bin-install.mk"
# Handle PaX flags
#
.include "pax.mk"
.PHONY: show-pkgtools-version
.if !target(show-pkgtools-version)
show-pkgtools-version:
@${ECHO} ${PKGTOOLS_VERSION}
.endif
# convenience target, to display make variables from command line
# i.e. "make show-var VARNAME=var", will print var's value
# show-var:
# show-vars:
# show-subdir-var:
# Convenience targets, to display make variables from the command
# line. Examples:
#
# See also:
# show-vars, show-subdir-var
# make show-var VARNAME=PKGNAME
# make show-vars VARNAMES="PKGNAME PKGVERSION PKGREVISION"
# make show-subdir-var VARNAME=DISTFILES
#
# In category directories, show-var and show-vars descend
# recursively into each subdirectory, printing the variables of
# the individual packages. To show a variable from the category
# itself, use show-subdir-var.
.PHONY: show-var
show-var:
@${ECHO} ${${VARNAME}:Q}
# enhanced version of target above, to display multiple variables
.PHONY: show-vars
show-vars:
.for VARNAME in ${VARNAMES}

8
mk/bsd.pkg.use.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.use.mk,v 1.60 2015/07/04 16:18:38 joerg Exp $
# $NetBSD: bsd.pkg.use.mk,v 1.62 2016/06/19 20:03:09 wiz Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -50,13 +50,7 @@ PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q}
MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q}
.endif
.if defined(INSTALLATION_PREFIX)
PREFIX= ${INSTALLATION_PREFIX}
.elif defined(USE_CROSSBASE)
PREFIX= ${CROSSBASE}
.else
PREFIX= ${LOCALBASE}
.endif
############################################################################
# General settings

172
mk/bsd.prefs.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.369 2015/09/08 12:07:55 jperkin Exp $
# $NetBSD: bsd.prefs.mk,v 1.387 2016/06/13 13:26:42 jperkin Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -27,7 +27,7 @@
# directory. Typical values look like editors/emacs or
# misc/openoffice-bin.
#
# Keywords: mk.conf user
# Keywords: mk.conf user platform
#
.if !defined(BSD_PKG_MK)
@@ -94,6 +94,7 @@ GNU_ARCH.aarch64eb?= aarch64_be
GNU_ARCH.coldfire?= m5407
GNU_ARCH.arm26?= arm
GNU_ARCH.arm32?= arm
GNU_ARCH.amd64?= x86_64
GNU_ARCH.earm?= arm
GNU_ARCH.earmhf?= arm
GNU_ARCH.earmeb?= armeb
@@ -127,13 +128,6 @@ MACHINE_GNU_ARCH?= ${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}
LOWER_OPSYS?= netbsd
.elif ${OPSYS} == "AIX"
LOWER_ARCH!= _cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $$1 }'`; \
if /usr/sbin/lsattr -El $$_cpuid | grep ' POWER' >/dev/null 2>&1; then \
echo rs6000; \
else \
echo powerpc; \
fi
MACHINE_ARCH?= ${LOWER_ARCH}
. if exists(/usr/bin/oslevel)
_OS_VERSION!= /usr/bin/oslevel
. else
@@ -149,70 +143,30 @@ LOWER_OPSYS?= bsdi
.elif ${OPSYS} == "Bitrig"
LOWER_OPSYS?= bitrig
LOWER_ARCH!= ${UNAME} -p
MACHINE_ARCH= ${LOWER_ARCH}
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_VENDOR?= unknown
.elif ${OPSYS} == "Cygwin"
LOWER_OPSYS?= cygwin
LOWER_VENDOR?= pc
. if !defined(LOWER_ARCH)
LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/'
. endif # !defined(LOWER_ARCH)
_OS_VERSION!= ${UNAME} -r
OS_VERSION= ${_OS_VERSION:C/\(.*\)//}
OS_VARIANT!= ${UNAME} -s
.elif ${OPSYS} == "Darwin"
LOWER_OPSYS?= darwin
.if empty(OS_VERSION:M[1-9].*.*)
# Automatically select the ABI under Mac OS X Snow Leopard. We don't
# use this at the moment because too many third party programs don't
# work with it.
#
# _SYSCTL_HW_OPTIONAL_X86_64!= /usr/sbin/sysctl -n hw.optional.x86_64
# . if ${_SYSCTL_HW_OPTIONAL_X86_64} == "1"
# ABI= 64
# .else
# ABI= 32
#. endif
ABI= 32
LOWER_ARCH.32= i386
LOWER_ARCH.64= x86_64
LOWER_ARCH= ${LOWER_ARCH.${ABI}}
.else
LOWER_ARCH!= ${UNAME} -p
.endif
MACHINE_ARCH= ${LOWER_ARCH}
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
LOWER_VENDOR?= apple
.elif ${OPSYS} == "DragonFly"
OS_VERSION:= ${OS_VERSION:C/-.*$//}
LOWER_OPSYS?= dragonfly
LOWER_ARCH!= ${UNAME} -p
. if ${LOWER_ARCH} == "amd64"
MACHINE_ARCH= x86_64
. else
MACHINE_ARCH= ${LOWER_ARCH}
. endif
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_VENDOR?= pc
.elif ${OPSYS} == "FreeBSD"
OS_VERSION:= ${OS_VERSION:C/-.*$//}
LOWER_OPSYS?= freebsd
LOWER_ARCH!= ${UNAME} -p
. if ${LOWER_ARCH} == "amd64"
MACHINE_ARCH= x86_64
. else
MACHINE_ARCH= ${LOWER_ARCH}
. endif
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
. if ${LOWER_ARCH} == "i386"
. if ${MACHINE_ARCH} == "i386"
LOWER_VENDOR?= pc
. endif
LOWER_VENDOR?= unknown
@@ -243,13 +197,9 @@ OS_VERSION= 3.0
LOWER_OPSYS?= mirbsd
LOWER_OS_VERSION= ${OS_VERSION}
LOWER_OPSYS_VERSUFFIX= ${OS_VERSION}
LOWER_ARCH!= arch -s
LOWER_VENDOR?= unknown
MACHINE_ARCH= ${LOWER_ARCH}
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
.elif !empty(OPSYS:MIRIX*)
LOWER_ARCH!= ${UNAME} -p
LOWER_OPSYS?= irix
LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
LOWER_VENDOR?= sgi
@@ -257,11 +207,6 @@ LOWER_VENDOR?= sgi
.elif ${OPSYS} == "Linux"
OS_VERSION:= ${OS_VERSION:C/-.*$//}
LOWER_OPSYS?= linux
. if !defined(LOWER_ARCH)
LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/'
. endif # !defined(LOWER_ARCH)
MACHINE_ARCH= ${LOWER_ARCH}
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
. if exists(/etc/debian_version)
LOWER_VENDOR?= debian
. elif exists(/etc/mandrake-release)
@@ -272,15 +217,19 @@ LOWER_VENDOR?= redhat
LOWER_VENDOR?= slackware
. elif exists(/etc/ssdlinux_version)
LOWER_VENDOR?= ssd
. elif ${LOWER_ARCH} == "i386"
. elif ${MACHINE_ARCH} == "i386"
LOWER_VENDOR?= pc
. endif
LOWER_VENDOR?= unknown
. if !defined(HOST_MACHINE_ARCH)
HOST_MACHINE_ARCH!= ${UNAME} -m
MAKEFLAGS+= HOST_MACHINE_ARCH=${HOST_MACHINE_ARCH:Q}
. endif
.elif ${OPSYS} == "OpenBSD"
LOWER_OPSYS?= openbsd
.elif ${OPSYS} == "OSF1"
LOWER_ARCH!= ${UNAME} -p
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
MACHINE_ARCH?= ${LOWER_ARCH}
OS_VERSION:= ${OS_VERSION:C/^V//}
LOWER_OPSYS?= osf1
LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
@@ -288,34 +237,11 @@ LOWER_VENDOR?= dec
.elif ${OPSYS} == "HPUX"
OS_VERSION:= ${OS_VERSION:C/^B.//}
. if ${MACHINE_ARCH} == "9000"
ABI?= 32
MACHINE_ARCH.32= hppa
MACHINE_ARCH.64= hppa64
MACHINE_ARCH= ${MACHINE_ARCH.${ABI}}
. endif
LOWER_OPSYS?= hpux
LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
LOWER_VENDOR?= hp
.elif ${OPSYS} == "SunOS"
ABI?= 32
. if ${MACHINE_ARCH} == "sparc"
SPARC_TARGET_ARCH?= sparcv7
. elif ${MACHINE_ARCH} == "sun4"
MACHINE_ARCH= sparc
SPARC_TARGET_ARCH?= sparcv7
. elif ${MACHINE_ARCH} == "i86pc" || ${MACHINE_ARCH} == "i86xpv" || ${MACHINE_ARCH} == "i386"
LOWER_ARCH.32= i386
LOWER_ARCH.64= x86_64
LOWER_ARCH= ${LOWER_ARCH.${ABI}}
MACHINE_ARCH= ${LOWER_ARCH}
. elif ${MACHINE_ARCH} == "unknown"
. if !defined(LOWER_ARCH)
LOWER_ARCH!= ${UNAME} -p
. endif # !defined(LOWER_ARCH)
MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
. endif
LOWER_VENDOR?= sun
LOWER_OPSYS?= solaris
LOWER_OPSYS_VERSUFFIX= 2.${OS_VERSION:C/5.//}
@@ -325,7 +251,10 @@ OS_VARIANT= SmartOS
LOWER_VARIANT_VERSION= ${_UNAME_V:C/joyent_//}
. elif !empty(_UNAME_V:Momnios-*)
OS_VARIANT= OmniOS
LOWER_VARIANT_VERSION!= /usr/bin/awk '{ if (!seen) { print $$3; seen=1 } }' /etc/release
LOWER_VARIANT_VERSION!= /usr/bin/awk '{ print $$3; exit 0; }' /etc/release
. else
OS_VARIANT= Solaris
LOWER_VARIANT_VERSION= ${_UNAME_V}
. endif
.elif ${OPSYS} == "SCO_SV"
@@ -357,12 +286,8 @@ LOWER_OS_VERSION:= ${OS_VERSION:tl}
MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS:Q}
LOWER_VENDOR?= # empty ("arch--opsys")
LOWER_ARCH?= ${MACHINE_GNU_ARCH}
# Expand now as MACHINE_ARCH can be overriden in mk.conf and
# LOWER_ARCH is typically derived from it.
NATIVE_LOWER_ARCH:= ${LOWER_ARCH}
NATIVE_MACHINE_ARCH:= ${MACHINE_ARCH}
NATIVE_MACHINE_ARCH:= ${MACHINE_ARCH}
NATIVE_MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${NATIVE_MACHINE_ARCH}
MACHINE_PLATFORM?= ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
NATIVE_MACHINE_GNU_PLATFORM?= ${NATIVE_MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS:C/[0-9]//g}${NATIVE_APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}${NATIVE_APPEND_ABI}
@@ -480,47 +405,30 @@ do-install:
@${DO_NADA}
.endif
# After 2011Q1, the default is to use DESTDIR.
USE_DESTDIR?= yes
# PKG_DESTDIR_SUPPORT can only be one of "none", "destdir", or "user-destdir".
# PKG_DESTDIR_SUPPORT can only be one of "destdir", or "user-destdir".
PKG_DESTDIR_SUPPORT?= user-destdir
.if ${PKG_DESTDIR_SUPPORT} == "none" || empty(USE_DESTDIR:M[Yy][Ee][Ss])
. if empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Nn][Oo])
PKG_FAIL_REASON+= "USE_DESTDIR must be either \`\`yes'' or \`\`no''"
. endif
_USE_DESTDIR= no
.elif ${PKG_DESTDIR_SUPPORT} == "user-destdir"
.if ${PKG_DESTDIR_SUPPORT} == "user-destdir"
_USE_DESTDIR= user-destdir
.elif ${PKG_DESTDIR_SUPPORT} == "destdir"
_USE_DESTDIR= destdir
.else
PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`none'', \`\`destdir'', or \`\`user-destdir''."
.endif
# This stanza serves to warn the user; deciding to not build
# non-DESTDIR-capable packages when not in DESTDIR mode is above.
.if ${PKG_DESTDIR_SUPPORT} == "none"
WARNINGS+= "[bsd.prefs.mk] The package ${PKGNAME} is missing DESTDIR support."
PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''."
.endif
# When using staged installation, everything gets installed into
# ${DESTDIR}${PREFIX} instead of ${PREFIX} directly.
#
.if ${_USE_DESTDIR} != "no"
DESTDIR= ${WRKDIR}/.destdir
. if ${_USE_DESTDIR} == "destdir"
.if ${_USE_DESTDIR} == "destdir"
_MAKE_PACKAGE_AS_ROOT= yes
_MAKE_CLEAN_AS_ROOT= yes
_MAKE_INSTALL_AS_ROOT= yes
. elif ${_USE_DESTDIR} == "user-destdir"
.else
_MAKE_PACKAGE_AS_ROOT= no
_MAKE_CLEAN_AS_ROOT= no
_MAKE_INSTALL_AS_ROOT= no
. endif
.else
DESTDIR=
.endif
# controls whether binary packages are preserved in pkgsrc/packages/All
# default is no (to preserve settings since 2013/05/23, prior to that it
@@ -688,12 +596,6 @@ COMPILER_INCLUDE_DIRS?= ${_OPSYS_INCLUDE_DIRS:U/usr/include}
COMPILER_LIB_DIRS?= ${_OPSYS_LIB_DIRS:U/usr/lib${LIBABISUFFIX} /lib${LIBABISUFFIX}}
SYSTEM_DEFAULT_RPATH?= ${_OPSYS_SYSTEM_RPATH:U/usr/lib}
# WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the
# linker flags to extract all symbols from a static archive.
#
WHOLE_ARCHIVE_FLAG?= ${_OPSYS_WHOLE_ARCHIVE_FLAG}
NO_WHOLE_ARCHIVE_FLAG?= ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG}
USE_TOOLS?= # empty
# Provide default values for TOOLs used by the top-level make.
@@ -786,6 +688,30 @@ PREPEND_PATH+= ${LOCALBASE}/bin
INIT_SYSTEM?= rc.d
_BUILD_DEFS+= INIT_SYSTEM
_PKGSRC_MKPIE= no
.if (${PKGSRC_MKPIE:tl} == "yes") && \
(${_OPSYS_SUPPORTS_MKPIE:Uno} == "yes")
_PKGSRC_MKPIE= yes
.endif
_PKGSRC_USE_FORTIFY= no
.if (${PKGSRC_USE_FORTIFY:tl} == "yes") && \
(${_OPSYS_SUPPORTS_FORTIFY:Uno} == "yes")
_PKGSRC_USE_FORTIFY= yes
.endif
_PKGSRC_USE_RELRO= no
.if (${PKGSRC_USE_RELRO:tl} == "yes") && \
(${_OPSYS_SUPPORTS_RELRO:Uno} == "yes")
_PKGSRC_USE_RELRO= yes
.endif
_PKGSRC_USE_SSP= no
.if (${PKGSRC_USE_SSP:tl} != "no") && \
(${_OPSYS_SUPPORTS_SSP:Uno} == "yes")
_PKGSRC_USE_SSP= yes
.endif
# Enable cwrappers if requested unless we're building the wrappers themselves.
.if ${USE_CWRAPPERS:tl} != "no" && empty(PKGPATH:Mpkgtools/cwrappers)
_USE_CWRAPPERS= yes
@@ -823,13 +749,13 @@ _SYS_VARS.dirs= WRKDIR DESTDIR PKG_SYSCONFBASEDIR
# List of 64bit operating systems with sizeof(int) != sizeof(void *).
# This can be used with BROKEN_ON_PLATFORM for software that is not
# 64bit clean. The "amd64" case is for OpenBSD.
# 64bit clean.
#
# Keywords: BROKEN_ON_PLATFORM 64bit
#
LP64PLATFORMS= *-*-aarch64 *-*-aarch64eb *-*-alpha *-*-ia64 \
*-*-mips64eb *-*-mips64el *-*-powerpc64 *-*-riscv64 \
*-*-sparc64 *-*-x86_64 *-*-amd64
*-*-sparc64 *-*-x86_64
# Lists of big-endian and little-endian platforms, to be used with
# BROKEN_ON_PLATFORM.
@@ -839,7 +765,7 @@ LP64PLATFORMS= *-*-aarch64 *-*-aarch64eb *-*-alpha *-*-ia64 \
_BIGENDIANCPUS= coldfire hppa m68000 m68k mips64eb mipseb or1k \
powerpc powerpc64 sh3eb sparc sparc64
_LITTLEENDIANCPUS= alpha i386 ia64 mips64el mipsel riscv32 riscv64 \
sh3el vax x86_64 amd64
sh3el vax x86_64
# piles of ARM variants
_ARMCPUS+= arm earm earmhf earmv4 earmv5 earmv6 earmv6hf

5
mk/build/bsd.build-vars.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.build-vars.mk,v 1.9 2015/07/04 16:18:38 joerg Exp $
# $NetBSD: bsd.build-vars.mk,v 1.11 2016/04/10 15:58:02 joerg Exp $
#
# Package-settable variables:
#
@@ -34,8 +34,6 @@ MAKE_ENV+= ${ALL_ENV}
MAKE_ENV+= ${NO_EXPORT_CPP:D:UCPP=${CPP:Q}}
MAKE_ENV+= LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
MAKE_ENV+= LOCALBASE=${LOCALBASE:Q}
MAKE_ENV+= NO_WHOLE_ARCHIVE_FLAG=${NO_WHOLE_ARCHIVE_FLAG:Q}
MAKE_ENV+= WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q}
MAKE_ENV+= X11BASE=${X11BASE:Q}
MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
MAKE_ENV+= PKGINFODIR=${PKGINFODIR:Q}
@@ -52,4 +50,3 @@ MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}}
# processes for build-related phases.
#
PKGSRC_MAKE_ENV+= PATH=${PATH:Q}
PKGSRC_MAKE_ENV+= USE_DESTDIR=${USE_DESTDIR:Q}

5
mk/buildlink3/bsd.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.buildlink3.mk,v 1.236 2015/05/04 19:23:19 joerg Exp $
# $NetBSD: bsd.buildlink3.mk,v 1.238 2016/06/09 02:38:34 markd Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -968,6 +968,7 @@ _CWRAPPERS_TRANSFORM+= L:/usr/lib/../libx32:/usr/libx32
#
.for _dir_ in ${COMPILER_INCLUDE_DIRS}
_BLNK_TRANSFORM+= opt-sub:-I${_dir_}:-I${_BLNK_MANGLE_DIR.${_dir_}}
_BLNK_TRANSFORM+= opt-sub:-isystem,${_dir_}:-isystem,${_BLNK_MANGLE_DIR.${_dir_}}
_CWRAPPERS_TRANSFORM+= I:${_dir_}:${_dir_}
.endfor
.for _dir_ in ${COMPILER_LIB_DIRS}
@@ -997,11 +998,11 @@ _CWRAPPERS_TRANSFORM+= R:${_dir_}:${_dir_}
# ${LOCALBASE} or ${X11BASE} into references into ${BUILDLINK_DIR}.
#
_BLNK_TRANSFORM+= P:${LOCALBASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_DIR}}
_CWRAPPERS_TRANSFORM+= P:${X11BASE}:${BUILDLINK_X11_DIR}
.if defined(USE_X11) && ${X11_TYPE} != "modular"
_BLNK_TRANSFORM+= P:${X11BASE}:${_BLNK_MANGLE_DIR.${BUILDLINK_X11_DIR}}
_CWRAPPERS_TRANSFORM+= P:${LOCALBASE}:${BUILDLINK_DIR}
.endif
_CWRAPPERS_TRANSFORM+= P:${X11BASE}:${BUILDLINK_X11_DIR}
#
# Transform references to ${X11BASE} into ${BUILDLINK_X11_DIR}.
# (do so before transforming references to ${LOCALBASE} unless the

7
mk/buildlink3/show-buildlink3.sh
View File

@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: show-buildlink3.sh,v 1.3 2009/10/05 02:40:06 obache Exp $
# $NetBSD: show-buildlink3.sh,v 1.4 2016/07/10 07:08:21 rillig Exp $
#
# This script is a helper for the show-buildlink3 target and outputs
# the arguments as tree.
#
while test $# -gt 0; do
pkg="$1"
indentation=""
for pkg in "$@"; do
case $pkg in
-*)
indentation=${indentation# }
@@ -17,5 +17,4 @@ while test $# -gt 0; do
indentation="${indentation} "
;;
esac
shift
done

7
mk/check/check-interpreter.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: check-interpreter.mk,v 1.29 2015/04/29 13:05:28 jperkin Exp $
# $NetBSD: check-interpreter.mk,v 1.31 2016/03/11 21:11:47 dholland Exp $
#
# This file checks that after installation, all files of the package
# that start with a "#!" line will find their interpreter. Files that
@@ -56,12 +56,15 @@ _check-interpreter: error-check .PHONY
if [ ! -x "$$file" ]; then \
continue; \
fi; \
if [ -d "$$file" ]; then \
continue; \
fi; \
if [ ! -r "$$file" ]; then \
${DELAYED_WARNING_MSG} "[check-interpreter.mk] File \"${DESTDIR}${PREFIX}/$$file\" cannot be read."; \
continue; \
fi; \
${SHCOMMENT} "[$$file]"; \
interp=`${SED} -n -e '1s/^#![[:space:]]*\([^[:space:]]*\).*/\1/p' -e '1q' < "$$file"` \
interp=`LC_ALL=C ${SED} -n -e '1s/^#![[:space:]]*\([^[:space:]]*\).*/\1/p' -e '1q' < "$$file"` \
|| { ${DELAYED_WARNING_MSG} "[check-interpreter.mk] sed(1) failed for \"${DESTDIR}${PREFIX}/$$file\"."; \
continue; \
}; \

4
mk/check/check-portability.awk
View File

@@ -1,4 +1,4 @@
# $NetBSD: check-portability.awk,v 1.8 2014/03/11 23:27:40 ryoon Exp $
# $NetBSD: check-portability.awk,v 1.9 2016/02/24 08:54:23 jklos Exp $
#
# Checks a shell file for possible portability problems.
#
@@ -31,6 +31,8 @@ function check_random(line) {
function check_test_eqeq(line, n, word, i) {
if (length(line) == 0)
return;
n = split(line, word);
for (i = 3; i < n; i++) {
if (word[i] == "==") {

11
mk/check/check-shlibs-elf.awk
View File

@@ -1,4 +1,4 @@
# $NetBSD: check-shlibs-elf.awk,v 1.11 2015/08/10 15:11:47 jperkin Exp $
# $NetBSD: check-shlibs-elf.awk,v 1.13 2016/03/10 15:56:24 jperkin Exp $
#
# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -121,13 +121,21 @@ function checkshlib(DSO, needed, rpath, found, dso_rpath, got_rpath, nrpath) {
if (!got_rpath)
nrpath = split(system_rpath, rpath, ":")
close(cmd)
nedirs = split(extradirs, edirs, " ")
for (p in rpath) {
if (rpath[p] == wrkdir ||
substr(rpath[p], 1, length(wrkdir) + 1) == wrkdir "/") {
print DSO ": rpath relative to WRKDIR"
}
for (e = 1; e <= nedirs; e++) {
if (rpath[p] == edirs[e] ||
substr(rpath[p], 1, length(edirs[e]) + 1) == edirs[e] "/") {
print DSO ": rpath " rpath[p] " relative to CHECK_WRKREF_EXTRA_DIRS directory " edirs[e]
}
}
}
for (lib in needed) {
found = 0
for (p = 1; p <= nrpath; p++) {
libfile = cross_destdir rpath[p] "/" lib
if (!(libfile in libcache)) {
@@ -160,6 +168,7 @@ BEGIN {
destdir = ENVIRON["DESTDIR"]
readelf = ENVIRON["READELF"]
wrkdir = ENVIRON["WRKDIR"]
extradirs = ENVIRON["CHECK_WRKREF_EXTRA_DIRS"]
pkg_info_cmd = ENVIRON["PKG_INFO_CMD"]
depends_file = ENVIRON["DEPENDS_FILE"]
if (readelf == "")

15
mk/check/check-shlibs-macho.awk
View File

@@ -1,4 +1,4 @@
# $NetBSD: check-shlibs-macho.awk,v 1.1 2015/08/17 17:35:23 jperkin Exp $
# $NetBSD: check-shlibs-macho.awk,v 1.3 2016/08/20 18:52:42 adam Exp $
#
# Read a list of potential Mach-O binaries from stdin.
@@ -80,10 +80,15 @@ function checkshlib(DSO, needed, found) {
# Ensure we don't have any WRKDIR references.
#
if (lib == wrkdir ||
substr(lib, 1, length(wrkdir) + 1) == wrkdir "/") {
substr(lib, 1, length(wrkdir) + 1) == wrkdir "/")
print DSO ": path relative to WRKDIR: " lib
break
}
#
# Ensure there are no relative paths.
#
if (substr(lib, 1, 1) != "/")
print DSO ": relative library path: " lib
#
# Check destination dirs for library existence. If found in a
# system path (cross_destdir is somewhat confusing but if set
@@ -114,4 +119,4 @@ BEGIN {
depends_file = ENVIRON["DEPENDS_FILE"]
}
{ checkshlib($0); }
/\t/ { checkshlib($0); }

39
mk/check/check-shlibs.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: check-shlibs.mk,v 1.26 2015/08/17 17:35:23 jperkin Exp $
# $NetBSD: check-shlibs.mk,v 1.29 2016/04/10 15:58:02 joerg Exp $
#
# This file verifies that all libraries used by the package can be found
# at run-time.
@@ -63,10 +63,11 @@ CHECK_SHLIBS_NATIVE= ${PKGSRCDIR}/mk/check/check-shlibs-macho.awk
CHECK_SHLIBS_NATIVE_ENV+= CROSS_DESTDIR=${_CROSS_DESTDIR:Q}
CHECK_SHLIBS_NATIVE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q}
CHECK_SHLIBS_NATIVE_ENV+= DEPENDS_FILE=${_RRDEPENDS_FILE:Q}
. if ${_USE_DESTDIR} != "no"
CHECK_SHLIBS_NATIVE_ENV+= DESTDIR=${DESTDIR:Q}
. endif
CHECK_SHLIBS_NATIVE_ENV+= WRKDIR=${WRKDIR:Q}
. if defined(CHECK_WRKREF) && !empty(CHECK_WRKREF:Mextra)
CHECK_SHLIBS_NATIVE_ENV+= CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q}
. endif
_check-shlibs: error-check .PHONY
@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
@@ -85,38 +86,6 @@ _check-shlibs: error-check .PHONY
${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET}
.else
. if ${_USE_DESTDIR} != "no"
_check-shlibs: error-check .PHONY
@${WARNING_MSG} "Skipping missing run-time search-path check in DESTDIR mode."
. else
_check-shlibs: error-check .PHONY
@${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
${RUN} rm -f ${ERROR_DIR}/${.TARGET}
${RUN} \
exec 1>${ERROR_DIR}/${.TARGET}; \
case ${LDD:Q}"" in \
"") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
*) ldd=${LDD:Q} ;; \
esac; \
${TEST} -x "$$ldd" || exit 0; \
cd ${DESTDIR}${PREFIX}; \
${_CHECK_SHLIBS_FILELIST_CMD} | \
${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} | \
while read file; do \
case "$$file" in \
${CHECK_SHLIBS_SKIP:@p@${p}) continue ;;@} \
*) ;; \
esac; \
err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \
${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \
done
${RUN} \
exec 1>>${ERROR_DIR}/${.TARGET}; \
if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then \
${ECHO} "*** The programs/libs shown above will not find the listed"; \
${ECHO} " shared libraries at runtime."; \
${ECHO} " Please fix the package (add -Wl,-R.../lib in the right places)!"; \
${SHCOMMENT} Might not error-out for non-pkg-developers; \
fi
. endif
.endif

6
mk/checksum/checksum.mk
View File

@@ -1,9 +1,9 @@
# $NetBSD: checksum.mk,v 1.20 2013/11/16 15:29:39 jakllsch Exp $
# $NetBSD: checksum.mk,v 1.22 2016/01/06 07:38:25 dholland Exp $
#
# See bsd.checksum.mk for helpful comments.
#
_DIGEST_ALGORITHMS?= SHA1 RMD160
_DIGEST_ALGORITHMS?= SHA1 RMD160 SHA512
_PATCH_DIGEST_ALGORITHMS?= SHA1
# These variables are set by pkgsrc/mk/fetch/bsd.fetch-vars.mk.
@@ -41,7 +41,7 @@ checksum checksum-phase:
case ${.TARGET:Q} in \
*-phase) ${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;; \
esac; \
if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE} ${_CKSUMFILES}; then \
if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE:tA} ${_CKSUMFILES}; then \
${TRUE}; \
else \
${ERROR_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \

10
mk/compiler/distcc.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: distcc.mk,v 1.31 2013/05/09 23:37:26 riastradh Exp $
# $NetBSD: distcc.mk,v 1.32 2015/11/25 13:05:47 jperkin Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -67,9 +67,6 @@ _USE_DISTCC= YES
.endif
.if !empty(_USE_DISTCC:M[yY][eE][sS])
EVAL_PREFIX+= _DISTCCBASE=distcc
_DISTCCBASE_DEFAULT= ${LOCALBASE}
_DISTCC_DIR= ${WRKDIR}/.distcc
_DISTCC_VARS= # empty
. if !empty(_LANGUAGES.distcc:Mc)
@@ -94,6 +91,7 @@ PREPEND_PATH+= ${_DISTCC_DIR}/bin
# Add the dependency on distcc.
TOOL_DEPENDS+= distcc-[0-9]*:../../devel/distcc
DISTCCBASE?= ${PREFIX}
. if defined(DISTCC_HOSTS) && !empty(DISTCC_HOSTS)
PKGSRC_MAKE_ENV+= DISTCC_HOSTS=${DISTCC_HOSTS:Q}
@@ -112,11 +110,11 @@ override-tools: ${_DISTCC_${_var_}}
${_DISTCC_${_var_}}:
${RUN}${MKDIR} ${.TARGET:H}
${RUN} \
${LN} -fs ${_DISTCCBASE}/bin/distcc ${.TARGET}
${LN} -fs ${DISTCCBASE}/bin/distcc ${.TARGET}
. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
${RUN} \
if [ ! -x "${_alias_}" ]; then \
${LN} -fs ${_DISTCCBASE}/bin/distcc ${_alias_}; \
${LN} -fs ${DISTCCBASE}/bin/distcc ${_alias_}; \
fi
. endfor
. endif

11
mk/compiler/f2c.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: f2c.mk,v 1.16 2013/05/09 23:37:26 riastradh Exp $
# $NetBSD: f2c.mk,v 1.17 2015/11/25 13:05:47 jperkin Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -60,9 +60,6 @@ _USE_F2C= YES
.if !empty(_USE_F2C:M[yY][eE][sS])
USE_LANGUAGES+= c
EVAL_PREFIX+= _F2CBASE=f2c
_F2CBASE_DEFAULT= ${LOCALBASE}
_F2C_DIR= ${WRKDIR}/.f2c
_F2C_VARS= # empty
. if !empty(_LANGUAGES.f2c:Mfortran) || !empty(_LANGUAGES.f2c:Mfortran77)
@@ -70,7 +67,7 @@ PKG_FC?= ${FC}
_F2C_VARS+= FC
_F2C_FC:= ${_F2C_DIR}/bin/${PKG_FC:T}
_ALIASES.FC+= f77 g77 f2c-f77
FCPATH= ${_F2CBASE}/bin/f2c-f77
FCPATH= ${LOCALBASE}/bin/f2c-f77
PKG_FC:= ${_F2C_FC}
#
# The f2c-f77 shell script invokes the C compiler, so ensure that it finds
@@ -121,11 +118,11 @@ override-tools: ${_F2C_${_var_}}
${_F2C_${_var_}}:
${RUN}${MKDIR} ${.TARGET:H}
${RUN} \
${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${.TARGET}
${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${.TARGET}
. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
${RUN} \
if [ ! -x "${_alias_}" ]; then \
${LN} -fs ${_F2CBASE}/bin/f2c-f77 ${_alias_}; \
${LN} -fs ${LOCALBASE}/bin/f2c-f77 ${_alias_}; \
fi
. endfor
. endif

15
mk/compiler/g95.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: g95.mk,v 1.4 2012/12/15 21:23:31 markd Exp $
# $NetBSD: g95.mk,v 1.6 2016/07/09 17:12:22 dholland Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,10 +40,8 @@ COMPILER_G95_MK= defined
.include "../../mk/bsd.prefs.mk"
.if !empty(PKGPATH:Mlang/g95) || !empty(PKGPATH:Mdevel/patch) || \
!empty(PKGPATH:Mdevel/libtool-base)
.if !empty(PKGPATH:Mlang/g95)
IGNORE_G95= yes
MAKEFLAGS+= IGNORE_G95=yes
.endif
.if defined(IGNORE_G95)
@@ -68,9 +66,8 @@ _USE_G95= YES
.endif
.if !empty(_USE_G95:M[yY][eE][sS])
EVAL_PREFIX+= _G95BASE=g95
_G95BASE_DEFAULT= ${LOCALBASE}
FC= g95
G95BASE?= ${PREFIX}
_G95_DIR= ${WRKDIR}/.g95
_G95_VARS= # empty
@@ -80,7 +77,7 @@ PKG_FC?= ${FC}
_G95_VARS+= FC
_G95_FC:= ${_G95_DIR}/bin/${PKG_FC:T}
_ALIASES.FC+= f77 g77 g95
FCPATH= ${_G95BASE}/bin/g95
FCPATH= ${G95BASE}/bin/g95
PKG_FC:= ${_G95_FC}
. endif
@@ -103,11 +100,11 @@ override-tools: ${_G95_${_var_}}
${_G95_${_var_}}:
${RUN}${MKDIR} ${.TARGET:H}
${RUN} \
${LN} -fs ${_G95BASE}/bin/g95 ${.TARGET}
${LN} -fs ${G95BASE}/bin/g95 ${.TARGET}
. for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
${RUN} \
if [ ! -x "${_alias_}" ]; then \
${LN} -fs ${_G95BASE}/bin/g95 ${_alias_}; \
${LN} -fs ${G95BASE}/bin/g95 ${_alias_}; \
fi
. endfor
. endif

105
mk/compiler/gcc.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: gcc.mk,v 1.163 2015/07/26 22:13:17 khorben Exp $
# $NetBSD: gcc.mk,v 1.169 2016/09/13 07:59:15 maya Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -105,7 +105,7 @@ GCC_REQD+= 20120614
# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
# without the PKGREVISIONs.
_GCC_DIST_NAME:= gcc5
_GCC_DIST_NAME:= gcc6
.include "../../lang/${_GCC_DIST_NAME}/version.mk"
_GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:tu}_DIST_VERSION}
@@ -141,6 +141,9 @@ _GCC49_PATTERNS= 4.9 4.9.*
# _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6.
_GCC5_PATTERNS= 5.*
# _GCC6_PATTERNS matches N s.t. 6.0 <= N < 7.
_GCC6_PATTERNS= 6.*
# _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD*
_GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]*
@@ -287,6 +290,12 @@ _NEED_GCC5?= no
_NEED_GCC5= yes
. endif
.endfor
_NEED_GCC6?= no
.for _pattern_ in ${_GCC6_PATTERNS}
. if !empty(_GCC_REQD:M${_pattern_})
_NEED_GCC6= yes
. endif
.endfor
_NEED_GCC_AUX?= no
.for _pattern_ in ${_GCC_AUX_PATTERNS}
. if !empty(_GCC_REQD:M${_pattern_})
@@ -299,8 +308,8 @@ _NEED_NEWER_GCC=NO
!empty(_NEED_GCC45:M[nN][oO]) && !empty(_NEED_GCC46:M[nN][oO]) && \
!empty(_NEED_GCC47:M[nN][oO]) && !empty(_NEED_GCC48:M[nN][oO]) && \
!empty(_NEED_GCC49:M[nN][oO]) && !empty(_NEED_GCC5:M[nN][oO]) && \
!empty(_NEED_GCC_AUX:M[nN][oO])
_NEED_GCC5= yes
!empty(_NEED_GCC6:M[nN][oO]) && !empty(_NEED_GCC_AUX:M[nN][oO])
_NEED_GCC6= yes
.endif
# Assume by default that GCC will only provide a C compiler.
@@ -325,6 +334,8 @@ LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
.elif !empty(_NEED_GCC5:M[yY][eE][sS])
LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
.elif !empty(_NEED_GCC6:M[yY][eE][sS])
LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
LANGUAGES.gcc= c c++ fortran fortran77 objc ada
.endif
@@ -338,6 +349,55 @@ _WRAP_EXTRA_ARGS.CC+= -std=gnu99
CWRAPPERS_APPEND.cc+= -std=gnu99
.endif
.if ${OPSYS} == "NetBSD"
_FORTIFY_CFLAGS.gcc= -D_FORTIFY_SOURCE=2
_MKPIE_CFLAGS.gcc= -fPIC
# XXX for executables it should be:
#_MKPIE_CFLAGS.gcc= -fPIE
# XXX for libraries a sink wrapper around gcc is required and used instead
#_MKPIE_LDFLAGS.gcc= -pie
_RELRO_LDFLAGS.gcc= -Wl,-z,relro -Wl,-z,now
.endif
.if ${OPSYS} == "SunOS"
_FORTIFY_CFLAGS.gcc= -D_FORTIFY_SOURCE=2
.endif
.if ${_PKGSRC_MKPIE} == "yes"
_GCC_CFLAGS+= ${_MKPIE_CFLAGS.gcc}
_GCC_LDFLAGS+= ${_MKPIE_LDFLAGS.gcc}
CWRAPPERS_APPEND.cc+= ${_MKPIE_CFLAGS.gcc}
# XXX this differs for libraries and executables
# CWRAPPERS_APPEND.ld+= ${_MKPIE_LDFLAGS.gcc}
.endif
.if ${_PKGSRC_USE_FORTIFY} == "yes"
_GCC_CFLAGS+= ${_FORTIFY_CFLAGS.gcc}
CWRAPPERS_APPEND.cc+= ${_FORTIFY_CFLAGS.gcc}
.endif
.if ${_PKGSRC_USE_RELRO} == "yes"
_GCC_LDFLAGS+= ${_RELRO_LDFLAGS.gcc}
CWRAPPERS_APPEND.ld+= ${_RELRO_LDFLAGS.gcc}
.endif
# The user can choose the level of stack smashing protection.
.if ${PKGSRC_USE_SSP} == "all"
_SSP_CFLAGS= -fstack-protector-all
.elif ${PKGSRC_USE_SSP} == "strong"
_SSP_CFLAGS= -fstack-protector-strong
.else
_SSP_CFLAGS= -fstack-protector
.endif
.if ${_PKGSRC_USE_SSP} == "yes"
_WRAP_EXTRA_ARGS.CC+= ${_SSP_CFLAGS}
_WRAP_EXTRA_ARGS.CXX+= ${_SSP_CFLAGS}
CWRAPPERS_APPEND.cc+= ${_SSP_CFLAGS}
CWRAPPERS_APPEND.cxx+= ${_SSP_CFLAGS}
CWRAPPERS_APPEND.f77+= ${_SSP_CFLAGS}
.endif
# GCC has this annoying behaviour where it advocates in a multi-line
# banner the use of "#include" over "#import" when including headers.
# This generates a huge number of warnings when building practically all
@@ -540,6 +600,27 @@ _GCC_DEPENDENCY= gcc5>=${_GCC_REQD}:../../lang/gcc5
_USE_GCC_SHLIB?= yes
. endif
. endif
.elif !empty(_NEED_GCC6:M[yY][eE][sS])
#
# We require gcc-6.x in the lang/gcc6-* directory.
#
_GCC_PKGBASE= gcc6
. if !empty(PKGPATH:Mlang/gcc6)
_IGNORE_GCC= yes
MAKEFLAGS+= _IGNORE_GCC=yes
. endif
. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
_GCC_PKGSRCDIR= ../../lang/gcc6
_GCC_DEPENDENCY= gcc6>=${_GCC_REQD}:../../lang/gcc6
. if !empty(_LANGUAGES.gcc:Mc++) || \
!empty(_LANGUAGES.gcc:Mfortran) || \
!empty(_LANGUAGES.gcc:Mfortran77) || \
!empty(_LANGUAGES.gcc:Mgo) || \
!empty(_LANGUAGES.gcc:Mobjc) || \
!empty(_LANGUAGES.gcc:Mobj-c++)
_USE_GCC_SHLIB?= yes
. endif
. endif
.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
#
# We require Ada-capable compiler in the lang/gcc-aux directory.
@@ -647,7 +728,7 @@ _NEED_NEWER_GCC!= \
.endif
.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && \
!empty(_NEED_NEWER_GCC:M[yY][eE][sS])
PKG_FAIL_REASON= "Unable to satisfy dependency: ${_GCC_DEPENDS}"
PKG_FAIL_REASON+= "Unable to satisfy dependency: ${_GCC_DEPENDS}"
.endif
# GNU ld option used to set the rpath
@@ -713,9 +794,10 @@ _GCC_LDFLAGS= # empty
. for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
_GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
. endfor
LDFLAGS+= ${_GCC_LDFLAGS}
.endif
LDFLAGS+= ${_GCC_LDFLAGS}
# Point the variables that specify the compiler to the installed
# GCC executables.
#
@@ -821,9 +903,14 @@ _COMPILER_STRIP_VARS+= ${_GCC_VARS}
IMAKEOPTS+= -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
.endif
.if ${OPSYS} == "AIX"
# On AIX the GCC toolchain recognizes -maix32 and -maix64,
# -m32 or -m64 are not recognized.
_COMPILER_ABI_FLAG.32= -maix32
_COMPILER_ABI_FLAG.64= -maix64
# On HP-UX the GCC toolchain must be specifically targeted to an ABI,
# -m32 or -m64 are not recognized.
.if ${OPSYS} == "HPUX"
.elif ${OPSYS} == "HPUX"
_COMPILER_ABI_FLAG.32= # empty
_COMPILER_ABI_FLAG.64= # empty
.else
@@ -876,8 +963,10 @@ PREPEND_PATH+= ${_GCC_DIR}/bin
. include "../../lang/gcc49-libs/buildlink3.mk"
. elif !empty(CC_VERSION:Mgcc-5.*)
. include "../../lang/gcc5-libs/buildlink3.mk"
. elif !empty(CC_VERSION:Mgcc-6.*)
. include "../../lang/gcc6-libs/buildlink3.mk"
. else
PKG_FAIL_REASON= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}"
PKG_FAIL_REASON+= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}"
. endif
. endif
.endif

13
mk/compiler/gfortran.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: gfortran.mk,v 1.7 2015/09/11 15:23:21 jperkin Exp $
# $NetBSD: gfortran.mk,v 1.9 2016/09/12 12:18:13 maya Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,7 +40,9 @@ COMPILER_GFORTRAN_MK= defined
.include "../../mk/bsd.prefs.mk"
.if !empty(PKGPATH:Mlang/gcc48) || !empty(PKGPATH:Mdevel/patch) || \
GFORTRAN_VERSION?= 48
.if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \
!empty(PKGPATH:Mdevel/libtool-base)
IGNORE_GFORTRAN= yes
MAKEFLAGS+= IGNORE_GFORTRAN=yes
@@ -68,8 +70,7 @@ _USE_GFORTRAN= YES
.endif
.if !empty(_USE_GFORTRAN:M[yY][eE][sS])
EVAL_PREFIX+= _GFORTRANBASE=gfortran
_GFORTRANBASE_DEFAULT= ${LOCALBASE}/gcc48
_GFORTRANBASE= ${LOCALBASE}/gcc${GFORTRAN_VERSION}
FC= gfortran
_GFORTRAN_DIR= ${WRKDIR}/.gfortran
@@ -90,8 +91,8 @@ PREPEND_PATH+= ${_GFORTRAN_DIR}/bin
. endif
# Add the dependency on gfortran.
BUILDLINK_DEPMETHOD.gcc48= full
. include "../../lang/gcc48/buildlink3.mk"
BUILDLINK_DEPMETHOD.gcc${GFORTRAN_VERSION}= full
. include "../../lang/gcc${GFORTRAN_VERSION}/buildlink3.mk"
. if defined(GFORTRAN_DIR) && !empty(GFORTRAN_DIR)
PKGSRC_MAKE_ENV+= GFORTRAN_DIR=${GFORTRAN_DIR:Q}

4
mk/compiler/pcc.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pcc.mk,v 1.6 2013/05/09 23:37:26 riastradh Exp $
# $NetBSD: pcc.mk,v 1.8 2015/10/09 17:27:09 he Exp $
#
# This is the compiler definition for the PCC compiler.
#
@@ -61,7 +61,7 @@ _COMPILER_RPATH_FLAG= -Wl,-R
.if exists(${CCPATH})
CC_VERSION_STRING!= ${CCPATH} -v 2>&1 || ${TRUE}
CC_VERSION!= ${CCPATH} -v 2>&1 | ${GREP} '^pcc'
CC_VERSION!= ${CCPATH} -v 2>&1 | ${GREP} -E '^(pcc|Portable C Compiler)'
.else
CC_VERSION_STRING?= ${CC_VERSION}
CC_VERSION?= pcc

4
mk/configure/cmake.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: cmake.mk,v 1.12 2014/09/06 01:50:38 obache Exp $
# $NetBSD: cmake.mk,v 1.13 2016/02/24 15:24:56 jperkin Exp $
#
# This file handles packages that use CMake as their primary build
# system. For more information about CMake, see http://www.cmake.org/.
@@ -39,8 +39,6 @@ CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=TRUE
.else
CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=FALSE
CMAKE_ARGS+= -DCMAKE_INSTALL_NAME_DIR:PATH=${PREFIX}/lib
CMAKE_ARGS+= -DOPENAL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenAL.framework/Headers
CMAKE_ARGS+= -DOPENGL_INCLUDE_DIR:PATH=/System/Library/Frameworks/OpenGL.framework/Headers
.endif
.if defined(CMAKE_USE_GNU_INSTALL_DIRS) && empty(CMAKE_USE_GNU_INSTALL_DIRS:M[nN][oO])
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib

38
mk/configure/libtool-override.mk
View File

@@ -1,23 +1,26 @@
# $NetBSD: libtool-override.mk,v 1.11 2015/05/04 19:23:19 joerg Exp $
# $NetBSD: libtool-override.mk,v 1.12 2016/02/23 15:19:23 joerg Exp $
######################################################################
### {libtool,shlibtool}-override (PRIVATE)
### {libtool,shlibtool,depcomp}-override (PRIVATE)
######################################################################
### {libtool,shlibtool}-override replace any existing libtool under
### {libtool,shlibtool,depcomp}-override replace any existing libtool under
### ${WRKSRC} with the version installed by pkgsrc.
### depcomp-override replaces the depcomp tool with the canonical version.
###
do-configure-post-hook: libtool-override
do-configure-post-hook: libtool-override depcomp-override
.if defined(SHLIBTOOL_OVERRIDE)
do-configure-post-hook: shlibtool-override
.endif
OVERRIDE_DIRDEPTH.libtool?= ${OVERRIDE_DIRDEPTH}
OVERRIDE_DIRDEPTH.shlibtool?= ${OVERRIDE_DIRDEPTH}
OVERRIDE_DIRDEPTH.depcomp?= ${OVERRIDE_DIRDEPTH}
_OVERRIDE_PATH.libtool= ${LIBTOOL}
_OVERRIDE_PATH.shlibtool= ${SHLIBTOOL}
_OVERRIDE_PATH.depcomp= ${LOCALBASE}/share/libtool/config/depcomp
.for _script_ in libtool shlibtool
.for _script_ in libtool shlibtool depcomp
_SCRIPT.${_script_}-override= \
${RM} -f $$file; \
${ECHO} "\#!"${TOOLS_SH:Q} > $$file; \
@@ -74,3 +77,28 @@ shlibtool-override:
depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \
done
.endif
.PHONY: depcomp-override
depcomp-override:
@${STEP_MSG} "Modifying libtool scripts to use pkgsrc depcomp"
.if !empty(DEPCOMP_OVERRIDE:U)
${RUN} \
cd ${WRKSRC}; \
set -- dummy ${DEPCOMP_OVERRIDE}; shift; \
while [ $$# -gt 0 ]; do \
file="$$1"; shift; \
[ -f "$$file" ] || [ -h "$$file" ] || continue; \
${_SCRIPT.${.TARGET}}; \
done
.else
${RUN} \
cd ${WRKSRC}; \
depth=0; pattern=depcomp; \
while [ $$depth -le ${OVERRIDE_DIRDEPTH.depcomp} ]; do \
for file in $$pattern; do \
[ -f "$$file" ] || [ -h "$$file" ] || continue; \
${_SCRIPT.${.TARGET}}; \
done; \
depth=`${EXPR} $$depth + 1`; pattern="*/$$pattern"; \
done
.endif

4
mk/curses.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: curses.buildlink3.mk,v 1.22 2015/02/04 16:35:32 pho Exp $
# $NetBSD: curses.buildlink3.mk,v 1.23 2016/04/11 04:22:34 dbj Exp $
#
# This Makefile fragment is meant to be included by packages that require
# any curses implementation instead of one particular one. The available
@@ -95,7 +95,7 @@ buildlink-curses-ncurses-h:
.endif # CURSES_BUILDLINK3_MK
.if ${CURSES_TYPE} == "none"
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"${_CURSES_TYPE} is not an acceptable curses type for ${PKGNAME}."
.elif ${CURSES_TYPE} == "curses"
. include "curses.builtin.mk"

55
mk/defaults/mk.conf
View File

@@ -1,4 +1,4 @@
# $NetBSD: mk.conf,v 1.260 2015/09/05 21:25:30 sevan Exp $
# $NetBSD: mk.conf,v 1.266 2016/09/18 22:17:55 agc Exp $
#
# This file provides default values for variables that may be overridden
@@ -190,6 +190,11 @@ PKGSRC_COMPILER?= gcc
# Possible: (see comments in mk/compiler.mk)
# Default: "gcc"
PKGSRC_KEEP_BIN_PKGS?= yes
# Keep binary packages in ${PACKAGES} after building them
# Possible: "yes", not "yes"
# Default: "yes"
PKGSRC_MESSAGE_RECIPIENTS?=
# login names of recipients of any MESSAGE files which will be mailed
# Possible: any login names
@@ -215,20 +220,34 @@ PKGSRC_RUN_TEST?= no
# Possible: yes, no
# Default: no
PKGSRC_USE_FORT?= no
# Turns on substitute wrappers for commonly used functions that do not bounds
# checking regularly, but could in some cases (with GCC for instance).
PKGSRC_MKPIE?= no
# If no, create regular executables. Otherwise create PIE (Position Independent
# Executables, on supported platforms). This option is necessary to fully
# leverage ASLR as a mitigation for security vulnerabilities.
# Possible: yes, no
# Default: no
.if ${PKGSRC_USE_FORT:Uno} != "no"
PKGSRC_USE_SSP?= yes
.else
PKGSRC_USE_SSP?= no
.endif
# Set this to YES to enable stack-smashing protection (on supported platforms).
PKGSRC_USE_FORTIFY?= no
# Turns on substitute wrappers for commonly used functions that do not bounds
# checking regularly, but could in some cases. This is effectively in use only
# when both enabled and supported.
# Possible: yes, no
# Default: no, except if PKGSRC_USE_FORT is set to "yes".
# Default: no
PKGSRC_USE_RELRO?= no
# Link with RELRO by default (on supported platforms). This makes the
# exploitation of some security vulnerabilities more difficult in some cases.
# Possible: yes, no
# Default: no
PKGSRC_USE_SSP?= no
# Configure this to enable stack smashing protection (on supported platforms).
# Possible values:
# no: Do not pass any stack protection flags
# yes: Pass -fstack-protector
# strong: Pass -fstack-protector-strong
# all: Pass -fstack-protector-all
# Default: no
# The default PREFER_PKGSRC should be empty, but due to historical reasons we have the list below.
# Please add your platform here once you have confirmed it is correct
@@ -663,12 +682,6 @@ AMANDA_VAR?= ${VARBASE}/amanda
# files.
# Default: ${VARBASE}/amanda
#APACHE_CUSTOM_CFLAGS=
# Used in apache to pass extra CFLAGS to the compiler during
# the build.
# Possible: any legal compiler flags, e.g. -O6 -DHARD_SERVER_LIMIT=512
# Default: not defined
APACHE_USER?= www
# Used in apache22, apache24, isap, and smb2www to specify the user
# allowed to execute the `suexec' wrapper. Expected to be the user the
@@ -859,7 +872,8 @@ ELK_GUI?= none
EMACS_TYPE?= emacs24
# Used by emacs/modules.mk to determine which emacs version should be installed
# and emacs lisp packages should be built for.
# Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox,
# Possible: emacs25, emacs25nox, emacs24, emacs24nox,
# emacs23, emacs23nox, emacs22, emacs22nox,
# emacs21, emacs21nox, emacs20,
# xemacs214, xemacs215
# Default: emacs24
@@ -1599,11 +1613,6 @@ SILC_CLIENT_WITH_PERL?= YES
# Possible: YES, NO
# Default: YES
#SPARC_TARGET_ARCH= sparcv7
# Select SPARC target architecture under Solaris.
# Possible: sparcv7, sparcv8 or sparcv9.
# Default: sparcv7
SSH_SUID?= NO
# Used in ssh to enable setuid installation of "ssh" binary.
# Possible: YES, or NO.

35
mk/defaults/options.description
View File

@@ -4,6 +4,7 @@ acl Enable POSIX ACL support.
adobe-cidfonts Select Adobe-fonts.
adplug Enable Adlib emulator support.
ads Enable Windows Active Directory support.
afterstep Enable afterstep support.
agg Enable agg support.
alsa Enable ALSA support.
amanda-dump-snap If dump supports -X, use it.
@@ -36,6 +37,7 @@ aria2-metalink Enable Metalink support.
arts Use the aRts audio daemon.
aspell Add spell checking support using aspell.
ass Enable subtitle renderer for the ASS/SSA format
asterisk-config Control installation of Asterisk sample config files.
aterm-big5 Enable Chinese support.
aterm-greek Enable Greek keyboard support.
aterm-kanji Enable kanji support.
@@ -67,6 +69,7 @@ bugzilla-xmlimportbugs Bulk import/export of bugs in XML format.
bzip2 Enable compression using bzip2.
caca Enable libcaca support.
cairo Enable cairo support.
camlp4 Enable camlp4 support.
camlzip Enable camlzip support (for zip/gz/jar).
canna Use Canna as Japanese conversion program.
cares Use the c-ares library for asynchronous name resolution.
@@ -76,6 +79,7 @@ catalog-sqlite Store Bacula catalog in SQLite database.
catalog-sqlite3 Store Bacula catalog in SQLite 3 database.
cdb Enable CDB support.
cdparanoia Use cdparanoia to rip CDDA media.
cerf Enable libcerf support.
cg Add support for the Cg compiler.
cgi Enable CGI support.
chasen Use ChaSen as the Japanese Morphological Analzer.
@@ -136,6 +140,8 @@ dspam-verbose-debug Enable verbose debugging support.
dspam-virtualusers Enable support for virtual users.
dtrace Enable DTrace support.
dts Enable DTS Coherent Acoustics support.
duplicity-amazons3 Add Amazon S3 support.
duplicity-dropbox Add Dropbox support.
dv Enable usage of the libdv library.
dvdcss Enable CSS support for DVDs.
dvdnav Enable libdvdnav support to navigate DVDs.
@@ -145,6 +151,7 @@ eaccelerator-disassembler Include disassembler.
eaccelerator-doc-comment-inclusion Retain doc-comments in internal php structures.
eai Enable EAI (Email Address Internationalization) support.
eb Enable EB dictionary library support.
ecap Enable eCAP support.
ecl Use Embeddable Common Lisp.
ecore Enable ecore library support.
eekboard Use eekboard for virtual keyboard support.
@@ -179,7 +186,9 @@ faac Enable AAC decoding support using faac.
faad Enable AAC decoding support using faad2.
fam Support using File Alteration Monitor (FAM).
farsight Enable farsight2 support.
farstream Enable farstream support.
fastcgi Use FastCGI as the CGI manager.
fax Enable fax support
fd-small Build smaller misc/fd package.
ffmpeg Enable ffmpeg support.
fftw Use the fftw library for Discrete Fourier Transforms.
@@ -220,6 +229,7 @@ gdb6-tui Build the tui application.
gdbm Use the GNU gdbm database library.
gdk-pixbuf Use gdk-pixbuf as imaging library.
gdk-pixbuf2 Use gdk-pixbuf2 as imaging library.
geoclue Enable geoclue support.
geoip Enable IP-to-country-lookup using the GeoIP C library.
ggi Enable GGI support.
ghostscript Enable GhostScript support.
@@ -229,13 +239,17 @@ gimp1-helpbrowser Link against gnome1 to get a help browser.
git Enable Git support.
git-gui Build the GUI in Tcl/Tk.
glade Enable Glade support
glfw Enable GLFW support
gmp Enable gmp (GNU Multiple Precision Arithmetic Library) support.
gmp-fat Build-in all x86 assembler code, detecting CPU at run-time.
gnome Enable GNOME support.
gnome-keyring Enable GNOME keyring support.
gnomecanvas Enable GNOME canvas support
gnomevfs Enable GNOME Virtual File System support.
gnupg2 Use GNU Privacy Guard (GnuPG) Version 2.0
gnupg2-gpgsm Install gpgsm binary.
gnupg21 Use GNU Privacy Guard (GnuPG) Version 2.1
gnuplot-pdf-doc Install PDF document.
gnutls Enable GNU TLS support.
goffice Enable goffice support.
gopher Enable support for the Gopher information system.
@@ -270,6 +284,7 @@ http2 Add support for HTTP/2.
hunspell Add spell checking support using hunspell.
i586-optimized Optimize for i586 (only).
ibus Enable Intelligent Input Bus support.
iconv Use iconv as chracter encoding conversion.
icu Enable icu support.
id3 Enable id3 tagging support.
idea Enable support for the IDEA cryptographic algorithm (possible license+patent problems).
@@ -397,6 +412,8 @@ ldap Enable LDAP support.
lensfun Enable lensfun (camera lens distortion rectifyer) support.
libao Enable the platform-independent 'ao' audio library.
libchamplain Enable libchamplain support (map widget).
libdbi Enable libdbi support (similar p5-DBI but for C).
libdrm Enable libdrm support.
libgcrypt Use GNU cryptographic library.
libgme Enable Game_Music_Emu video game music file library support.
libgpod Enable libgpod support.
@@ -418,6 +435,7 @@ libspiff Use libspiff for XML shareable playlist support.
libssh2 Use libssh2 for SSHv2 protocol support.
libthai Use libthai for Thai word segmentation.
libusb Enable USB access.
libusb-1 Enable USB access via libusb-1.
libvisual Enable libvisual (audio visualisation) support.
libvpx Enable libvpx support.
libwildmidi Enable MIDI support using libwildmidi.
@@ -491,6 +509,7 @@ mplayer-ssse3 Enable SSSE3 support.
mplayer-win32 Enable usage of Win32 DLLs (codecs).
mrtg-snmpv3 Enable SNMPv3 support.
mstats Enable memory statistics.
mtpz Enable MTPZ support using libgcrypt.
musepack Enable the portable Musepack decoder library.
musicbrainz Enable musicbrainz support.
musicpd-lastfm Enable Last.FM support in musicpd.
@@ -504,6 +523,7 @@ mysqlmanager Build mysqlmanager.
mysqlnd Support for MySQL Native Driver (mainly for php).
nagios-nrpe-args Enable argument passing via NRPE (possible security issues).
nas Enable usage of the Network Audio System.
nautilus Enable nautilus sub-menu option.
ncurses Enable ncurses support.
ncursesw Enable wide character ncurses support.
ndb-cluster Build NDB Cluster support.
@@ -516,6 +536,7 @@ nfdump-nfprofile Build the netflow profiler.
nfdump-sflow Build sflow collector sfcpad.
nghttp2-asio Build the nghttp2 ASIO C++ library.
nghttp2-tools Build the supplied nghttp2 apps and tools.
nginx Enable support for Nginx web server.
ninja-build Enable build by ninja-build.
nls Use native language support.
nntp Enable Network News Transport Protocol (NNTP) support.
@@ -548,6 +569,8 @@ oss Enable support for the Open Sound System audio library.
osx-addressbook Enable support for the Mac OS X Address Book.
otr Enable Off-the-record encrypted messaging.
p0f Enable support for passive OS fingerprinting.
p5-module-build-dist-authoring Enable building distfiles.
p5-module-build-license-creation Enable license creation.
pam Enable PAM support.
pcb-motif Use Motif for the gui instead of GTK for cad/pcb.
pcre Enable Perl-compatible regular expressions.
@@ -556,10 +579,12 @@ pdf Enable PDF support.
perl Enable Perl support.
pgadmin-db-designer Enable pgAdmin database-designer functionality.
pgsql Enable PostgreSQL support.
php-sockets Enable php-sockets support.
pim Enable pim (personal information management) support.
pinepwd Enable $HOME/.pinepwd stored IMAP password file.
pinfo-native-curses Use NetBSD native curses rather than ncurses.
pkcs11 Use certificate-on-a-stick (or card) support.
plotutils Enable plotutils support.
png Enable PNG support.
poppler Enable poppler-utils support.
portals Enable BSD Portals support
@@ -567,6 +592,7 @@ portaudio Enable PortAudio audio library support.
postfix-milter Build the milter with support for the Postfix MTA.
postfix-stress Enable Postfix stress-adaptive behaviour.
postgrey-targrey Enable the Postgrey taRgrey tarpitting patch.
ppx Enable PPX support.
prime Use Prime for Kana-to-Kanji conversion.
proftpd-readme Enable mod_readme.
psiconv Enable psiconv support (for PSION 5 file formats).
@@ -616,6 +642,7 @@ saslauthd Use the Cyrus saslauthd daemon for authentication.
sbcl Use Steel-Bank Common Lisp.
scapy-crypto Add in crypto support.
scapy-pyx Add in py-X support.
scim Enable Smart Common Input Method support.
sdl Use SDL as display library.
sdl2 Use SDL2 as display library.
seamonkey Use seamonkey as gecko rendering engine.
@@ -630,6 +657,7 @@ sidplay Enable support for the SID audio file format.
sieve Enable sieve support.
sigver Enable signature verification for debugging purposes.
simd Enable MMX/3DNOW/SSE/Altivec support.
sit Enable source identity token support.
sj3 Use SJ3 for Kana-to-Kanji conversion.
skey Enable S/Key support.
skk Use SKK for Kana-to-Kanji conversion.
@@ -639,6 +667,7 @@ slp Enable Service Location Protocol support.
small-net Tune for a smaller networks.
smime Enable S/MIME support.
smokeping-speedycgi Enable SpeedyCGI.
snappy Enable Snappy support.
sndfile Enable sndfile support.
snmp Enable SNMP support.
snort-flexresp Flexible responses on hostile connection attempts.
@@ -718,6 +747,7 @@ tokyocabinet Enable Tokyo Cabinet support.
tremor Enable Tremor fixed point audio decoding library support.
trn-inn Use INN as NNTP client.
trn-nntpclnt Use nntpclnt as NNTP client.
tuning Specify server tuning for large.
twolame Enable MP2 support using twolame.
ucspi-ssl-perl Enable Perl support in ucspi-ssl.
ucspi-tcp-nodefaultrbl Remove the (nonexistent) default RBL from rblsmtpd.
@@ -756,6 +786,7 @@ vice-fullscreen Enable full-screen support.
vice-hwscaling Enable hardware-assisted screen scaling.
vidix Enable VIDIX (Video Interface for *niX support).
viewvc-php Use php to colorize .php and .inc files.
vlc-skins Enable skins support in VLC.
vorbis Enable Ogg Vorbis support.
w3m Use and enable support for the w3m browser.
w3m-image-gdk-pixbuf Use gdk-pixbuf as imaging library for W3m.
@@ -766,16 +797,20 @@ w3m-lynx-key Enable lynx-like key bindings.
wavpack Enable wavpack support.
webkit-jit Enable JIT compilation.
webrtc Enable web realtime communications API.
websocket Websocket protocol support (as specified in RFC6455)
webvmail Install CGI script for voicemail.
wide-curses Enable wide curses support.
winbind Enable name-service switch daemon support using Windows Servers.
wiredtiger Enable WiredTiger support.
wmf Enable WMF support.
wnn4 Use wnn for Kana-to-Kanji conversion.
wxwidgets Enable wxWidgets support.
x11 Enable X11 support.
x264 Enable x264 support.
x265 Enable x265 support.
xapian-flint-backend Enable "Flint" format Xapian database support.
xapian-quartz-backend Enable "Quartz" format Xapian database support.
xatracker Enable XA X Acceleration API support.
xaw Enable Xaw support.
xaw3d Enable Xaw3D support.
xblast-mini Use a 480x392 window instead a 960x784 window in xblast.

3
mk/depends/bsd.depends.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.depends.mk,v 1.25 2014/02/14 06:39:32 obache Exp $
# $NetBSD: bsd.depends.mk,v 1.26 2016/07/09 16:32:54 rillig Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to dependencies.
@@ -15,6 +15,7 @@
#
# Default value: no
#
# Keywords: depends dependencies
SKIP_DEPENDS?= no

4
mk/dlopen.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: dlopen.buildlink3.mk,v 1.17 2009/03/20 19:25:01 joerg Exp $
# $NetBSD: dlopen.buildlink3.mk,v 1.18 2015/10/10 13:13:45 jperkin Exp $
#
# This Makefile fragment is included by package Makefiles and
# buildlink3.mk files for the packages that use dlopen().
@@ -38,7 +38,7 @@ BUILDLINK_AUTO_VARS.dl= ${DL_AUTO_VARS}
BUILDLINK_AUTO_VARS.dlcompat= ${DL_AUTO_VARS}
BUILDLINK_LDFLAGS.dl:= ${BUILDLINK_LDFLAGS.dlcompat}
.else
PKG_FAIL_REASON= "${PKGNAME} requires a working dlopen()."
PKG_FAIL_REASON+= "${PKGNAME} requires a working dlopen()."
.endif
.if !empty(DLOPEN_BUILDLINK3_MK:M+)

5
mk/emulator/pkg-rpm.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pkg-rpm.mk,v 1.5 2013/05/09 23:37:26 riastradh Exp $
# $NetBSD: pkg-rpm.mk,v 1.6 2015/11/25 13:05:47 jperkin Exp $
#
# RPM package format
#
@@ -57,8 +57,7 @@
#
TOOL_DEPENDS+= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg
EVAL_PREFIX+= _RPM2PKG_PREFIX=rpm2pkg
RPM2PKG= ${_RPM2PKG_PREFIX}/sbin/rpm2pkg
RPM2PKG= ${LOCALBASE}/sbin/rpm2pkg
RPMFILES?= ${DISTFILES:M*.rpm:S/^/${_DISTDIR}\//}
BUILD_DEFS+= RPMFILES

4
mk/fam.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: fam.buildlink3.mk,v 1.7 2009/03/17 14:45:19 jmcneill Exp $
# $NetBSD: fam.buildlink3.mk,v 1.8 2016/04/11 04:22:34 dbj Exp $
#
# This Makefile fragment is meant to be included by packages that
# require a FAM implementation. fam.buildlink3.mk will:
@@ -50,7 +50,7 @@ BUILD_DEFS_EFFECTS+= FAMBASE FAM_TYPE
FAM_SERVER?= yes
.if ${FAM_TYPE} == "none"
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"${_FAM_TYPE} is not an acceptable FAM type for ${PKGNAME}."
.elif ${FAM_TYPE} == "fam"
. include "../../sysutils/fam/buildlink3.mk"

26
mk/fetch/fetch-list.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: fetch-list.mk,v 1.14 2011/06/19 10:23:56 plunky Exp $
# $NetBSD: fetch-list.mk,v 1.15 2016/08/09 15:16:35 asau Exp $
######################################################################
### fetch-list (PUBLIC)
@@ -82,8 +82,16 @@ fetch-list-one-pkg:
${ECHO} "${MKDIR} ${_DISTDIR}"; \
${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
${ECHO} 'for site in $$sites; do'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' case "$${site}" in'; \
${ECHO} ' -*)'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' ;;'; \
${ECHO} ' *)'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' ;;'; \
${ECHO} ' esac;'; \
${ECHO} 'done; }'; \
${ECHO} ')'; \
fi)
@@ -100,8 +108,16 @@ fetch-list-one-pkg:
${ECHO} "${MKDIR} ${_DISTDIR}"; \
${ECHO} 'cd ${_DISTDIR} && { [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
${ECHO} 'for site in $$sites; do'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' case "$${site}" in'; \
${ECHO} ' -*)'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site#-}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' ;;'; \
${ECHO} ' *)'; \
${ECHO} ' ${_FETCH_CMD.${FETCH_USING}} ${_FETCH_BEFORE_ARGS.${FETCH_USING}} ${_FETCH_OUTPUT_ARGS.${FETCH_USING}} ${fetchfile:T} "$${site}${fetchfile:T}" ${_FETCH_AFTER_ARGS.${FETCH_USING}} && break ||'; \
${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \
${ECHO} ' ;;'; \
${ECHO} ' esac;'; \
${ECHO} 'done; }'; \
fi)
. endif

4
mk/fetch/fetch.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: fetch.mk,v 1.67 2015/09/14 08:27:13 joerg Exp $
# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland Exp $
.if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -260,7 +260,7 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q} \
_FETCH_ARGS+= ${PKG_VERBOSE:D-v}
.if exists(${DISTINFO_FILE})
_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q}
_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q}
.endif
.if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
_FETCH_ARGS+= -r

4
mk/fetch/github.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: github.mk,v 1.8 2015/03/12 21:00:01 tnn Exp $
# $NetBSD: github.mk,v 1.9 2015/10/19 14:24:26 tnn Exp $
#
# github.com master site handling
#
@@ -54,7 +54,7 @@ GITHUB_TYPE= tag
. endif
. endif
. if defined(GITHUB_TAG) && !empty(GITHUB_TAG:M[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*)
. if !empty(GITHUB_TYPE:Mtag) && !empty(GITHUB_TAG:M[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*)
# If the github tag is a git hash (7 or more hex digits), encode it in the
# distfile name.
_GITHUB_DEFAULT_DISTFILES= ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX}

4
mk/fetch/pypi.mk
View File

@@ -1,11 +1,11 @@
# $NetBSD: pypi.mk,v 1.2 2015/07/06 05:03:33 rodent Exp $
# $NetBSD: pypi.mk,v 1.3 2016/06/01 12:39:40 wiz Exp $
#
# pypi.python.org master site handling
#
# To use, set in the pkgsrc Makefile:
#
# DISTNAME= pyfoo-1.0.0
# MASTER_SITES= ${MASTER_SITE_PYPI}
# MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyfoo/}
#
# Then, PKGNAME and HOMEPAGE will be set automatically (can be overridden).
#

65
mk/fetch/sites.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: sites.mk,v 1.134 2015/08/11 23:41:41 ryoon Exp $
# $NetBSD: sites.mk,v 1.146 2016/09/11 13:04:28 wiz Exp $
#
# This Makefile fragment defines read-only MASTER_SITE_* variables
# representing some well-known master distribution sites for software.
@@ -28,8 +28,15 @@ MASTER_SITE_GNUSTEP+= \
ftp://ftp.gnustep.org/pub/gnustep/
MASTER_SITE_OSDN+= \
http://jaist.dl.sourceforge.jp/ \
http://iij.dl.sourceforge.jp/ \
http://jaist.dl.osdn.jp/ \
http://iij.dl.osdn.jp/ \
http://tcpdiag.dl.osdn.jp/ \
http://c3sl.dl.osdn.jp/ \
http://cznic.dl.osdn.jp/ \
http://onet.dl.osdn.jp/ \
http://nchc.dl.osdn.jp/ \
http://rwthaachen.dl.osdn.jp/ \
http://giganet.dl.osdn.jp/ \
http://osdn.dl.osdn.jp/
MASTER_SITE_PERL_CPAN+= \
@@ -55,19 +62,14 @@ MASTER_SITE_R_CRAN+= \
MASTER_SITE_TEX_CTAN+= \
ftp://ftp.funet.fi/pub/TeX/CTAN/ \
ftp://ftp.tex.ac.uk/tex-archive/ \
ftp://ftp.dante.de/tex-archive/ \
ftp://www.dnsbalance.ring.gr.jp/pub/text/CTAN/ \
http://www.dnsbalance.ring.gr.jp/archives/text/CTAN/
MASTER_SITE_SUNSITE+= \
ftp://sunsite.unc.edu/pub/Linux/ \
ftp://ftp.kddlabs.co.jp/Linux/metalab.unc.edu/ \
ftp://ftp.icm.edu.pl/pub/Linux/sunsite/ \
ftp://ftp.nvg.ntnu.no/pub/mirrors/metalab.unc.edu/ \
ftp://ftp.lip6.fr/pub/linux/sunsite/ \
ftp://ftp.cs.tu-berlin.de/pub/linux/Mirrors/sunsite.unc.edu/ \
http://ftp.tuwien.ac.at/pub/linux/ibiblio/
ftp://ftp.lip6.fr/pub/linux/sunsite/
MASTER_SITE_GNOME+= \
http://ftp.gnome.org/pub/GNOME/ \
@@ -75,7 +77,6 @@ MASTER_SITE_GNOME+= \
http://ftp.tuwien.ac.at/hci/gnome.org/ \
ftp://ftp.cse.buffalo.edu/pub/Gnome/ \
ftp://ftp.kddlabs.co.jp/pub/GNOME/ \
ftp://ftp.dit.upm.es/linux/gnome/ \
https://download.gnome.org/
MASTER_SITE_KDE+= \
@@ -83,11 +84,9 @@ MASTER_SITE_KDE+= \
ftp://www.dnsbalance.ring.gr.jp/pub/X/kde/stable/ \
http://www.dnsbalance.ring.gr.jp/archives/X/kde/stable/ \
ftp://ftp.kddlabs.co.jp/pub/X/kde/stable/ \
http://mirrors.isc.org/pub/kde/stable/ \
ftp://ftp.gtlib.gatech.edu/pub/kde/stable/ \
ftp://kde.mirrors.tds.net/pub/kde/stable/ \
http://gd.tuwien.ac.at/kde/stable/ \
ftp://ftp.solnet.ch/mirror/KDE/stable/ \
ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/stable/ \
ftp://mirrors.dotsrc.org/kde/stable/ \
ftp://ftp.fi.muni.cz/pub/kde/stable/
@@ -102,7 +101,6 @@ MASTER_SITE_SUSE+= \
MASTER_SITE_MOZILLA_ALL+= \
http://download-origin.cdn.mozilla.net/pub/mozilla.org/ \
http://dm-download02.mozilla.org/pub/mozilla.org/ \
http://ftp.mozilla.org/pub/mozilla.org/
# see http://www.mozilla.org/mirrors.html
@@ -110,7 +108,6 @@ MASTER_SITE_MOZILLA+= \
http://releases.mozilla.org/pub/mozilla.org/ \
http://mirror.atlanticmetro.net/mozilla/ \
http://ftp.cvut.cz/mozilla/ \
http://ftp.heanet.ie/mirrors/ftp.mozilla.org/pub/mozilla.org/ \
http://mirror.waia.asn.au/pub/mozilla/ \
http://download-origin.cdn.mozilla.net/pub/mozilla.org/
@@ -133,9 +130,7 @@ MASTER_SITE_XEMACS+= \
MASTER_SITE_APACHE+= \
http://www.apache.org/dist/ \
http://www.eu.apache.org/dist/ \
http://apache.mirror.aussiehq.net.au/ \
http://apache.oregonstate.edu/ \
http://mirror.nyi.net/apache/ \
http://apache.mirrors.tds.net/ \
http://ftp.unicamp.br/pub/apache/ \
http://www.mirrorservice.org/sites/ftp.apache.org/ \
@@ -143,7 +138,6 @@ MASTER_SITE_APACHE+= \
http://ftp.twaren.net/Unix/Web/apache/ \
http://ftp.cuhk.edu.hk/pub/packages/apache.org/ \
ftp://ftp.oregonstate.edu/pub/apache/ \
ftp://mirror.nyi.net/apache/ \
ftp://apache.mirrors.tds.net/pub/apache.org/ \
ftp://ftp.mirrorservice.org/sites/ftp.apache.org/ \
http://gd.tuwien.ac.at/pub/infosys/servers/http/apache/dist/ \
@@ -152,12 +146,10 @@ MASTER_SITE_APACHE+= \
MASTER_SITE_MYSQL+= \
http://mysql.mirror.kangaroot.net/Downloads/ \
ftp://mysql.mirror.kangaroot.net/pub/mysql/Downloads/ \
http://mysql.linux.cz/Downloads/ \
ftp://ftp.fi.muni.cz/pub/mysql/Downloads/ \
http://mirrors.dotsrc.org/mysql/Downloads/ \
ftp://mirrors.dotsrc.org/mysql/Downloads/ \
http://mysql.borsen.dk/Downloads/ \
http://mirrors.ircam.fr/pub/mysql/Downloads/ \
ftp://mirrors.ircam.fr/pub/mysql/Downloads/ \
http://ftp.gwdg.de/pub/misc/mysql/Downloads/ \
@@ -172,36 +164,21 @@ MASTER_SITE_MYSQL+= \
http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/ \
ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/ \
http://na.mirror.garr.it/mirrors/MySQL/Downloads/ \
http://mysql.nfsi.pt/Downloads/ \
ftp://ftp.nfsi.pt/pub/mysql/Downloads/ \
http://mirrors.xservers.ro/mysql/Downloads/ \
http://mysql.dataphone.se/Downloads/ \
ftp://mirror2.dataphone.se/pub/mysql/Downloads/ \
ftp://ftp.solnet.ch/mirror/mysql/Downloads/ \
http://mirror.switch.ch/ftp/mirror/mysql/Downloads/ \
ftp://mirror.switch.ch/mirror/mysql/Downloads/ \
http://ftp.itu.edu.tr/Mirror/Mysql/Downloads/ \
ftp://ftp.itu.edu.tr/Mirror/Mysql/Downloads/ \
http://mysql.infocom.ua/Downloads/ \
http://mirrors.dedipower.com/www.mysql.com/Downloads/ \
http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/ \
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/ \
http://mysql.mirror.rafal.ca/Downloads/ \
ftp://mysql.mirror.rafal.ca/pub/mysql/Downloads/ \
http://mirror.csclub.uwaterloo.ca/mysql/Downloads/ \
ftp://mirror.csclub.uwaterloo.ca/mysql/Downloads/ \
http://mirror.trouble-free.net/mysql_mirror/Downloads/ \
http://mysql.llarian.net/Downloads/ \
ftp://mirror.anl.gov/pub/mysql/Downloads/ \
http://mysql.he.net/Downloads/ \
http://mysql.mirrors.arminco.com/Downloads/ \
http://mysql.spd.co.il/Downloads/ \
http://ftp.iij.ad.jp/pub/db/mysql/Downloads/ \
ftp://ftp.iij.ad.jp/pub/db/mysql/Downloads/ \
http://mysql.cs.pu.edu.tw/Downloads/ \
http://mysql.ntu.edu.tw/Downloads/ \
ftp://ftp.ntu.edu.tw/pub/MySQL/Downloads/ \
http://mysql.cdpa.nsysu.edu.tw/Downloads/ \
ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/Downloads/ \
http://mirror-fpt-telecom.fpt.net/mysql/Downloads/ \
http://mysql.mirror.ac.za/Downloads/ \
@@ -238,23 +215,13 @@ MASTER_SITE_DEBIAN+= \
http://ftp.us.debian.org/debian/
MASTER_SITE_OPENOFFICE+= \
http://mirrors.isc.org/pub/openoffice/ \
http://openoffice.mirrors.ilisys.com.au/ \
ftp://ftp.ussg.iu.edu/pub/openoffice/ \
http://gd.tuwien.ac.at/office/openoffice/ \
http://ftp.sh.cvut.cz/MIRRORS/OpenOffice/ \
ftp://ftp.funet.fi/pub/mirrors/openoffice.org/ \
ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/ \
ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.openoffice.org/ \
http://ftp.ntua.gr/pub/OpenOffice/ \
http://na.mirror.garr.it/mirrors/openoffice/ \
http://vlaai.snt.utwente.nl/pub/software/openoffice/ \
http://niihau.student.utwente.nl/openoffice/ \
http://borft.student.utwente.nl/openoffice/ \
http://ftp.iasi.roedu.net/mirrors/openoffice.org/ \
ftp://ftp.arnes.si/packages/OpenOffice.org/ \
ftp://ftp.saix.net/pub/OpenOffice.org/ \
ftp://mirror.switch.ch/mirror/OpenOffice/ \
ftp://ftp.kddlabs.co.jp/office/openoffice/ \
ftp://ftp.dnsbalance.ring.gr.jp/pub/misc/openoffice/ \
ftp://ftp.kr.freebsd.org/pub/openoffice/
@@ -282,7 +249,6 @@ MASTER_SITE_GENTOO+= \
http://ftp.ds.karen.hj.se/gentoo/ \
ftp://ftp.free.fr/mirrors/ftp.gentoo.org/ \
ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo/ \
http://darkstar.ist.utl.pt/gentoo/ \
http://gentoo-euetib.upc.es/mirror/gentoo/ \
http://ftp.ntua.gr/pub/linux/gentoo/ \
http://www.las.ic.unicamp.br/pub/gentoo/ \
@@ -290,7 +256,6 @@ MASTER_SITE_GENTOO+= \
http://ftp.swin.edu.au/gentoo/ \
http://ftp.iij.ad.jp/pub/linux/gentoo/ \
http://ftp.jaist.ac.jp/pub/Linux/Gentoo/ \
http://ftp.cs.pu.edu.tw/Linux/Gentoo/ \
http://distfiles.gentoo.org/
MASTER_SITE_XORG+= \
@@ -311,21 +276,23 @@ MASTER_SITE_NETLIB+= \
http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/
MASTER_SITE_OPENBSD+= \
ftp://ftp.OpenBSD.org/pub/OpenBSD/ \
http://ftp.OpenBSD.org/pub/OpenBSD/ \
ftp://ftp3.usa.openbsd.org/pub/OpenBSD/ \
ftp://ftp.jaist.ac.jp/pub/OpenBSD/
MASTER_SITE_RUBYGEMS+= \
http://rubygems.org/downloads/
https://rubygems.org/gems/
MASTER_SITE_PYPI+= \
https://pypi.python.org/packages/source/
https://files.pythonhosted.org/packages/source/
MASTER_SITE_HASKELL_HACKAGE+= \
http://hackage.haskell.org/package/
# The primary backup site.
MASTER_SITE_BACKUP?= \
http://cdn.NetBSD.org/pub/pkgsrc/distfiles/ \
http://ftp6.NetBSD.org/pub/pkgsrc/distfiles/ \
ftp://ftp.fr.NetBSD.org/pub/pkgsrc/distfiles/ \
http://ftp.fr.NetBSD.org/pub/pkgsrc/distfiles/ \
ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \

50
mk/find-prefix.mk
View File

@@ -1,50 +0,0 @@
# $NetBSD: find-prefix.mk,v 1.7 2008/02/10 10:30:58 rillig Exp $
#
# This is a "subroutine" that can be included to find the installation
# prefix of an installed package.
#
# Parameters:
#
# FIND_PREFIX
# A list of <VARNAME>=<pattern> pairs, where
#
# * <pattern> is a package wildcard pattern (see pkg_info(8)),
# * <VARNAME> is the variable that will be set to the
# installation prefix for the package.
#
# Returns:
#
# <VARNAME>
# The prefix of the corresponding package, or ${LOCALBASE}
# if the package is not installed.
#
# Example:
#
# FIND_PREFIX:= M4DIR=gm4
# .include "../../mk/find-prefix.mk"
# # ${M4DIR} now contains the installation prefix for the "gm4" package.
#
.for i in ${FIND_PREFIX}
. for varname in ${i:C/=.*$//}
. for pattern in ${i:C/^[^=]*=//}
. if !defined(${varname})
# XXX: Is this *_DEFAULT variable really necessary? The default value
# can be easily embedded in the shell code. What if VARNAME is set to
# PKG_APACHE, for example?
#
${varname}_DEFAULT?= ${LOCALBASE}
_${varname}_cmd= \
${PKG_INFO} -qp ${pattern:Q} 2>/dev/null | \
{ read cmd arg; \
case "$$arg" in \
"") ${ECHO} ${${varname}_DEFAULT:Q} ;; \
*) ${ECHO} "$$arg" ;; \
esac; }
${varname}= ${_${varname}_cmd:sh}
. endif
MAKEVARS+= ${varname}
. endfor
. endfor
.endfor

3
mk/fuse.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: fuse.buildlink3.mk,v 1.18 2015/02/04 23:44:34 tnn Exp $
# $NetBSD: fuse.buildlink3.mk,v 1.19 2016/01/28 20:50:07 tron Exp $
#
# Makefile fragment for packages using the FUSE framework.
#
@@ -53,6 +53,7 @@ PKG_FAIL_REASON+= "Couldn't find fuse headers, please install libfuse."
PKG_FAIL_REASON+= "Couldn't find fuse headers, please install librefuse."
. endif
CFLAGS.NetBSD+= -D_KERNTYPES
LDFLAGS.DragonFly+= -lpuffs
. if !empty(USE_TOOLS:C/:.*//:Mpkg-config)

17
mk/haskell.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: haskell.mk,v 1.3 2015/02/17 13:57:47 joerg Exp $
# $NetBSD: haskell.mk,v 1.4 2016/04/10 15:58:02 joerg Exp $
#
# This Makefile fragment handles Haskell Cabal packages.
# See: http://www.haskell.org/cabal/
@@ -248,17 +248,10 @@ _HASKELL_PKG_DESCR_FILE= ${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION}/package-d
do-install:
${RUN} cd ${WRKSRC} && \
./Setup register --gen-pkg-config=dist/package-description && \
if [ "${_USE_DESTDIR}" = "no" ]; then \
./Setup copy && \
if [ -f dist/package-description ]; then \
${INSTALL_DATA} dist/package-description ${_HASKELL_PKG_DESCR_FILE}; \
fi \
else \
./Setup copy --destdir=${DESTDIR} && \
if [ -f dist/package-description ]; then \
${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \
fi \
fi
./Setup copy --destdir=${DESTDIR} && \
if [ -f dist/package-description ]; then \
${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \
fi \
# Define test target.
do-test:

8
mk/help/debug.help
View File

@@ -1,4 +1,4 @@
# $NetBSD: debug.help,v 1.1 2007/02/05 14:27:34 rillig Exp $
# $NetBSD: debug.help,v 1.2 2016/06/06 15:13:24 leot Exp $
#
# Since pkgsrc is a quite large and complex software system, it
# sometimes isn't obvious what it is doing exactly. For that reason,
@@ -18,12 +18,12 @@
# running it.
#
# PKG_VERBOSE
# When this variable is defined, pkgsrc gets a bit more verbose.
# When this variable is defined, pkgsrc gets a bit more verbose
# (i.e. "-v" option is passed to some commands and a more verbose output
# is provided for some targets).
# This variable is largely independent from PKG_DEBUG_LEVEL.
#
# Default value: (undefined)
#
# XXX: Why are there _two_ variables doing similar things?
#
# Keywords: debug verbose
#

28
mk/help/destdir.help
View File

@@ -1,29 +1,14 @@
# $NetBSD: destdir.help,v 1.6 2012/08/14 15:27:07 asau Exp $
# $NetBSD: destdir.help,v 1.8 2016/04/10 15:15:45 joerg Exp $
#
# ===
# Warning: This file is still under construction. Don't rely on it.
# ===
#
# This file documents the variables around the DESTDIR support.
#
# Normally, packages are installed directly into LOCALBASE and may
# overwrite files of other packages there. It also makes it easy to
# create packages which behave differently depending on whether they
# are installed from source or from a binary package. This is not good.
#
# The DESTDIR support tries to prevent some of these problems. When it
# is enabled, packages are not installed directly into LOCALBASE.
# Instead, they are installed in a temporary directory, and a binary
# package is created from the files that have been installed there.
#
# === User-settable variables ===
#
# USE_DESTDIR
# * "yes" to enable DESTDIR support for those packages that
# explicitly support it. If the package supports it,
# the build will run completely under the privileges of the
# calling users, only package installation via pkg_add is done
# as root.
# During the build, package files are not installed directly into
# LOCALBASE, but a temporary directory under WRKDIR. Any direct change
# of LOCALBASE is a bug. A binary package is created from the content
# of that temporary directory and then installed normally with pkg_add.
#
# === Package-settable variables ===
#
@@ -35,9 +20,6 @@
# ownership or permissions. The installation is done by the
# privileged user.
#
# * "none" means that all files of the packages will be installed
# by the privileged user.
#
# This variable must be set before including bsd.prefs.mk directly or
# indirectly.
#

7
mk/help/directories.help
View File

@@ -1,18 +1,15 @@
# $NetBSD: directories.help,v 1.4 2015/07/04 16:18:38 joerg Exp $
# $NetBSD: directories.help,v 1.6 2016/06/19 20:03:09 wiz Exp $
#
# This file contains some short documentation on the directories that
# are used within pkgsrc.
# PREFIX
# This is the directory where the package should install its
# files. The actual value depends on the variables
# INSTALLATION_PREFIX and USE_CROSSBASE.
# files. This is usually LOCALBASE.
#
# Tags: read-only, system-defined, non-overridable, etc.
#
# See also:
# CROSSBASE,
# INSTALLATION_PREFIX,
# LOCALBASE.
#

4
mk/help/help.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: help.mk,v 1.10 2007/08/13 05:58:44 rillig Exp $
# $NetBSD: help.mk,v 1.12 2016/02/01 18:47:23 leot Exp $
#
# This is the integrated pkgsrc online help system. To query for the
@@ -9,8 +9,10 @@
_HELP_FILES= Makefile
_HELP_FILES+= mk/*.mk mk/*/*.mk mk/*/*/*.mk
_HELP_FILES+= mk/defaults/mk.conf
_HELP_FILES+= lang/go/*.mk
_HELP_FILES+= lang/perl5/*.mk lang/php/*.mk lang/python/*.mk
_HELP_FILES+= lang/ruby/*.mk
_HELP_FILES+= print/texlive/*.mk
_HELP_FILES+= mk/*/*.help
.if exists(${.PARSEDIR}/../../wip/mk)
_HELP_FILES+= wip/mk/*.mk

5
mk/install/bin-install.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bin-install.mk,v 1.23 2011/11/05 17:04:42 tcort Exp $
# $NetBSD: bin-install.mk,v 1.25 2016/06/16 18:28:45 mspo Exp $
#
# This file provides the following targets:
@@ -31,7 +31,8 @@
# replaced with OS release ("1.5", ...) and architecture ("mipsel", ...)
.if ${OPSYS} == "NetBSD"
BINPKG_SITES?= \
ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel} \
http://ftp6.NetBSD.org/pub/pkgsrc/packages/NetBSD/$${arch}/$${rel}
.elif ${OPSYS} == "Minix"
BINPKG_SITES?= \
ftp://ftp.minix3.org/pub/minix/packages/$$(${UNAME} -r)/$${arch}

15
mk/install/bsd.install.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.install.mk,v 1.15 2014/12/06 23:28:18 agc Exp $
# $NetBSD: bsd.install.mk,v 1.16 2016/04/10 15:58:02 joerg Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to installing packages.
@@ -17,14 +17,12 @@ _COOKIE.install= ${WRKDIR}/.install_done
######################################################################
### install (PUBLIC)
######################################################################
### install is a public target to install the package either by
### depending on stage-install (_USE_DESTDIR=no) or package-install
### (_USE_DESTDIR!=no).
### install is a public target to install the package by depending
### on stage-package-install or package-install. The difference is
### a package is created in the public PACKAGES directory.
###
.PHONY: install
.if ${_USE_DESTDIR} == "no"
install: stage-install
.elif ${_KEEP_BIN_PKGS} == "no"
.if ${_KEEP_BIN_PKGS} == "no"
install: stage-package-install
.else
install: package-install
@@ -34,8 +32,7 @@ install: package-install
### stage-install (PUBLIC)
######################################################################
### stage-install is a public target to install the package to
### ${PREFIX} (_USE_DESTDIR=no) or to ${DESTDIR}${PREFIX}
### (_USE_DESTDIR!=no)
### to ${DESTDIR}${PREFIX}.
###
.PHONY: stage-install
.if !defined(NO_INSTALL)

5
mk/install/deinstall.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: deinstall.mk,v 1.11 2011/10/15 00:23:09 reed Exp $
# $NetBSD: deinstall.mk,v 1.12 2016/04/10 15:58:02 joerg Exp $
# DEINSTALLDEPENDS controls whether dependencies and dependents are also
# removed when a package is de-installed. The valid values are:
@@ -31,9 +31,6 @@ deinstall: su-target
_SU_DEINSTALL_TARGETS= acquire-deinstall-lock
_SU_DEINSTALL_TARGETS+= _pkgformat-deinstall
_SU_DEINSTALL_TARGETS+= release-deinstall-lock
.if ${_USE_DESTDIR} == "no"
_SU_DEINSTALL_TARGETS+= install-clean
.endif
su-deinstall: ${_SU_DEINSTALL_TARGETS}
.PHONY: acquire-deinstall-lock release-deinstall-lock

34
mk/install/install.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: install.mk,v 1.66 2013/01/05 07:32:49 sbd Exp $
# $NetBSD: install.mk,v 1.69 2016/07/26 08:41:36 jperkin Exp $
#
# This file provides the code for the "install" phase.
#
@@ -153,14 +153,6 @@ install-check-version: ${_COOKIE.extract}
${RECURSIVE_MAKE} ${MAKEFLAGS} build ;; \
esac
######################################################################
### The targets below are run with elevated privileges.
######################################################################
.PHONY: acquire-install-localbase-lock release-install-localbase-lock
acquire-install-localbase-lock: acquire-localbase-lock
release-install-localbase-lock: release-localbase-lock
######################################################################
### install-all, su-install-all (PRIVATE)
######################################################################
@@ -168,13 +160,6 @@ release-install-localbase-lock: release-localbase-lock
### the built software, register the software installation, and run
### some sanity checks.
###
.if ${_USE_DESTDIR} != "user-destdir"
_INSTALL_ALL_TARGETS+= acquire-install-localbase-lock
.endif
.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= _pkgformat-check-conflicts
_INSTALL_ALL_TARGETS+= _pkgformat-check-installed
.endif
_INSTALL_ALL_TARGETS+= install-check-umask
.if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
_INSTALL_ALL_TARGETS+= check-files-pre
@@ -186,9 +171,6 @@ _INSTALL_ALL_TARGETS+= install-dirs-from-PLIST
.elif defined(AUTO_MKDIRS) && !empty(AUTO_MKDIRS:M[Yy][Ee][Ss])
_INSTALL_ALL_TARGETS+= install-dirs-from-PLIST
.endif
.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= pre-install-script
.endif
_INSTALL_ALL_TARGETS+= pre-install
_INSTALL_ALL_TARGETS+= do-install
_INSTALL_ALL_TARGETS+= post-install
@@ -201,18 +183,8 @@ _INSTALL_ALL_TARGETS+= install-script-data
.if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
_INSTALL_ALL_TARGETS+= check-files-post
.endif
.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= post-install-script
.endif
.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= _pkgformat-register
.else
_INSTALL_ALL_TARGETS+= _pkgformat-generate-metadata
.endif
_INSTALL_ALL_TARGETS+= privileged-install-hook
.if ${_USE_DESTDIR} != "user-destdir"
_INSTALL_ALL_TARGETS+= release-install-localbase-lock
.endif
_INSTALL_ALL_TARGETS+= error-check
.PHONY: install-all su-install-all
@@ -315,7 +287,7 @@ INSTALL_DIRS?= ${BUILD_DIRS}
INSTALL_MAKE_FLAGS?= # none
INSTALL_TARGET?= install ${USE_IMAKE:D${NO_INSTALL_MANPAGES:D:Uinstall.man}}
DESTDIR_VARNAME?= DESTDIR
.if ${_USE_DESTDIR} != "no" && !empty(DESTDIR_VARNAME)
.if !empty(DESTDIR_VARNAME)
INSTALL_ENV+= ${DESTDIR_VARNAME}=${DESTDIR:Q}
INSTALL_MAKE_FLAGS+= ${DESTDIR_VARNAME}=${DESTDIR:Q}
.endif
@@ -370,7 +342,7 @@ install-strip-debug: plist
_PLIST_REGEXP.info= \
^([^\/]*\/)*${PKGINFODIR}/[^/]*(\.info)?(-[0-9]+)?(\.gz)?$$
_PLIST_REGEXP.man= \
^([^/]*/)+(man[1-9ln]/[^/]*\.[1-9ln]|cat[1-9ln]/[^/]*\.[0-9])(\.gz)?$$
^([^/]*/)+((man|html)[1-9ln](am|f)?/[^/]*\.([1-9ln](am|f)?|html)|cat[1-9ln](am|f)?/[^/]*\.[0-9])(\.gz)?$$
_DOC_COMPRESS= \
${PKGSRC_SETENV} PATH=${PATH:Q} \

19
mk/install/replace.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: replace.mk,v 1.17 2015/09/07 19:23:47 gdt Exp $
# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $
#
# Public targets:
#
@@ -13,11 +13,8 @@
#
# Private targets that must be defined by the package system format:
#
# _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.
#
# _pkgformat-undo-replace:
# Undoes a previous "make _pkgformat-replace".
@@ -25,9 +22,7 @@
# _pkgformat-destdir-undo-replace:
# Undoes a previous "make _pkgformat-destdir-replace".
.if ${_USE_DESTDIR} == "no"
_REPLACE_TARGETS+= ${_PKGSRC_BUILD_TARGETS}
.elif ${_KEEP_BIN_PKGS} == "no"
.if ${_KEEP_BIN_PKGS} == "no"
_REPLACE_TARGETS+= stage-package-create
.else
_REPLACE_TARGETS+= package
@@ -49,11 +44,7 @@ replace: barrier
replace-message: .PHONY
@${PHASE_MSG} "Replacing for ${PKGNAME}"
.if ${_USE_DESTDIR} == "no"
su-replace: .PHONY _pkgformat-replace
.else
su-replace: .PHONY _pkgformat-destdir-replace
.endif
MAKEFLAGS.su-replace= _UPDATE_RUNNING=yes
MAKEFLAGS.su-replace+= PKGNAME_REQD=${PKGNAME_REQD:Q}
@@ -67,9 +58,5 @@ undo-replace-message: .PHONY
@${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
.if ${_USE_DESTDIR} == "no"
su-undo-replace: .PHONY _pkgformat-undo-replace
.else
su-undo-replace: .PHONY _pkgformat-destdir-undo-replace
.endif
MAKEFLAGS.su-undo-replace= _UPDATE_RUNNING=yes

36
mk/java-vm.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: java-vm.mk,v 1.103 2015/08/12 01:06:45 ryoon Exp $
# $NetBSD: java-vm.mk,v 1.107 2016/07/13 14:16:17 jperkin Exp $
#
# This Makefile fragment handles Java dependencies and make variables,
# and is meant to be included by packages that require Java either at
@@ -100,17 +100,19 @@ _PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \
!empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf)
_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
!empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
!empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. elif !empty(MACHINE_PLATFORM:MNetBSD-[1234].*-i386)
_PKG_JVM_DEFAULT?= sun-jdk6
. elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \
!empty(MACHINE_PLATFORM:MLinux-*-x86_64)
_PKG_JVM_DEFAULT?= oracle-jdk8
. elif !empty(MACHINE_PLATFORM:MDarwin-*-*)
_PKG_JVM_DEFAULT?= sun-jdk6
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || \
!empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386)
_PKG_JVM_DEFAULT?= openjdk7
. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64)
_PKG_JVM_DEFAULT?= openjdk8
. elif !empty(MACHINE_PLATFORM:MDragonFly-*-*)
_PKG_JVM_DEFAULT?= openjdk7
_PKG_JVM_DEFAULT?= openjdk8
. else
_PKG_JVM_DEFAULT?= kaffe
. endif
@@ -242,7 +244,7 @@ _PKG_JVM= ${_PKG_JVM_FIRSTACCEPTED}
#
.if !defined(_PKG_JVM)
# force an error
PKG_FAIL_REASON= "no acceptable JVM found"
PKG_FAIL_REASON+= "no acceptable JVM found"
_PKG_JVM= "none"
.endif
@@ -268,38 +270,32 @@ _JAVA_BASE_CLASSES= classes.zip
.if ${_PKG_JVM} == "kaffe"
_JDK_PKGSRCDIR= ../../lang/kaffe
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/kaffe
_JAVA_HOME= ${LOCALBASE}/java/kaffe
.elif ${_PKG_JVM} == "openjdk7"
_JDK_PKGSRCDIR= ../../lang/openjdk7
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk7
_JAVA_HOME= ${LOCALBASE}/java/openjdk7
.elif ${_PKG_JVM} == "openjdk8"
_JDK_PKGSRCDIR= ../../lang/openjdk8
_JRE_PKGSRCDIR= ${_JDK_PKGSRCDIR}
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/openjdk8
_JAVA_HOME= ${LOCALBASE}/java/openjdk8
.elif ${_PKG_JVM} == "sun-jdk6"
_JDK_PKGSRCDIR= ../../lang/sun-jdk6
_JRE_PKGSRCDIR= ../../lang/sun-jre6
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/sun-6
_JAVA_HOME= ${LOCALBASE}/java/sun-6
UNLIMIT_RESOURCES+= datasize
.elif ${_PKG_JVM} == "sun-jdk7"
_JDK_PKGSRCDIR= ../../lang/sun-jdk7
_JRE_PKGSRCDIR= ../../lang/sun-jre7
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/sun-7
_JAVA_HOME= ${LOCALBASE}/java/sun-7
UNLIMIT_RESOURCES+= datasize
.elif ${_PKG_JVM} == "oracle-jdk8"
_JDK_PKGSRCDIR= ../../lang/oracle-jdk8
_JRE_PKGSRCDIR= ../../lang/oracle-jre8
_JAVA_HOME_DEFAULT= ${LOCALBASE}/java/oracle-8
_JAVA_HOME= ${LOCALBASE}/java/oracle-8
UNLIMIT_RESOURCES+= datasize
.endif
.if defined(_JAVA_HOME_DEFAULT)
_JAVA_HOME= ${_JAVA_HOME_DEFAULT}
.else
EVAL_PREFIX+= _JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
.endif
# If we are not using Java for building, then we need a run-time dependency on
# the JRE, otherwise, build-time dependency on the JRE.
.if defined(_JRE_PKGSRCDIR)

6
mk/jpeg.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: jpeg.buildlink3.mk,v 1.1 2010/12/19 11:22:59 dsainty Exp $
# $NetBSD: jpeg.buildlink3.mk,v 1.3 2016/04/11 04:22:34 dbj Exp $
#
# This Makefile fragment is meant to be included by packages that
# require a libjpeg implementation. jpeg.buildlink3.mk will:
@@ -6,7 +6,7 @@
# * set JPEGBASE to the base directory of the libjpeg files;
# * set JPEG_TYPE to the libjpeg implementation used.
#
# There are three variables that can be used to tweak the selection of
# There are two variables that can be used to tweak the selection of
# the libjpeg implementation:
#
# JPEG_DEFAULT is a user-settable variable whose value is the default
@@ -45,7 +45,7 @@ BUILD_DEFS+= JPEG_DEFAULT
BUILD_DEFS_EFFECTS+= JPEGBASE JPEG_TYPE
.if ${JPEG_TYPE} == "none"
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"${_JPEG_TYPE} is not an acceptable libjpeg type for ${PKGNAME}."
.elif ${JPEG_TYPE} == "jpeg"
. include "../../graphics/jpeg/buildlink3.mk"

4
mk/krb5.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: krb5.buildlink3.mk,v 1.12 2013/08/16 12:11:17 jperkin Exp $
# $NetBSD: krb5.buildlink3.mk,v 1.13 2016/04/11 04:22:34 dbj Exp $
#
# This Makefile fragment is meant to be included by packages that
# require a Kerberos 5 implementation. krb5.buildlink3.mk will:
@@ -59,7 +59,7 @@ CRYPTO+= uses Kerberos encryption code
.endif # KRB5_BUILDLINK3_MK
.if ${KRB5_TYPE} == "none"
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"${_KRB5_TYPE} is not an acceptable Kerberos 5 type for ${PKGNAME}."
.elif ${KRB5_TYPE} == "heimdal"
. include "../../security/heimdal/buildlink3.mk"

4
mk/license.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: license.mk,v 1.74 2015/09/13 11:22:22 leot Exp $
# $NetBSD: license.mk,v 1.76 2016/04/21 07:51:51 leot Exp $
#
# This file handles everything about the LICENSE variable. It is
# included automatically by bsd.pkg.mk.
@@ -118,6 +118,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
gnu-gpl-v1 \
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
gnu-gpl-v3 gnu-lgpl-v3 \
hpnd \
ibm-public-license-1.0 \
ipafont \
isc \
@@ -131,6 +132,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
openssl \
original-bsd modified-bsd 2-clause-bsd \
osl \
paratype \
php \
png-license \
postgresql-license \

4
mk/misc/toplevel.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: toplevel.mk,v 1.6 2014/06/02 10:24:05 wiz Exp $
# $NetBSD: toplevel.mk,v 1.7 2016/07/11 22:53:48 wiz Exp $
#
# This file contains the make targets that can be used from the
# top-level Makefile. They are in this separate file to keep the
@@ -19,7 +19,7 @@ README.html: .PRECIOUS
BMAKE=${MAKE} \
./mk/scripts/mkreadme --pkgsrc ${.CURDIR} \
--packages ${PACKAGES} ${_README_TYPE_FLAG} \
--prune
--prune --quiet
.else
@${ECHO} "ERROR: please do not use the README.html target directly."
@${ECHO} " Instead use either the \"readme\" or \"cdrom-readme\""

8
mk/mpi.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: mpi.buildlink3.mk,v 1.1 2010/05/16 11:07:39 asau Exp $
# $NetBSD: mpi.buildlink3.mk,v 1.3 2016/09/24 18:34:24 kamil Exp $
#
# This Makefile fragment is meant to be included by packages
# that use any MPI implementation instead of one particular one.
@@ -19,8 +19,8 @@ MPI_BUILDLINK3_MK= # define it
# Try to find if we have anything installed already
.if exists($(LOCALBASE)/bin/mpicc)
_MPI_PACKAGE!= $(PKG_INFO) -Q PKGPATH -F $(LOCALBASE)/bin/mpicc
MPI_TYPE?= $(_MPI_PACKAGE:T)
_MPI_PACKAGE!= ${PKG_INFO} -Q PKGPATH -F ${LOCALBASE}/bin/mpicc
MPI_TYPE?= ${_MPI_PACKAGE:T}
.else
MPI_TYPE?= mpich # default to MPICH due to backward compatibility
@@ -29,7 +29,7 @@ _MPI_PACKAGE= parallel/mpi-ch
.elif $(MPI_TYPE) == "openmpi"
_MPI_PACKAGE= parallel/openmpi
.else # invalid or unimplemented type
PKG_FAIL_REASON= \
PKG_FAIL_REASON+= \
"${MPI_TYPE} is not an acceptable MPI type for ${PKGNAME}."
.endif
.endif

18
mk/mysql.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: mysql.buildlink3.mk,v 1.20 2015/04/16 20:24:15 ryoon Exp $
# $NetBSD: mysql.buildlink3.mk,v 1.21 2016/09/21 14:27:51 adam Exp $
#
# This file is included by packages that require some version of the
# MySQL database client.
@@ -8,7 +8,7 @@
# MYSQL_VERSION_DEFAULT
# The preferred MySQL version.
#
# Possible: 56 55 51 MARIADB55
# Possible: 57 56 55 51 MARIADB55
# Default: 55
#
# === Package-settable variables ===
@@ -31,7 +31,7 @@ _SYS_VARS.mysql= MYSQL_PKGSRCDIR
.include "../../mk/bsd.prefs.mk"
MYSQL_VERSION_DEFAULT?= 55
MYSQL_VERSIONS_ACCEPTED?= 56 55 51 MARIADB55
MYSQL_VERSIONS_ACCEPTED?= 57 56 55 51 MARIADB55
# transform the list into individual variables
.for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -40,6 +40,10 @@ _MYSQL_VERSION_${mv}_OK= yes
# check what is installed
.if ${OPSYS} == "Darwin"
. if exists(${LOCALBASE}/lib/libmysqlclient.20.dylib)
_MYSQL_VERSION_57_INSTALLED= yes
_MYSQL_VERSION_INSTALLED= 57
. endif
. if exists(${LOCALBASE}/lib/libmysqlclient.18.dylib)
. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
_MYSQL_VERSION_56_INSTALLED= yes
@@ -54,6 +58,10 @@ _MYSQL_VERSION_51_INSTALLED= yes
_MYSQL_VERSION_INSTALLED= 51
. endif
.else
. if exists(${LOCALBASE}/lib/libmysqlclient.so.20)
_MYSQL_VERSION_57_INSTALLED= yes
_MYSQL_VERSION_INSTALLED= 57
. endif
. if exists(${LOCALBASE}/lib/libmysqlclient.so.18)
. if exists(${LOCALBASE}/include/mysql/mysql/client_authentication.h)
_MYSQL_VERSION_56_INSTALLED= yes
@@ -110,7 +118,9 @@ _MYSQL_VERSION= ${_MYSQL_VERSION_FIRSTACCEPTED}
#
# set variables for the version we decided to use:
#
.if ${_MYSQL_VERSION} == "56"
.if ${_MYSQL_VERSION} == "57"
MYSQL_PKGSRCDIR= ../../databases/mysql57-client
.elif ${_MYSQL_VERSION} == "56"
MYSQL_PKGSRCDIR= ../../databases/mysql56-client
.elif ${_MYSQL_VERSION} == "MARIADB55"
MYSQL_PKGSRCDIR= ../../databases/mariadb55-client

43
mk/ocaml.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: ocaml.mk,v 1.4 2015/04/20 02:36:05 hiramatsu Exp $
# $NetBSD: ocaml.mk,v 1.10 2016/06/20 19:44:04 jaapb Exp $
#
# This Makefile fragment handles the common variables used by OCaml packages.
#
@@ -14,8 +14,14 @@
# Package-settable variables:
# OCAML_USE_FINDLIB
# package uses findlib infrastructure
# OCAML_FINDLIB_DIRS
# directories under OCAML_SITELIBDIR that this package installs into
# OCAML_FINDLIB_REGISTER
# register findlib directories into OCaml ld.conf
# OCAML_USE_OASIS [implies OCAML_USE_FINDLIB]
# package uses oasis infrastructure
# OCAML_USE_OASIS_DYNRUN [implies OCAML_USE_OASIS]
# package uses oasis.dynrun
# OCAML_USE_OPAM
# package uses OPAM
# OASIS_BUILD_ARGS
@@ -33,7 +39,10 @@ BUILD_DEFS+= OCAML_USE_OPT_COMPILER
_VARGROUPS+= ocaml
_PKG_VARS.ocaml= \
OCAML_USE_FINDLIB \
OCAML_FINDLIB_DIRS \
OCAML_FINDLIB_REGISTER \
OCAML_USE_OASIS \
OCAML_USE_OASIS_DYNRUN \
OCAML_USE_OPAM \
OCAML_BUILD_ARGS
_DEF_VARS.ocaml= \
@@ -41,14 +50,15 @@ _DEF_VARS.ocaml= \
_SYS_VARS.ocaml= \
OCAML_SITELIBDIR
PKGNAME?= ocaml-${DISTNAME}
# Default value of OCAML_USE_FINDLIB
OCAML_USE_FINDLIB?= no
# Default value of OCAML_USE_OASIS
OCAML_USE_OASIS?= no
# Default value of OCAML_USE_OASIS_DYNRUN
OCAML_USE_OASIS_DYNRUN?= no
# Default value of OCAML_USE_OPAM
OCAML_USE_OPAM?= no
@@ -64,6 +74,14 @@ OCAML_USE_OPT_COMPILER?= yes
OCAML_USE_OPT_COMPILER?= no
.endif
#
# Configure stuff for OASIS_DYNRUN
#
.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
.include "../../devel/ocaml-oasis/buildlink3.mk"
OCAML_USE_OASIS= yes
.endif
#
# Configure stuff for OASIS
#
@@ -92,6 +110,8 @@ PRINT_PLIST_AWK+= { gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \
.if ${OCAML_USE_FINDLIB} == "yes"
.include "../../devel/ocaml-findlib/buildlink3.mk"
INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}
OCAML_FINDLIB_DIRS?= ${PKGBASE:S/^ocaml-//}
OCAML_FINDLIB_REGISTER?= yes
.endif
#
@@ -111,20 +131,31 @@ PLIST.ocaml-opt= yes
# OASIS targets
#
.if ${OCAML_USE_OASIS} == "yes"
# OASIS uses buildlink
.include "../../devel/ocamlbuild/buildlink3.mk"
.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
pre-configure:
${RUN} cd ${WRKSRC} && ocamlfind ocamlc -linkpkg -package oasis.dynrun -o setup setup.ml && ${RM} setup.cmo setup.cmi
OASIS_EXEC=./setup
.else
OASIS_EXEC=ocaml setup.ml
.endif
# Redefine configure target
do-configure:
${RUN} cd ${WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} ocaml setup.ml -configure ${CONFIGURE_ARGS}
${SETENV} ${CONFIGURE_ENV} ${OASIS_EXEC} -configure ${CONFIGURE_ARGS}
# Redefine build target
do-build:
${RUN} cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ocaml setup.ml -build ${OASIS_BUILD_ARGS}
${SETENV} ${MAKE_ENV} ${OASIS_EXEC} -build ${OASIS_BUILD_ARGS}
# Redefine install target
do-install:
${RUN} cd ${WRKSRC} && \
ocaml setup.ml -install
${OASIS_EXEC} -install
.endif
# Add dependency to ocaml.

3
mk/oss.builtin.mk
View File

@@ -1,10 +1,11 @@
# $NetBSD: oss.builtin.mk,v 1.4 2013/11/23 09:10:14 obache Exp $
# $NetBSD: oss.builtin.mk,v 1.5 2016/09/18 05:25:18 richard Exp $
BUILTIN_PKG:= oss
BUILTIN_FIND_LIBS:= ossaudio
BUILTIN_FIND_HEADERS_VAR:= H_SOUNDCARD
BUILTIN_FIND_HEADERS.H_SOUNDCARD= soundcard.h \
linux/soundcard.h \
sys/soundcard.h
.include "../../mk/buildlink3/bsd.builtin.mk"

24
mk/package/package.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: package.mk,v 1.24 2013/05/23 13:18:56 obache Exp $
# $NetBSD: package.mk,v 1.26 2016/07/14 14:43:55 leot Exp $
#
# This file provides the code for the "package" phase.
#
@@ -8,17 +8,10 @@
# Generates a binary package.
# It will acquire elevated privileges just-in-time.
#
# XXX: From which files is the binary package generated? The
# installed files in LOCALBASE, or some files in WRKDIR/.destdir?
#
_PACKAGE_TARGETS+= check-vulnerable
.if make(replace) && ${_USE_DESTDIR} == "no"
_PACKAGE_TARGETS+= replace
.else
_PACKAGE_TARGETS+= stage-install
_PACKAGE_TARGETS+= stage-package-create
.endif
_PACKAGE_TARGETS+= acquire-package-lock
_PACKAGE_TARGETS+= ${_COOKIE.package}
_PACKAGE_TARGETS+= release-package-lock
@@ -84,9 +77,6 @@ package-cookie:
### package-all is a helper target to create the binary package and
### generate any necessary warnings.
###
.if ${_USE_DESTDIR} == "no"
_PACKAGE_ALL_TARGETS+= package-check-installed
.endif
_PACKAGE_ALL_TARGETS+= package-create
_PACKAGE_ALL_TARGETS+= _package-warnings
_PACKAGE_ALL_TARGETS+= error-check
@@ -99,18 +89,6 @@ package-all: su-package-all
.endif
su-package-all: ${_PACKAGE_ALL_TARGETS}
######################################################################
### package-check-installed (PRIVATE, override)
######################################################################
### package-check-installed verifies that the package is installed on
### the system. This should be overridden per package system format.
###
.if !target(package-check-installed)
.PHONY: package-check-installed
package-check-installed:
@${DO_NADA}
.endif
######################################################################
### package-create (PRIVATE, override)
######################################################################

51
mk/pax.mk Normal file
View File

@@ -0,0 +1,51 @@
# $NetBSD: pax.mk,v 1.3 2016/05/27 08:33:00 leot Exp $
#
# Infrastructure support for binaries known to fail with PaX enabled.
#
# User-settable variables:
# TOOLS_PLATFORM.paxctl
# The path to the paxctl(8) binary
#
# Package-settable variables:
#
# NOT_PAX_ASLR_SAFE
# The list of binaries which do not support PaX ASLR.
#
# NOT_PAX_MPROTECT_SAFE
# The list of binaries which do not support PaX MPROTECT.
#
# Keywords: aslr mprotect pax paxctl
#
.if !defined(PAX_MK)
. if defined(TOOLS_PLATFORM.paxctl)
PAXCTL= ${TOOLS_PLATFORM.paxctl}
. if !empty(NOT_PAX_ASLR_SAFE)
_INSTALL_ALL_TARGETS+= post-install-pax-aslr-binaries
.PHONY: post-install-pax-aslr-binaries
post-install: post-install-pax-aslr-binaries
post-install-pax-aslr-binaries:
@${STEP_MSG} "Setting PaX ASLR flags"
${RUN} \
for binary in ${NOT_PAX_ASLR_SAFE}; do \
${PAXCTL} +a ${DESTDIR}${PREFIX}/$$binary; \
done
. endif
. if !empty(NOT_PAX_MPROTECT_SAFE)
_INSTALL_ALL_TARGETS+= post-install-pax-mprotect-binaries
.PHONY: post-install-pax-mprotect-binaries
post-install: post-install-pax-mprotect-binaries
post-install-pax-mprotect-binaries:
@${STEP_MSG} "Setting PaX MPROTECT flags"
${RUN} \
for binary in ${NOT_PAX_MPROTECT_SAFE}; do \
${PAXCTL} +m ${DESTDIR}${PREFIX}/$$binary; \
done
. endif
. endif
.endif

6
mk/pbulk/pbulk-index.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pbulk-index.mk,v 1.20 2014/06/10 15:22:14 joerg Exp $
# $NetBSD: pbulk-index.mk,v 1.22 2016/09/08 15:19:18 joerg Exp $
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to the parallel bulk build
@@ -30,7 +30,7 @@ _PBULK_MULTI_LIST.mysql= MYSQL_VERSIONS_ACCEPTED
_PBULK_MULTI_VAR.mysql= MYSQL_VERSION_REQD
_PBULK_MULTI_DEFAULT.mysql= MYSQL_VERSION_DEFAULT
_PBULK_MULTI_LIST.php= PHP_VERSIONS_ACCEPTED
_PBULK_MULTI_LIST.php= _PHP_VERSIONS_ACCEPTED
_PBULK_MULTI_VAR.php= PHP_VERSION_REQD
_PBULK_MULTI_DEFAULT.php= PHP_VERSION_DEFAULT
@@ -42,7 +42,7 @@ _PBULK_MULTI_LIST.python= _PYTHON_VERSIONS_ACCEPTED
_PBULK_MULTI_VAR.python= PYTHON_VERSION_REQD
_PBULK_MULTI_DEFAULT.python= PYTHON_VERSION_DEFAULT
_PBULK_MULTI_LIST.ruby= RUBY_VERSION_SUPPORTED
_PBULK_MULTI_LIST.ruby= _RUBY_VERSIONS_ACCEPTED
_PBULK_MULTI_VAR.ruby= RUBY_VERSION_REQD
_PBULK_MULTI_DEFAULT.ruby= RUBY_VERSION_DEFAULT

34
mk/pbulk/pbulk.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh
# $Id: pbulk.sh,v 1.1 2014/07/15 21:29:38 asau Exp $
# $Id: pbulk.sh,v 1.3 2015/12/14 21:12:01 asau Exp $
set -e
usage="usage: ${0##*/} [-lun] [-c mk.conf.fragment] [-d nodes]"
@@ -25,7 +25,6 @@ if [ -n "$unprivileged" ]; then
: ${PKGSRCDIR:=${HOME}/pkgsrc}
: ${PREFIX:=${HOME}/pkg}
: ${PACKAGES:=${HOME}/packages}
: ${DISTDIR:=${HOME}/distfiles}
: ${BULKLOG:=${HOME}/bulklog}
fi
@@ -34,7 +33,6 @@ fi
: ${PBULKWORK:=${TMPDIR}/work-pbulk}
: ${PACKAGES:=/mnt/packages}
: ${DISTDIR:=/mnt/distfiles}
: ${BULKLOG:=/mnt/bulklog}
# almost constant:
@@ -61,10 +59,7 @@ fi
# Deploying pbulk packages:
# - bootstrapping
cat >${TMPDIR}/pbulk.mk <<EOF
WRKOBJDIR= ${TMPDIR}/obj-pbulk
PACKAGES= ${TMPDIR}/packages-pbulk
PKG_DEVELOPER= yes
DISTDIR= ${DISTDIR}
EOF
${PKGSRCDIR}/bootstrap/bootstrap \
@@ -76,7 +71,7 @@ rm -rf ${PBULKWORK}
rm -f ${TMPDIR}/pbulk.mk
# - installing pbulk
(cd ${PKGSRCDIR}/pkgtools/pbulk && ${PBULKPREFIX}/bin/bmake install)
(cd ${PKGSRCDIR}/pkgtools/pbulk && PACKAGES=${TMPDIR}/packages-pbulk WRKOBJDIR=${TMPDIR}/obj-pbulk ${PBULKPREFIX}/bin/bmake install)
rm -rf ${TMPDIR}/obj-pbulk
rm -rf ${TMPDIR}/packages-pbulk
@@ -131,6 +126,14 @@ prefix=${PREFIX}
varbase=${PREFIX}/var
pkgdb=${PREFIX}/var/db/pkg
EOF
elif [ -n "${PREFIX}" ]; then
# Non-default prefix:
cat >> ${PBULKPREFIX}/etc/pbulk.conf.over <<EOF
# Non-default prefix overrides:
prefix=${PREFIX}
varbase=${PREFIX}/var
pkgdb=${PREFIX}/var/db/pkg
EOF
fi
# Quotes around "EOF" are important below
@@ -172,28 +175,23 @@ cp ${PBULKPREFIX}/etc/pbulk.conf ${PBULKPREFIX}/etc/pbulk.conf.bak
mv ${PBULKPREFIX}/etc/pbulk.conf.new ${PBULKPREFIX}/etc/pbulk.conf
# Bootstrapping
cat ${mk_fragment:+"$mk_fragment"} - >${TMPDIR}/mk.conf.inc <<EOF
WRKOBJDIR= ${TMPDIR}
PACKAGES= ${PACKAGES}
DISTDIR= ${DISTDIR}
EOF
# Keep "packages" in pbulk.conf and "PACKAGES" in mk.conf in sync.
if [ -n "$native" ]; then
cat ${TMPDIR}/mk.conf.inc > /etc/mk.conf
if [ -n "$mk_fragment" ]; then cat "$mk_fragment" > /etc/mk.conf; fi
else
# Ensure that the directory for bootstrap kit exists:
mkdir -p ${PACKAGES}
# Creating the bootstrap kit
${PKGSRCDIR}/bootstrap/bootstrap \
${unprivileged:+--unprivileged --prefix=${PREFIX}} \
--mk-fragment=${TMPDIR}/mk.conf.inc \
${unprivileged:+--unprivileged} \
${PREFIX:+--prefix=${PREFIX}} \
${mk_fragment:+--mk-fragment="$mk_fragment"} \
--workdir=${TMPDIR}/work \
--gzip-binary-kit=${PACKAGES}/bootstrap.tar.gz
rm -rf ${TMPDIR}/work
rm -f ${TMPDIR}/mk.conf.inc
fi
# Keep "packages" in pbulk.conf and "PACKAGES" in mk.conf fragment in sync.
# Final preparations:
mkdir -p ${PACKAGES}
@@ -202,4 +200,4 @@ chown pbulk:"$(id -gn pbulk)" ${PACKAGES}
fi
# Let's start:
#${PBULKPREFIX}/bin/bulkbuild
#PACKAGES=${PACKAGES} WRKOBJDIR=${TMPDIR} ${PBULKPREFIX}/bin/bulkbuild

21
mk/pgsql.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pgsql.buildlink3.mk,v 1.38 2015/01/14 21:01:18 adam Exp $
# $NetBSD: pgsql.buildlink3.mk,v 1.41 2016/02/25 21:39:07 tnn Exp $
#
# User-settable variables:
#
@@ -25,7 +25,7 @@ _SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
.include "../../mk/bsd.prefs.mk"
PGSQL_VERSION_DEFAULT?= 93
PGSQL_VERSIONS_ACCEPTED?= 94 93 92 91 90 84
PGSQL_VERSIONS_ACCEPTED?= 95 94 93 92 91
# transform the list into individual variables
.for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -40,6 +40,9 @@ PG_LIB_EXT=so
# check what is installed
.if ${OPSYS} == "Darwin"
. if exists(${LOCALBASE}/lib/libecpg.6.7.dylib)
_PGSQL_VERSION_95_INSTALLED= yes
. endif
. if exists(${LOCALBASE}/lib/libecpg.6.6.dylib)
_PGSQL_VERSION_94_INSTALLED= yes
. endif
@@ -59,6 +62,9 @@ _PGSQL_VERSION_90_INSTALLED= yes
_PGSQL_VERSION_84_INSTALLED= yes
. endif
.else
. if exists(${LOCALBASE}/lib/libecpg.so.6.7)
_PGSQL_VERSION_95_INSTALLED= yes
. endif
. if exists(${LOCALBASE}/lib/libecpg.so.6.6)
_PGSQL_VERSION_94_INSTALLED= yes
. endif
@@ -114,7 +120,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTACCEPTED}
.endif
# set variables for the version we decided to use:
.if ${_PGSQL_VERSION} == "94"
.if ${_PGSQL_VERSION} == "95"
PGSQL_TYPE= postgresql95-client
PGPKGSRCDIR= ../../databases/postgresql95-client
.elif ${_PGSQL_VERSION} == "94"
PGSQL_TYPE= postgresql94-client
PGPKGSRCDIR= ../../databases/postgresql94-client
.elif ${_PGSQL_VERSION} == "93"
@@ -126,12 +135,6 @@ PGPKGSRCDIR= ../../databases/postgresql92-client
.elif ${_PGSQL_VERSION} == "91"
PGSQL_TYPE= postgresql91-client
PGPKGSRCDIR= ../../databases/postgresql91-client
.elif ${_PGSQL_VERSION} == "90"
PGSQL_TYPE= postgresql90-client
PGPKGSRCDIR= ../../databases/postgresql90-client
.elif ${_PGSQL_VERSION} == "84"
PGSQL_TYPE= postgresql84-client
PGPKGSRCDIR= ../../databases/postgresql84-client
.else
# force an error
PGSQL_TYPE= none

6
mk/pkg-build-options.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pkg-build-options.mk,v 1.9 2012/12/17 14:27:44 wiz Exp $
# $NetBSD: pkg-build-options.mk,v 1.10 2016/07/09 09:54:27 rillig Exp $
#
# This procedure determines the PKG_OPTIONS that have been in effect
# when the package ${pkgbase} has been built. When the package is not
@@ -29,7 +29,7 @@ BUILDLINK_TREE?=
# Counting words doesn't work as expected for empty strings, they
# still have one word. Older make doesn't like the code without
# variable assignment for unknown reasons.
_BUILDLINK_TREE_WITH:= ${BUILDLINK_TREE:M-*:[\#]}
_BUILDLINK_TREE_WITH:= ${BUILDLINK_TREE:M-*:[\#]}
_BUILDLINK_TREE_WITHOUT:= ${BUILDLINK_TREE:N-*:[\#]}
.if (empty(BUILDLINK_TREE:M-*) && empty(BUILDLINK_TREE:N-*)) || \
(!empty(BUILDLINK_TREE:M-*) && !empty(BUILDLINK_TREE:N-*) && \
@@ -41,7 +41,7 @@ PKG_FAIL_REASON+= "[pkg-build-options.mk] This file may only be included from a
.else
. for b in ${pkgbase}
. if !defined(PKG_BUILD_OPTIONS.${b})
PKG_BUILD_OPTIONS.${b} != \
PKG_BUILD_OPTIONS.${b}!= \
echo ""; \
${PKG_INFO} -Q PKG_OPTIONS ${b} 2>/dev/null \
|| { cd ${BUILDLINK_PKGSRCDIR.${b}} \

3
mk/pkgformat/README
View File

@@ -1,4 +1,4 @@
$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz Exp $
$NetBSD: README,v 1.3 2016/04/10 15:58:03 joerg Exp $
= Introduction =
@@ -57,7 +57,6 @@ The following make targets must be implemented:
* _pkgformat-show-depends
* _pkgformat-install-dependencies
* bootstrap-depends
* _pkgformat-register
* tarup (XXX: This doesn't sound like a target that should be defined
here.)
* tarup-pkg

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

71
mk/pkginstall/bsd.pkginstall.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.pkginstall.mk,v 1.63 2015/08/10 05:41:10 dholland Exp $
# $NetBSD: bsd.pkginstall.mk,v 1.69 2016/06/17 08:53:42 jaapb Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@@ -19,6 +19,7 @@ _VARGROUPS+= pkginstall
_USER_VARS.pkginstall= \
FONTS_VERBOSE \
INFO_FILES_VERBOSE \
OCAML_FINDLIB_REGISTER_VERBOSE \
PKG_CREATE_USERGROUP \
PKG_CONFIG PKG_CONFIG_PERMS \
PKG_RCD_SCRIPTS \
@@ -179,11 +180,11 @@ FILES_SUBST+= PKGBASE=${PKGBASE:Q}
#
# USERGROUP_PHASE is set to the phase just before which users and
# groups need to be created. Valid values are "configure" and
# "build". If not defined, then by default users and groups
# are created prior to installation by the pre-install-script
# target. If this is defined, then the numeric UIDs and GIDs
# of users and groups required by this package are hardcoded
# into the +INSTALL script.
# "build" and "pre-install".
# If not defined, then by default users and groups are created
# as pare of the +INSTALL script. If this is defined, then
# the numeric UIDs and GIDs of users and groups required by this
# package are hardcoded into the +INSTALL script.
#
PKG_GROUPS?= # empty
PKG_USERS?= # empty
@@ -326,7 +327,7 @@ ${_INSTALL_USERGROUP_UNPACKER}: \
pre-configure: create-usergroup
. elif !empty(USERGROUP_PHASE:M*build)
pre-build: create-usergroup
. elif !empty(USERGROUP_PHASE:Mpre-install) && ${_USE_DESTDIR} != "no"
. elif !empty(USERGROUP_PHASE:Mpre-install)
pre-install: create-usergroup
. endif
.endif
@@ -373,9 +374,8 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER}
# make certain files set-uid or to change the ownership or a
# directory.
#
# Note that when USE_DESTDIR is in effect, the special permissions
# are not directly recorded (as file attributes) in the binary
# package file.
# The special permissions may not directly recorded (as file
# attributes) in the binary package file.
#
# SETUID_ROOT_PERMS is a convenience definition to note an executable is
# meant to be setuid-root, and should be used as follows:
@@ -387,7 +387,7 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER}
#
# SPECIAL_PERMS+= /path/to/sgidgame ${SETGID_GAMES_PERMS}
#
# GAMEDATA_PERMS and GAMEDIR_PERMS are convenience defintiions for files
# GAMEDATA_PERMS and GAMEDIR_PERMS are convenience definitions for files
# that are meant to be accessed by things that are setgid games. Because
# such files should normally be under ${VARBASE}, generally these
# definitions should be used roughly as follows:
@@ -786,6 +786,30 @@ install-script-data-info-files:
fi
.endif
# OCAML_FINDLIB_REGISTER
_INSTALL_OFR_FILE= ${_PKGINSTALL_DIR}/ocaml-findlib-register
_INSTALL_UNPACK_TMPL+= ${_INSTALL_OFR_FILE}
${_INSTALL_OFR_FILE}: ../../mk/pkginstall/ocaml-findlib-register
${RUN}${MKDIR} ${.TARGET:H}
.if !empty(OCAML_FINDLIB_REGISTER:M[Yy][Ee][Ss])
${RUN}${SED} ${FILES_SUBST_SED} \
../../mk/pkginstall/ocaml-findlib-register > ${.TARGET}
.else
${RUN}${RM} -f ${.TARGET}; \
${TOUCH} ${TOUCH_ARGS} ${.TARGET}
.endif
.PHONY: install-script-data-ocaml-findlib-register
install-script-data: install-script-data-ocaml-findlib-register
install-script-data-ocaml-findlib-register:
.if !empty(OCAML_FINDLIB_REGISTER:M[Yy][Ee][Ss])
${RUN} \
cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \
${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \
UNPACK +OCAML_FINDLIB_REGISTER
.endif
# PKG_SHELL contains the pathname of the shell that should be added or
# removed from the shell database, /etc/shells. If a pathname
# is relative, then it is taken to be relative to ${PREFIX}.
@@ -984,9 +1008,11 @@ ${_INSTALL_FONTS_FILE}: ../../mk/pkginstall/fonts
.if ${PKG_DEVELOPER:Uno} != "no"
FONTS_VERBOSE?= YES
INFO_FILES_VERBOSE?= YES
OCAML_FINDLIB_REGISTER_VERBOSE?= YES
.else
FONTS_VERBOSE?= NO
INFO_FILES_VERBOSE?= NO
OCAML_FINDLIB_REGISTER_VERBOSE?= NO
.endif
PKG_CREATE_USERGROUP?= YES
PKG_CONFIG?= YES
@@ -1002,6 +1028,7 @@ FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:Q}
FILES_SUBST+= PKG_UPDATE_FONTS_DB=${PKG_UPDATE_FONTS_DB:Q}
FILES_SUBST+= FONTS_VERBOSE=${FONTS_VERBOSE:Q}
FILES_SUBST+= INFO_FILES_VERBOSE=${INFO_FILES_VERBOSE:Q}
FILES_SUBST+= OCAML_FINDLIB_REGISTER_VERBOSE=${OCAML_FINDLIB_REGISTER_VERBOSE:Q}
# Substitute for various programs used in the DEINSTALL/INSTALL scripts and
# in the rc.d scripts.
@@ -1032,6 +1059,8 @@ FILES_SUBST+= LN=${LN:Q}
FILES_SUBST+= LS=${LS:Q}
FILES_SUBST+= MKDIR=${MKDIR:Q}
FILES_SUBST+= MV=${MV:Q}
FILES_SUBST+= OCAML_FINDLIB_DIRS=${OCAML_FINDLIB_DIRS:Q}
FILES_SUBST+= OCAML_SITELIBDIR=${OCAML_SITELIBDIR:Q}
FILES_SUBST+= PERL5=${PERL5:Q}
FILES_SUBST+= PKG_ADMIN=${PKG_ADMIN_CMD:Q}
FILES_SUBST+= PKG_INFO=${PKG_INFO_CMD:Q}
@@ -1059,8 +1088,6 @@ INSTALL_SCRIPTS_ENV= PKG_PREFIX=${PREFIX}
INSTALL_SCRIPTS_ENV+= PKG_METADATA_DIR=${_PKG_DBDIR}/${PKGNAME}
INSTALL_SCRIPTS_ENV+= PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR}
.PHONY: pre-install-script post-install-script
DEINSTALL_FILE= ${PKG_DB_TMPDIR}/+DEINSTALL
INSTALL_FILE= ${PKG_DB_TMPDIR}/+INSTALL
_DEINSTALL_FILE= ${_PKGINSTALL_DIR}/DEINSTALL
@@ -1122,24 +1149,6 @@ ${_INSTALL_FILE}: ${INSTALL_SRC}
esac
${RUN}${CHMOD} +x ${.TARGET}
pre-install-script:
${RUN} \
if ${TEST} -x ${INSTALL_FILE}; then \
${STEP_MSG} "Running PRE-INSTALL script actions"; \
cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \
${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \
PRE-INSTALL; \
fi
post-install-script:
${RUN} \
if ${TEST} -x ${INSTALL_FILE}; then \
${STEP_MSG} "Running POST-INSTALL script actions"; \
cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \
${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \
POST-INSTALL; \
fi
# rc.d scripts are automatically generated and installed into the rc.d
# scripts example directory at the post-install step. The following
# variables are relevant to this process:

8
mk/pkginstall/deinstall
View File

@@ -1,7 +1,13 @@
# $NetBSD: deinstall,v 1.3 2014/12/30 15:13:20 wiz Exp $
# $NetBSD: deinstall,v 1.4 2016/04/12 15:52:29 jaapb Exp $
case ${STAGE} in
DEINSTALL)
#
# Unregister package from ocaml-findlib.
#
${TEST} ! -x ./+OCAML_FINDLIB_REGISTER ||
./+OCAML_FINDLIB_REGISTER REMOVE ${OCAML_FINDLIB_DIR}
#
# Unregister info files.
#

8
mk/pkginstall/install
View File

@@ -1,4 +1,4 @@
# $NetBSD: install,v 1.3 2014/12/30 15:13:20 wiz Exp $
# $NetBSD: install,v 1.4 2016/04/12 15:52:29 jaapb Exp $
case ${STAGE} in
PRE-INSTALL)
@@ -70,6 +70,12 @@ POST-INSTALL)
#
${TEST} ! -x ./+INFO_FILES ||
./+INFO_FILES ADD ${PKG_METADATA_DIR}
#
# Register package into ocaml-findlib.
#
${TEST} ! -x ./+OCAML_FINDLIB_REGISTER ||
./+OCAML_FINDLIB_REGISTER ADD ${PKG_METADATA_DIR}
;;
esac

69
mk/pkginstall/ocaml-findlib-register Normal file
View File

@@ -0,0 +1,69 @@
# $NetBSD: ocaml-findlib-register,v 1.3 2016/06/25 13:52:28 jaapb Exp $
#
# Generate an +OCAML_FINDLIB_REGISTER script that handles registration for
# findlib after a binary installation
#
case "${STAGE},$1" in
UNPACK,|UNPACK,+OCAML_FINDLIB_REGISTER)
${CAT} > ./+OCAML_FINDLIB_REGISTER << 'EOF'
#!@SH@
#
# +OCAML_FINDLIB_REGISTER - ocaml-findlib registration script
#
# Usage: ./+OCAML_FINDLIB_REGISTER ADD|REMOVE [findlib_pkg_dir]
#
# This script supports two actions, ADD and REMOVE, that will
# add or remove directories from the ocaml ld.conf file (standard location
# is in LOCALBASE/lib/ocaml/ld.conf)
#
ECHO="@ECHO@"
GREP="@GREP@"
MV="@MV@"
OCAML_FINDLIB_DIRS="@OCAML_FINDLIB_DIRS@"
OCAML_FINDLIB_REGISTER="@OCAML_FINDLIB_REGISTER@"
OCAML_SITELIBDIR="@OCAML_SITELIBDIR@"
PWD_CMD="@PWD_CMD@"
RM="@RM@"
TOUCH="@TOUCH@"
SELF=$0
ACTION=$1
LDCONF="@PREFIX@/lib/ocaml/ld.conf"
CURDIR=`${PWD_CMD}`
PKG_METADATA_DIR="${2-${CURDIR}}"
: ${PKGNAME=${PKG_METADATA_DIR##*/}}
: ${PKG_PREFIX=@PREFIX@}
case "${OCAML_FINDLIB_REGISTER_VERBOSE:-@OCAML_FINDLIB_REGISTER_VERBOSE@}" in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
echo="${ECHO}"
;;
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
echo=":"
;;
esac
${TOUCH} "${LDCONF}.tmp"
for i in ${OCAML_FINDLIB_DIRS}
do
${GREP} -F -v -- "${OCAML_SITELIBDIR}/$i" < "${LDCONF}" > "${LDCONF}.tmp"
case $ACTION in
ADD)
$echo "${PKGNAME}: adding $i to ${LDCONF}"
${ECHO} "@PREFIX@/${OCAML_SITELIBDIR}/$i" >> "${LDCONF}.tmp"
;;
REMOVE)
$echo "${PKGNAME}: removing $i from ${LDCONF}"
;;
esac
${MV} -f "${LDCONF}.tmp" "${LDCONF}"
done
EOF
${CHMOD} +x ./+OCAML_FINDLIB_REGISTER
;;
esac

15
mk/platform/AIX.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: AIX.mk,v 1.40 2013/04/28 12:53:56 obache Exp $
# $NetBSD: AIX.mk,v 1.42 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the AIX operating system.
@@ -48,11 +48,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
@@ -66,3 +61,11 @@ _OPSYS_CAN_CHECK_SHLIBS= no # can't use readelf in check/bsd.check-vars.mk
# to avoid a test required by the libtool script that takes forever.
# FIXME: Adjust to work on this system and enable the lines below.
#_OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
# On AIX, there are a handful of utilies (i.e., ar(1), ld(1), strip(1), etc)
# that care about the type of object files they should examine via the various'
# flags. Alternatively, it is easier to export OBJECT_MODE with the
# appropriate $ABI versus piping through flags for all related utilities.
.if defined(ABI)
ALL_ENV+= OBJECT_MODE=${ABI}
.endif

7
mk/platform/BSDOS.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: BSDOS.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
# $NetBSD: BSDOS.mk,v 1.34 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -55,11 +55,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

9
mk/platform/Bitrig.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Bitrig.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
# $NetBSD: Bitrig.mk,v 1.3 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Bitrig operating system.
@@ -49,15 +49,10 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
.if (${MACHINE_ARCH} == "amd64") || (${MACHINE_ARCH} == "arm")
.if (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "arm")
DEFAULT_SERIAL_DEVICE?= /dev/tty00
SERIAL_DEVICES?= /dev/tty00 \
/dev/tty01

7
mk/platform/Cygwin.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Cygwin.mk,v 1.15 2013/10/13 10:10:05 wiz Exp $
# $NetBSD: Cygwin.mk,v 1.16 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Windows with Cygwin.
@@ -56,11 +56,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= no # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

79
mk/platform/Darwin.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Darwin.mk,v 1.71 2015/09/07 11:48:35 jperkin Exp $
# $NetBSD: Darwin.mk,v 1.83 2016/09/06 09:50:20 jperkin Exp $
#
# Variable definitions for the Darwin operating system.
@@ -67,8 +67,9 @@ ROOT_GROUP?= wheel
ROOT_USER?= root
SERIAL_DEVICES?= /dev/null
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_memorysize?= ulimit -m `ulimit -H -m`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
ULIMIT_CMD_cputime?= ulimit -t `ulimit -H -t`
GROUPADD?= ${LOCALBASE}/sbin/groupadd
USERADD?= ${LOCALBASE}/sbin/useradd
@@ -77,25 +78,32 @@ _USER_DEPENDS= user-darwin>=20130712:../../sysutils/user_darwin
_OPSYS_EMULDIR.darwin= # empty
_OPSYS_SYSTEM_RPATH?= /usr/lib
_OPSYS_LIB_DIRS?= /usr/lib
OSX_VERSION!= sw_vers -productVersion
. if ${OSX_VERSION:R:R} != ${OSX_VERSION:R}
OSX_VERSION:= ${OSX_VERSION:R}
. endif
MAKEFLAGS+= OSX_VERSION=${OSX_VERSION:Q}
#
# From Xcode 5 onwards system headers are no longer installed by default
# into /usr/include, so we need to query their location.
# into /usr/include, so we need to query their location if /usr/include is
# not available.
#
# Use current system version SDK (avoid newer SDKs).
#
.if exists(/usr/bin/xcrun)
OSX_VERS!= sw_vers -productVersion
. if ${OSX_VERS:R:R} != ${OSX_VERS:R}
OSX_VERS:=${OSX_VERS:R}
. endif
OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERS} --show-sdk-path 2>/dev/null || echo /nonexistent
.endif
_OPSYS_SYSTEM_RPATH?= /usr/lib
_OPSYS_LIB_DIRS?= /usr/lib
.if exists(/usr/include/stdio.h)
_OPSYS_INCLUDE_DIRS?= /usr/include
.elif exists(${OSX_SDK_PATH}/usr/include/stdio.h)
_OPSYS_INCLUDE_DIRS?= ${OSX_SDK_PATH}/usr/include
_OPSYS_INCLUDE_DIRS?= /usr/include
.elif exists(/usr/bin/xcrun)
OSX_SDK_PATH!= /usr/bin/xcrun --sdk macosx${OSX_VERSION} --show-sdk-path 2>/dev/null || echo /nonexistent
. if exists(${OSX_SDK_PATH}/usr/include/stdio.h)
_OPSYS_INCLUDE_DIRS?= ${OSX_SDK_PATH}/usr/include
MAKEFLAGS+= OSX_SDK_PATH=${OSX_SDK_PATH:Q}
. else
PKG_FAIL_REASON+= "No suitable Xcode SDK or Command Line Tools installed."
. endif
.endif
.if ${OS_VERSION:R} >= 6
@@ -126,21 +134,24 @@ USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat
.endif
# Builtin defaults which make sense for this platform.
_OPSYS_PREFER.libuuid?= native # system headers assume uuid_string_t
_OPSYS_PREFER.linux-pam?= native
_OPSYS_PREFER.mit-krb5?= native
.if ${OS_VERSION:R} >= 11
_OPSYS_PREFER.openssl?= pkgsrc # builtin deprecated from 10.7 onwards
.endif
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,-force-load
_OPSYS_NO_WHOLE_ARCHIVE_FLAG=
.else
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
.endif
# Remove common GNU ld arguments incompatible with the Darwin linker.
BUILDLINK_TRANSFORM+= rm:-Wl,-O1
BUILDLINK_TRANSFORM+= rm:-Wl,-Bdynamic
BUILDLINK_TRANSFORM+= rm:-Wl,-Bsymbolic
BUILDLINK_TRANSFORM+= rm:-Wl,-export-dynamic
BUILDLINK_TRANSFORM+= rm:-Wl,-warn-common
BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed
BUILDLINK_TRANSFORM+= rm:-Wl,--disable-new-dtags
BUILDLINK_TRANSFORM+= rm:-Wl,--enable-new-dtags
BUILDLINK_TRANSFORM+= rm:-Wl,--export-dynamic
BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
_OPSYS_CAN_CHECK_SHLIBS= yes # check shared libraries using otool(1)
@@ -164,6 +175,20 @@ CONFIGURE_ENV+= ac_cv_func_poll=no
. endif
.endif
# If the deployment target is not set explicitly, the linker in Tiger and prior
# versions running on PowerPC hosts defaults to a target of 10.1.
# Set the target for Tiger systems to be 10.4.
.if !empty(MACHINE_PLATFORM:MDarwin-8.*-powerpc)
MAKE_ENV+= MACOSX_DEPLOYMENT_TARGET="10.4"
.endif
# El Capitan GM has a file system bug where a deep directory hierarchy can be
# created but not removed. Avoid running a test which does exactly this.
# See https://openradar.appspot.com/radar?id=6160634819379200
.if defined(GNU_CONFIGURE) && !empty(OS_VERSION:M15.[01].0)
CONFIGURE_ENV+= gl_cv_func_getcwd_abort_bug=no
.endif
# Use "/bin/ksh" for buildlink3 wrapper script to improve build performance.
.if (!empty(OS_VERSION:M9.*) || !empty(OS_VERSION:M1[0-2].*) || \
!empty(OS_VERSION:M1[4-9].*)) && \

9
mk/platform/DragonFly.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: DragonFly.mk,v 1.47 2015/09/10 19:49:58 jperkin Exp $
# $NetBSD: DragonFly.mk,v 1.49 2016/06/29 13:37:19 sevan Exp $
#
# Variable definitions for the DragonFly operating system.
@@ -27,7 +27,7 @@ ULIMIT_CMD_cputime?= ulimit -t `ulimit -H -t`
_OPSYS_EMULDIR.linux= /compat/linux
_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34:/usr/lib/gcc47
_OPSYS_SYSTEM_RPATH?= /lib:/usr/lib:/usr/lib/gcc41:/usr/lib/gcc34:/usr/lib/gcc47:/usr/lib/gcc50
_OPSYS_LIB_DIRS?= /lib /usr/lib
_OPSYS_INCLUDE_DIRS?= /usr/include
@@ -46,11 +46,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

7
mk/platform/FreeBSD.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: FreeBSD.mk,v 1.31 2015/04/21 17:01:56 joerg Exp $
# $NetBSD: FreeBSD.mk,v 1.32 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -52,11 +52,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

7
mk/platform/GNUkFreeBSD.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: GNUkFreeBSD.mk,v 1.3 2015/04/21 17:01:56 joerg Exp $
# $NetBSD: GNUkFreeBSD.mk,v 1.4 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Debian GNU/kFreeBSD operating system.
@@ -58,11 +58,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

6
mk/platform/HPUX.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: HPUX.mk,v 1.25 2015/04/19 12:02:15 tnn Exp $
# $NetBSD: HPUX.mk,v 1.26 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the HP-UX operating system.
@@ -50,10 +50,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,-tools2-HPUX-fixme
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,-tools3-HPUX-fixme
DEFAULT_SERIAL_DEVICE?= /dev/tty1p0
SERIAL_DEVICES?= /dev/tty0p0 \
/dev/tty1p0

7
mk/platform/Haiku.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Haiku.mk,v 1.13 2014/06/09 08:47:29 obache Exp $
# $NetBSD: Haiku.mk,v 1.14 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Haiku operating system.
@@ -57,11 +57,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

10
mk/platform/IRIX.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: IRIX.mk,v 1.42 2013/07/12 10:41:58 jperkin Exp $
# $NetBSD: IRIX.mk,v 1.43 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the IRIX operating system.
@@ -60,14 +60,6 @@ _PATCH_CAN_BACKUP= no # native patch(1) can make backups
.endif
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# XXX:
# These flags are for the IRIX linker. If GNU ld is used, these would need
# to be set to --{no-}whole-archive. So, ugh, let's say we only do
# IRIX tools for the time being.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,-all
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,-none
# IRIX has /usr/include/iconv.h, but it's not GNU iconv, so mark it
# incompatible.
_INCOMPAT_ICONV= IRIX-*-*

7
mk/platform/Interix.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Interix.mk,v 1.76 2015/02/16 10:42:00 jperkin Exp $
# $NetBSD: Interix.mk,v 1.77 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Interix operating system.
@@ -116,11 +116,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

15
mk/platform/Linux.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Linux.mk,v 1.63 2015/07/18 15:08:43 wiedi Exp $
# $NetBSD: Linux.mk,v 1.68 2016/09/17 05:41:37 richard Exp $
#
# Variable definitions for the Linux operating system.
@@ -67,6 +67,11 @@ _OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}:/lib/arm-linux-
_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX} /lib/arm-linux-gnueabi /usr/lib/arm-linux-gnueabi
.endif
.endif
.if !empty(MACHINE_ARCH:Maarch64)
LIBABISUFFIX?= /aarch64-linux-gnu
_OPSYS_SYSTEM_RPATH= /lib:/usr/lib:/lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
_OPSYS_LIB_DIRS?= /lib /usr/lib /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
.endif
.else
_OPSYS_SYSTEM_RPATH= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
@@ -96,11 +101,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip
@@ -125,8 +125,9 @@ LIBABISUFFIX?= 64
# When building 32-bit packages on x86_64 GNU ld isn't smart enough to
# figure out the target architecture based on the objects so we need to
# explicitly set it.
.if ${NATIVE_MACHINE_ARCH} == "x86_64" && ${MACHINE_ARCH} == "i386"
.if ${HOST_MACHINE_ARCH} == "x86_64" && ${MACHINE_ARCH} == "i386"
_WRAP_EXTRA_ARGS.LD+= -m elf_i386
CWRAPPERS_APPEND.ld+= -m elf_i386
.endif
## Use _CMD so the command only gets run when needed!

7
mk/platform/Minix.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Minix.mk,v 1.5 2013/04/28 12:53:56 obache Exp $
# $NetBSD: Minix.mk,v 1.6 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the Minix operating system.
@@ -41,11 +41,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple --suffix # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

8
mk/platform/MirBSD.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: MirBSD.mk,v 1.11 2015/04/21 17:01:56 joerg Exp $
# $NetBSD: MirBSD.mk,v 1.12 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the MirOS BSD operating system.
@@ -49,12 +49,6 @@ _USE_RPATH= yes # add rpath to LDFLAGS
BUILDLINK_TRANSFORM+= rm:-ldl # libdl.a is an empty static library
BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden # at least until there is a newer gcc
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

37
mk/platform/NetBSD.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: NetBSD.mk,v 1.45 2015/08/10 21:44:34 khorben Exp $
# $NetBSD: NetBSD.mk,v 1.48 2016/03/11 23:54:09 khorben Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -76,11 +76,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple --suffix # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
# for programs which use dlopen()
# not necessary since 1.6 (shared libs are linked against libgcc_pic)
.if !empty(OS_VERSION:M1.5*)
@@ -128,19 +123,27 @@ FFLAGS+= -mieee
PKG_HAVE_KQUEUE= # defined
.endif
.if ${PKGSRC_USE_FORT:Uno} != "no"
# build with fortify
_GCC_CFLAGS+= -D_FORTIFY_SOURCE=2
# Register support for FORTIFY (with GCC)
_OPSYS_SUPPORTS_FORTIFY=yes
# Register support for PIE on supported architectures (with GCC)
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "x86_64")
_OPSYS_SUPPORTS_MKPIE= yes
.endif
.if ${PKGSRC_USE_SSP:Uno} != "no"
. if (${MACHINE_ARCH} != "alpha") && \
(${MACHINE_ARCH} != "hppa") && \
(${MACHINE_ARCH} != "ia64") && \
(${MACHINE_ARCH} != "mips")
# build with stack protection (with GCC)
_GCC_CFLAGS+= -fstack-protector
. endif
# Register support for RELRO on supported architectures (with GCC)
.if (${MACHINE_ARCH} == "i386") || \
(${MACHINE_ARCH} == "x86_64")
_OPSYS_SUPPORTS_RELRO= yes
.endif
# Register support for SSP on most architectures (with GCC)
.if (${MACHINE_ARCH} != "alpha") && \
(${MACHINE_ARCH} != "hppa") && \
(${MACHINE_ARCH} != "ia64") && \
(${MACHINE_ARCH} != "mips")
_OPSYS_SUPPORTS_SSP= yes
.endif
_OPSYS_CAN_CHECK_SHLIBS= yes # use readelf in check/bsd.check-vars.mk

6
mk/platform/OSF1.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: OSF1.mk,v 1.35 2015/04/18 22:56:19 tnn Exp $
# $NetBSD: OSF1.mk,v 1.36 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the OSF1 operating system.
@@ -50,10 +50,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,-all
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,-none
DEFAULT_SERIAL_DEVICE?= /dev/tty00
SERIAL_DEVICES?= /dev/tty00 \
/dev/tty01

7
mk/platform/OpenBSD.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: OpenBSD.mk,v 1.39 2015/05/21 17:15:48 sevan Exp $
# $NetBSD: OpenBSD.mk,v 1.40 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -60,11 +60,6 @@ _PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix
.endif
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

5
mk/platform/QNX.mk
View File

@@ -67,11 +67,6 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -V simple -b -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is GNU ld.
_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U-s} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip

6
mk/platform/README
View File

@@ -1,4 +1,4 @@
$NetBSD: README,v 1.4 2014/02/14 13:11:17 obache Exp $
$NetBSD: README,v 1.5 2016/03/10 16:58:19 jperkin Exp $
These files contain platform-specific definitions that are used by the
pkgsrc infrastructure.
@@ -91,10 +91,6 @@ TODO: Document all these variables.
_USE_RPATH is "yes" to add rpath to LDFLAGS, otherwise "no"
_OPSYS_WHOLE_ARCHIVE_FLAG
_OPSYS_NO_WHOLE_ARCHIVE_FLAG
LINK_ALL_LIBGCC_HACK
_STRIPFLAG_CC is cc(1) option to strip.

9
mk/platform/SCO_SV.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: SCO_SV.mk,v 1.1 2014/03/14 22:05:18 ryoon Exp $
# $NetBSD: SCO_SV.mk,v 1.2 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the OpenServer 5.0.7/3.2 and 6.0.0/5.
@@ -44,13 +44,6 @@ _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
#
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is the standard OpenServer 5.0.7/3.2 linker, /usr/ccs/bin/ld.
# The use of GNU ld is not currently supported.
# XXX is this needed for OpenServer?
_OPSYS_WHOLE_ARCHIVE_FLAG=
_OPSYS_NO_WHOLE_ARCHIVE_FLAG=
_STRIPFLAG_CC?= ${_INSTALL_UNSTRIPPED:D:U} # cc(1) option to strip
_STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U} # install(1) option to strip

28
mk/platform/SunOS.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: SunOS.mk,v 1.65 2015/04/17 08:22:30 jperkin Exp $
# $NetBSD: SunOS.mk,v 1.72 2016/08/25 12:08:29 jperkin Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -24,6 +24,7 @@ ROOT_USER?= root
SERIAL_DEVICES?= /dev/null
ULIMIT_CMD_datasize?= ulimit -d `${SETENV} LC_MESSAGES=C ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `${SETENV} LC_MESSAGES=C ulimit -H -s`
ULIMIT_CMD_cputime?= ulimit -t `${SETENV} LC_MESSAGES=C ulimit -H -t`
ULIMIT_CMD_memorysize?= ulimit -v `${SETENV} LC_MESSAGES=C ulimit -H -v`
USERADD?= /usr/sbin/useradd
@@ -75,14 +76,10 @@ _PATCH_CAN_BACKUP= yes # native patch(1) can make backups
_PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU
# ld is not currently supported.
_OPSYS_WHOLE_ARCHIVE_FLAG= -z allextract
_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -z defaultextract
# Remove flags specific to GNU ld.
BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
BUILDLINK_TRANSFORM+= rm:-Wl,--disable-new-dtags
BUILDLINK_TRANSFORM+= rm:-Wl,--enable-new-dtags
BUILDLINK_TRANSFORM+= rm:-Wl,--export-dynamic
BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
BUILDLINK_TRANSFORM+= rm:-Wl,--no-as-needed
@@ -94,6 +91,11 @@ BUILDLINK_TRANSFORM+= rm:-export-dynamic
# Convert GNU ld flags to native SunOS ld flags where possible.
BUILDLINK_TRANSFORM+= opt:-Wl,--rpath:-Wl,-R
# Remove GCC-specific flags if using clang
.if ${PKGSRC_COMPILER} == "clang"
BUILDLINK_TRANSFORM+= rm:-mimpure-text
.endif
# Solaris has /usr/include/iconv.h, but it's not GNU iconv, so mark it
# incompatible.
_INCOMPAT_ICONV= SunOS-*-*
@@ -110,11 +112,13 @@ _OPSYS_SYSTEM_RPATH?= /lib${LIBABISUFFIX}:/usr/lib${LIBABISUFFIX}
_OPSYS_LIB_DIRS?= /lib${LIBABISUFFIX} /usr/lib${LIBABISUFFIX}
_OPSYS_INCLUDE_DIRS?= /usr/include
# Enable shlibs checks if readelf is set, not available by default.
_OPSYS_CAN_CHECK_SHLIBS= no
.if !empty(TOOLS_PATH.readelf)
_OPSYS_CAN_CHECK_SHLIBS= yes
.endif
# support FORTIFY (with GCC)
_OPSYS_SUPPORTS_FORTIFY=yes
# support stack protection (with GCC)
_OPSYS_SUPPORTS_SSP= yes
_OPSYS_CAN_CHECK_SHLIBS= yes # requires readelf
# check for maximum command line length and set it in configure's environment,
# to avoid a test required by the libtool script that takes forever.

9
mk/platform/UnixWare.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: UnixWare.mk,v 1.33 2013/04/28 12:53:56 obache Exp $
# $NetBSD: UnixWare.mk,v 1.34 2016/03/10 16:58:19 jperkin Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -51,13 +51,6 @@ _PATCH_BACKUP_ARG?= -b -V simple -z # switch to patch(1) for backup suffix
#
_USE_RPATH= yes # add rpath to LDFLAGS
# flags passed to the linker to extract all symbols from static archives.
# this is the standard Solaris linker, /usr/ccs/bin/ld. The use of GNU
# ld is not currently supported.
# XXX is this needed for UnixWare?
_OPSYS_WHOLE_ARCHIVE_FLAG=
_OPSYS_NO_WHOLE_ARCHIVE_FLAG=
# UnixWare has /usr/include/iconv.h, but it's not GNU iconv, so mark it
# incompatible.
_INCOMPAT_ICONV= UnixWare-*-*

57
mk/plist/plist-man.awk
View File

@@ -1,4 +1,4 @@
# $NetBSD: plist-man.awk,v 1.9 2013/09/12 11:01:47 jperkin Exp $
# $NetBSD: plist-man.awk,v 1.12 2016/07/26 08:41:36 jperkin Exp $
#
# Copyright (c) 2006 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -76,13 +76,15 @@ BEGIN {
MANZ = getenv("MANZ", "no")
PKGMANDIR = getenv("PKGMANDIR", "man")
CATMAN_SECTION_SUFFIX = getenv("CATMAN_SECTION_SUFFIX", "no")
CATPAGE_REGEX = "cat[1-9ln](am|f)?/[^/]*\\.[0-9ln](am|f)?"
MANPAGE_REGEX = "(man|html)[1-9ln](am|f)?/[^/]*\\.([1-9ln](am|f)?|html)"
CATORMAN_REGEX = "(" MANPAGE_REGEX "|" CATPAGE_REGEX ")"
}
###
### Canonicalize man page entries by stripping any ".gz" suffixes.
###
/^[^@]/ && \
/^([^\/]*\/)+(man[1-9ln]\/[^\/]*\.[1-9ln]|cat[1-9ln]\/[^\/]*\.[0-9])\.gz$/ {
/^[^@]/ && $0 ~ "^([^/]*/)+" CATORMAN_REGEX "\\.gz$" {
sub("\\.gz$", "")
}
@@ -90,8 +92,7 @@ BEGIN {
### Rewrite "imake-installed" catman pages as man pages if imake only
### supports man pages.
###
(IMAKE_MANINSTALL == "maninstall") && /^[^@]/ && \
/^([^\/]*\/)+cat[1-9ln]\/[^\/]*\.[0-9ln]$/ {
(IMAKE_MANINSTALL == "maninstall") && /^[^@]/ && $0 ~ "^([^/]*/)+" CATPAGE_REGEX "$" {
n = split($0, components, "/")
sub("cat", "man", components[n-1])
section = substr(components[n-1], 4, 1)
@@ -103,8 +104,7 @@ BEGIN {
### Rewrite "imake-installed" man pages as catman pages if imake only
### supports catman pages.
###
(IMAKE_MANINSTALL == "catinstall") && /^[^@]/ && \
/^([^\/]*\/)+man[1-9ln]\/[^\/]*\.[0-9ln]$/ {
(IMAKE_MANINSTALL == "catinstall") && /^[^@]/ && $0 ~ "^([^/]*/)+" MANPAGE_REGEX "$" {
n = split($0, components, "/")
sub("man", "cat", components[n-1])
if (CATMAN_SECTION_SUFFIX ~ /[yY][eE][sS]/) {
@@ -121,38 +121,33 @@ BEGIN {
### entries from the PLIST, and similarly for "catinstall" and catman page
### entries.
###
(MANINSTALL !~ /catinstall/) && /^[^@]/ && \
/^([^\/]*\/)+cat[1-9ln]\/[^\/]*\.[0-9ln]$/ {
(MANINSTALL !~ /catinstall/) && /^[^@]/ && $0 ~ "^([^/]*/)+" CATPAGE_REGEX "$" {
next
}
(MANINSTALL !~ /maninstall/) && /^[^@]/ && \
/^([^\/]*\/)+man[1-9ln]\/[^\/]*\.[0-9ln]$/ {
(MANINSTALL !~ /maninstall/) && /^[^@]/ && $0 ~ "^([^/]*/)+" MANPAGE_REGEX "$" {
next
}
###
### Fixup catman entries to use section suffixes if required.
###
(CATMAN_SECTION_SUFFIX ~ /[yY][eE][sS]/)&& /^[^@]/ && $0 ~ "^man/([^/]*/)?" CATPAGE_REGEX {
n = split($0, components, "/")
sub("^cat", "", components[n-1])
sub("0$", components[n-1], $0)
}
###
### Convert man/ to ${PKGMANDIR}/ for all man and catman page entries.
###
/^[^@]/ && $0 ~ "^man/([^/]*/)?" CATORMAN_REGEX {
sub("^man/", PKGMANDIR "/")
}
###
### Append ".gz" to the end of man page entries if compressed pages are
### requested.
###
(MANZ ~ /[yY][eE][sS]/) && /^[^@]/ && \
/^([^\/]*\/)+(man[1-9ln]\/[^\/]*\.[1-9ln]|cat[1-9ln]\/[^\/]*\.[0-9])$/ {
(MANZ ~ /[yY][eE][sS]/) && /^[^@]/ && $0 ~ "^([^/]*/)+" CATORMAN_REGEX "$" {
$0 = $0 ".gz"
}
###
### Convert man/ to ${PKGMANDIR}/ for all man and catman page entries.
###
/^[^@]/ && \
/^man\/([^\/]*\/)?(man[1-9ln]\/[^\/]*\.[1-9ln]|cat[1-9ln]\/[^\/]*\.[0-9])/ {
sub("^man/", PKGMANDIR "/")
}
###
### Fixup catman entries to use section suffixes if required.
###
(CATMAN_SECTION_SUFFIX ~ /[yY][eE][sS]/)&& /^[^@]/ && \
/^man\/([^\/]*\/)?(cat[1-9ln]\/[^\/]*\.[0-9])/ {
n = split($0, components, "/")
sub("^cat", "", components[n-1])
sub("0$", components[n-1], $0)
}

31
mk/plist/print-plist.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: print-plist.mk,v 1.27 2015/06/07 03:39:08 joerg Exp $
# $NetBSD: print-plist.mk,v 1.32 2016/07/25 21:57:23 wiz Exp $
###
### Automatic PLIST generation
@@ -13,15 +13,6 @@
###
_PRINT_PLIST_AWK_SUBST={
.if !defined(EMUL_PLATFORMS)
_PRINT_PLIST_AWK_SUBST+= \
gsub(/${OS_VERSION:S/./\./g}/, "$${OS_VERSION}"); \
gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); \
gsub(/${MACHINE_ARCH}/, "$${MACHINE_ARCH}"); \
gsub(/${MACHINE_GNU_ARCH}/, "$${MACHINE_GNU_ARCH}");
_PRINT_PLIST_AWK_SUBST+= \
gsub(/${LOWER_OS_VERSION:S/./\./g}/, "$${LOWER_OS_VERSION}");
.endif
_PRINT_PLIST_AWK_SUBST+= \
gsub(/${PKGNAME_NOREV}/, "$${PKGNAME}"); \
gsub(/${PKGVERSION:S/./\./g:C/nb[0-9]*$$//}/, "$${PKGVERSION}");\
@@ -53,22 +44,12 @@ _PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.scale/)
_PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.cache-1/)
.endif
# scan $PREFIX for any files/dirs modified since the package was extracted
# will emit "@exec mkdir"-statements for empty directories
# XXX will fail for data files that were copied using tar (e.g. emacs)!
# XXX should check $LOCALBASE and $X11BASE, and add @cwd statements
.if ${_USE_DESTDIR} == "no"
_PRINT_PLIST_FILES_CMD= \
${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} \! -type d -print
_PRINT_PLIST_DIRS_CMD= \
${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} -type d -print
.else
# List the content of $PREFIX and emit "@pkgdir " statements for
# empty directories.
_PRINT_PLIST_FILES_CMD= \
${FIND} ${DESTDIR}${PREFIX}/. \! -type d -print
_PRINT_PLIST_DIRS_CMD= \
${FIND} ${DESTDIR}${PREFIX}/. -type d -print
.endif
.if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS])
_PRINT_PLIST_LIBTOOLIZE_FILTER?= \
@@ -103,7 +84,7 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?= ${CAT}
.if !target(print-PLIST)
print-PLIST:
${RUN} ${ECHO} '@comment $$'NetBSD'$$'
${RUN}\
${RUN} ${ALL_ENV}; \
shlib_type=${SHLIB_TYPE:Q}; \
case $$shlib_type in \
"a.out") genlinks=1 ;; \
@@ -136,6 +117,7 @@ print-PLIST:
if ('$$genlinks') print $$0; \
next; \
} \
/^man\// { sub("\\.gz$$", ""); } \
{ print $$0; }'
${RUN}\
for i in `${_PRINT_PLIST_DIRS_CMD} \
@@ -148,7 +130,8 @@ print-PLIST:
{ sub("^${PKGINFODIR}/", "info/"); } \
{ sub("^${PKGMANDIR}/", "man/"); } \
/^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \
/^${PKGINFODIR:S|/|\\/|g}$$/ { next; }'` ; \
/^${PKGINFODIR:S|/|\\/|g}$$/ { next; } \
{ print $$0; }'` ; \
do \
if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \
${ECHO} @pkgdir $$i | ${AWK} ' \

8
mk/pthread.buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pthread.buildlink3.mk,v 1.31 2015/01/01 07:51:47 dholland Exp $
# $NetBSD: pthread.buildlink3.mk,v 1.32 2016/04/11 04:22:34 dbj Exp $
#
# The pthreads strategy for pkgsrc is to "bless" a particular pthread
# package as the Official Pthread Replacement (OPR). The following
@@ -100,7 +100,7 @@ PTHREAD_TYPE= native
. if !empty(PTHREAD_OPTS:Mnative)
PTHREAD_TYPE= none
. if !empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional)
PKG_SKIP_REASON= "${PKGNAME} requires a native pthreads implementation."
PKG_SKIP_REASON+= "${PKGNAME} requires a native pthreads implementation."
. endif
. else
PTHREAD_TYPE= none
@@ -111,7 +111,7 @@ PTHREAD_TYPE= ${_PKG_PTHREAD}
. endfor
. if ${PTHREAD_TYPE} == "none" && \
!empty(PTHREAD_OPTS:Mrequire) && empty(PTHREAD_OPTS:Moptional)
PKG_SKIP_REASON= "${PKGNAME} requires a working pthreads implementation."
PKG_SKIP_REASON+= "${PKGNAME} requires a working pthreads implementation."
. endif
. endif
.endif
@@ -138,7 +138,7 @@ BUILDLINK_LIBS.pthread= ${BUILDLINK_LIBS.${_PKG_PTHREAD}}
BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}?= ${PTHREAD_AUTO_VARS}
BUILDLINK_AUTO_VARS.pthread= ${BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}}
. else
PKG_FAIL_REASON= ${PKGNAME:Q}" needs pthreads, but "${_PKG_PTHREAD_BUILDLINK3_MK:Q}" is missing."
PKG_FAIL_REASON+= ${PKGNAME:Q}" needs pthreads, but "${_PKG_PTHREAD_BUILDLINK3_MK:Q}" is missing."
. endif
.endif

Some files were not shown because too many files have changed in this diff Show More