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

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgtools/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.108 2015/04/25 22:08:40 brook Exp $
# $NetBSD: Makefile,v 1.110 2015/08/17 08:15:40 wiz Exp $
#
COMMENT= Tools for use in the packages collection
@@ -30,6 +30,7 @@ SUBDIR+= p5-pkgsrc-Dewey
SUBDIR+= packagekit
SUBDIR+= pbulk
SUBDIR+= pbulk-base
SUBDIR+= pkg
SUBDIR+= pkg_alternatives
SUBDIR+= pkg_chk
SUBDIR+= pkg_comp
@@ -68,6 +69,5 @@ SUBDIR+= shlock
SUBDIR+= url2pkg
SUBDIR+= verifypc
SUBDIR+= x11-links
SUBDIR+= xpkgwedge
.include "../mk/misc/category.mk"

4
pkgtools/bootstrap-mk-files/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.46 2015/06/11 09:20:55 joerg Exp $
# $NetBSD: Makefile,v 1.49 2015/09/08 04:41:04 dholland Exp $
PKGNAME= bootstrap-mk-files-20150611
PKGNAME= bootstrap-mk-files-20150908
CATEGORIES= pkgtools
CONFLICTS+= mk-files-[0-9]*

6
pkgtools/bootstrap-mk-files/files/bsd.README
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.2 2009/12/30 20:46:22 abs Exp $
# $NetBSD: bsd.README,v 1.3 2015/09/08 04:41:04 dholland Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD
@@ -473,9 +473,7 @@ The include file <bsd.subdir.mk> contains the default targets for building
subdirectories. It has the same eight targets as <bsd.prog.mk>: all,
clean, cleandir, depend, includes, install, lint, and tags. For all of
the directories listed in the variable SUBDIR, the specified directory
will be visited and the target made. There is also a default target which
allows the command "make subdir" where subdir is any directory listed in
the variable SUBDIR.
will be visited and the target made.
As a special case, the use of a token .WAIT as an entry in SUBDIR acts
as a synchronization barrier when multiple make jobs are run; subdirs

2
pkgtools/bootstrap-mk-files/files/bsd.lib.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.5 2011/11/26 15:54:44 dholland Exp $
# $NetBSD: bsd.lib.mk,v 1.7 2015/07/04 12:33:36 ryoon Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if !target(__initialized__)

22
pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.lib.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Bitrig.bsd.lib.mk,v 1.1 2015/06/04 15:48:45 sevan Exp $
# $NetBSD: Bitrig.bsd.lib.mk,v 1.2 2015/09/04 11:50:47 sevan Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if !target(__initialized__)
@@ -100,26 +100,16 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
# (usually just ${CPPPICFLAGS} ${CPICFLAGS})
# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects.
# Platform-independent flags for Bitrig a.out shared libraries
SHLIB_LDSTARTFILE=
SHLIB_LDENDFILE=
SHLIB_SOVERSION=${SHLIB_FULLVERSION}
SHLIB_SHFLAGS=
FPICFLAGS ?= -fPIC
CPICFLAGS?= -fPIC -DPIC
CPPPICFLAGS?= -DPIC
CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
APICFLAGS?= -k
MKPICLIB?= yes
# Platform-independent linker flags for ELF shared libraries
.if ${OBJECT_FMT} == "ELF"
SHLIB_SOVERSION= ${SHLIB_MAJOR}
SHLIB_SHFLAGS= -Wl,-soname,lib${LIB}.so.${SHLIB_SOVERSION}
SHLIB_LDSTARTFILE?= ${DESTDIR}/usr/lib/crtbeginS.o
SHLIB_LDENDFILE?= ${DESTDIR}/usr/lib/crtendS.o
.endif
FPICFLAGS?= -fPIC
CPICFLAGS?= -fPIC -DPIC
CPPPICFLAGS?= -DPIC
CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
APICFLAGS?= -k
CFLAGS+= ${COPTS}
FFLAGS+= ${FOPTS}

6
pkgtools/bootstrap-mk-files/files/mods/Bitrig.bsd.own.mk.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Bitrig.bsd.own.mk.in,v 1.1 2015/06/04 15:48:45 sevan Exp $
# $NetBSD: Bitrig.bsd.own.mk.in,v 1.2 2015/09/07 15:07:54 sevan Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -90,11 +90,7 @@ STRIPFLAG?= -s
# OBJECT_FMT: currently either "ELF" or "a.out".
# SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries.
#
.if ${MACHINE_ARCH} == "x86_64"
OBJECT_FMT?=ELF
.else
OBJECT_FMT?=a.out
.endif
# Location of the file that contains the major and minor numbers of the
# version of a shared library. If this file exists a shared library

15
pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.lib.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Darwin.bsd.lib.mk,v 1.5 2014/11/22 16:32:13 bsiegert Exp $
# $NetBSD: Darwin.bsd.lib.mk,v 1.6 2015/08/31 09:03:19 jperkin Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if !target(__initialized__)
@@ -81,6 +81,8 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
# Data-driven table using make variables to control how shared libraries
# are built for different platforms and object formats.
# OBJECT_FMT: currently either "ELF" or "a.out", from <bsd.own.mk>
# SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
# numbers of shared library
# SHLIB_SOVERSION: version number to be compiled into a shared library
# via -soname. Usualy ${SHLIB_MAJOR} on ELF.
# NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
@@ -90,9 +92,11 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
# SHLIB_LDSTARTFILE: support .o file, call C++ file-level constructors
# SHLIB_LDENDFILE: support .o file, call C++ file-level destructors
# FPICFLAGS: flags for ${FC} to compile .[fF] files to .so objects.
# CPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS}
# CPICFLAGS: flags for ${CC} to compile .[cC] files to .so objects.
# CAPICFLAGS flags for {$CC} to compiling .[Ss] files
# CPPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS}
# CPICFLAGS: flags for ${CC} to compile .[cC] files to pic objects.
# CSHLIBFLAGS: flags for ${CC} to compile .[cC] files to .so objects.
# (usually includes ${CPICFLAGS})
# CAPICFLAGS: flags for ${CC} to compiling .[Ss] files
# (usually just ${CPPPICFLAGS} ${CPICFLAGS})
# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects.
@@ -397,8 +401,11 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
${SHLIB_LDENDFILE}
.endif
.if ${OBJECT_FMT} == "ELF"
.if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
"${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
.endif
ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
mv -f lib${LIB}.so.tmp lib${LIB}.so
.endif

65
pkgtools/bootstrap-mk-files/files/mods/Darwin.bsd.sys.mk
View File

@@ -1,65 +0,0 @@
# $NetBSD: Darwin.bsd.sys.mk,v 1.1.1.1 2006/07/14 23:13:01 jlam Exp $
#OBJCOPY?= objcopy
STRIP?= strip
CONFIG?= config
RPCGEN?= rpcgen
MKLOCALE?= mklocale
.SUFFIXES: .m .o .ln .lo
# Objective C
# (Defined here rather than in <sys.mk> because `.m' is not just
# used for Objective C source)
.m:
${LINK.m} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.m.o:
${COMPILE.m} ${.IMPSRC}
.if defined(PARALLEL) || defined(LPREFIX)
LPREFIX?=yy
LFLAGS+=-P${LPREFIX}
# Lex
.l:
${LEX.l} -o${.TARGET:R}.${LPREFIX}.c ${.IMPSRC}
${LINK.c} -o ${.TARGET} ${.TARGET:R}.${LPREFIX}.c ${LDLIBS} -ll
rm -f ${.TARGET:R}.${LPREFIX}.c
.l.c:
${LEX.l} -o${.TARGET} ${.IMPSRC}
.l.o:
${LEX.l} -o${.TARGET:R}.${LPREFIX}.c ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.${LPREFIX}.c
rm -f ${.TARGET:R}.${LPREFIX}.c
.endif
# Yacc
.if defined(YHEADER) || defined(YPREFIX)
.if defined(YPREFIX)
YFLAGS+=-p${YPREFIX}
.endif
.if defined(YHEADER)
YFLAGS+=-d
.endif
.y:
${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
${LINK.c} -o ${.TARGET} ${.TARGET:R}.tab.c ${LDLIBS}
rm -f ${.TARGET:R}.tab.c ${.TARGET:R}.tab.h
.y.h: ${.TARGET:R}.c
.y.c:
${YACC.y} -o ${.TARGET} ${.IMPSRC}
.y.o:
${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.tab.c
rm -f ${.TARGET:R}.tab.c ${TARGET:R}.tab.h
.elif defined(PARALLEL)
.y:
${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
${LINK.c} -o ${.TARGET} ${.TARGET:R}.tab.c ${LDLIBS}
rm -f ${.TARGET:R}.tab.c
.y.c:
${YACC.y} -o ${.TARGET} ${.IMPSRC}
.y.o:
${YACC.y} -b ${.TARGET:R} ${.IMPSRC}
${COMPILE.c} -o ${.TARGET} ${.TARGET:R}.tab.c
rm -f ${.TARGET:R}.tab.c
.endif

15
pkgtools/bootstrap-mk-files/files/mods/Linux.bsd.lib.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: Linux.bsd.lib.mk,v 1.3 2008/03/13 17:28:23 joerg Exp $
# $NetBSD: Linux.bsd.lib.mk,v 1.4 2015/08/31 09:03:19 jperkin Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if !target(__initialized__)
@@ -81,6 +81,8 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
# Data-driven table using make variables to control how shared libraries
# are built for different platforms and object formats.
# OBJECT_FMT: currently either "ELF" or "a.out", from <bsd.own.mk>
# SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
# numbers of shared library
# SHLIB_SOVERSION: version number to be compiled into a shared library
# via -soname. Usualy ${SHLIB_MAJOR} on ELF.
# NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
@@ -90,9 +92,11 @@ SHLIB_FULLVERSION=${SHLIB_MAJOR}
# SHLIB_LDSTARTFILE: support .o file, call C++ file-level constructors
# SHLIB_LDENDFILE: support .o file, call C++ file-level destructors
# FPICFLAGS: flags for ${FC} to compile .[fF] files to .so objects.
# CPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS}
# CPICFLAGS: flags for ${CC} to compile .[cC] files to .so objects.
# CAPICFLAGS flags for {$CC} to compiling .[Ss] files
# CPPPICFLAGS: flags for ${CPP} to preprocess .[sS] files for ${AS}
# CPICFLAGS: flags for ${CC} to compile .[cC] files to pic objects.
# CSHLIBFLAGS: flags for ${CC} to compile .[cC] files to .so objects.
# (usually includes ${CPICFLAGS})
# CAPICFLAGS: flags for ${CC} to compiling .[Ss] files
# (usually just ${CPPPICFLAGS} ${CPICFLAGS})
# APICFLAGS: flags for ${AS} to assemble .[sS] to .so objects.
@@ -388,8 +392,11 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
${SHLIB_LDENDFILE}
.endif
.if ${OBJECT_FMT} == "ELF"
.if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
"${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.${SHLIB_MAJOR}.tmp
mv -f lib${LIB}.so.${SHLIB_MAJOR}.tmp lib${LIB}.so.${SHLIB_MAJOR}
.endif
ln -sf lib${LIB}.so.${SHLIB_FULLVERSION} lib${LIB}.so.tmp
mv -f lib${LIB}.so.tmp lib${LIB}.so
.endif

31
pkgtools/bootstrap-mk-files/files/mods/Linux.sys.mk
View File

@@ -1,13 +1,13 @@
# $NetBSD: Linux.sys.mk,v 1.5 2015/06/11 09:20:56 joerg Exp $
# $NetBSD: Linux.sys.mk,v 1.6 2015/08/31 09:03:19 jperkin Exp $
# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run Unix.
unix?= We run Unix
OS?= Linux
.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
.SUFFIXES: .sh .m4
.LIBS: .a
AR?= ar
@@ -16,18 +16,34 @@ RANLIB?= ranlib
AS?= as
AFLAGS?=
.if ${MACHINE_ARCH} == "sparc64"
AFLAGS+= -Wa,-Av9a
.endif
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
CC?= gcc
DBG?= -O2
CC?= cc
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
${MACHINE_ARCH} == "arm32" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "vax"
DBG?= -O2
.elif ${MACHINE_ARCH} == "x86_64"
DBG?=
.else
DBG?= -O
.endif
CFLAGS?= ${DBG}
COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
CXX?= g++
CXX?= c++
CXXFLAGS?= ${CFLAGS}
COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
@@ -38,8 +54,7 @@ COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
CPP?= cpp
NOLINT= 1
CPPFLAGS?=
CPPFLAGS?=
FC?= f77
FFLAGS?= -O

4
pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.4 2014/05/10 23:01:26 ryoon Exp $
# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.5 2015/08/29 21:59:18 sevan Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -84,7 +84,7 @@ STRIPFLAG?= -s
# in environments where it's not possible to keep /sys publicly readable)
#SYS_INCLUDE= symlinks
# Profiling and linting is also off on the x86_64 port at the moment.
# Profiling and linting is also off on the sparc64 port at the moment.
.if ${MACHINE_ARCH} == "sparc64"
NOPROFILE=1
NOLINT=1

68
pkgtools/bootstrap-mk-files/files/mods/Darwin.sys.mk → pkgtools/bootstrap-mk-files/files/mods/QNX.sys.mk
View File

@@ -1,7 +1,7 @@
# $NetBSD: Darwin.sys.mk,v 1.2 2006/11/11 18:24:52 jschauma Exp $
# $NetBSD: QNX.sys.mk,v 1.1 2015/07/04 07:19:08 ryoon Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix= We run UNIX.
unix?= We run Unix
OS!= uname -s
.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
@@ -15,26 +15,34 @@ RANLIB?= ranlib
AS?= as
AFLAGS?=
COMPILE.s?= ${AS} ${AFLAGS}
.if ${MACHINE_ARCH} == "sparc64"
AFLAGS+= -Wa,-Av9a
.endif
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} -c -traditional-cpp
LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
.if exists(/usr/bin/gcc)
CC?= gcc
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
${MACHINE_ARCH} == "arm32" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "vax"
DBG?= -O2
.elif ${MACHINE_ARCH} == "x86_64"
DBG?=
.else
CC?= cc
DBG?= -O
.endif
DBG?= -O2
CFLAGS?= -pipe ${DBG}
CFLAGS?= ${DBG}
COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
.if exists(/usr/bin/g++)
CXX?= g++
.else
CXX?= c++
.endif
CXXFLAGS?= ${CFLAGS}
COMPILE.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c
LINK.cc?= ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
@@ -44,11 +52,8 @@ OBJCFLAGS?= ${CFLAGS}
COMPILE.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
LINK.m?= ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
CPP?= cpp
NOLINT= 1
CPPFLAGS?=
MK_DEP?= mkdeps.sh -N
CPP?= ${QNX_HOST}/usr/bin/cpp
CPPFLAGS?=
FC?= f77
FFLAGS?= -O
@@ -70,11 +75,11 @@ LD?= ld
LDFLAGS?=
LINT?= lint
LINTFLAGS?= -chapbx
LINTFLAGS?= -chapbxzF
LORDER?= lorder
LORDER?= echo
MAKE?= bmake
MAKE?= make
NM?= nm
@@ -87,10 +92,10 @@ SHELL?= sh
SIZE?= size
TSORT?= tsort -q
TSORT?= tsort -q
YACC?= yacc
YFLAGS?= -d
YFLAGS?=
YACC.y?= ${YACC} ${YFLAGS}
# C
@@ -102,22 +107,15 @@ YACC.y?= ${YACC} ${YFLAGS}
${COMPILE.c} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
rm -f $*.o
.c.ln:
${LINT} ${LINTFLAGS} ${CPPFLAGS:M-[IDU]*} -i ${.IMPSRC}
# C++
.cc:
.cc .cpp .cxx .C:
${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.cc.o:
.cc.o .cpp.o .cxx.o .C.o:
${COMPILE.cc} ${.IMPSRC}
.cc.a:
${COMPILE.cc} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
rm -f $*.o
.C:
${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.C.o:
${COMPILE.cc} ${.IMPSRC}
.C.a:
.cc.a .cpp.a .cxx.a .C.a:
${COMPILE.cc} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o
rm -f $*.o
@@ -164,7 +162,7 @@ YACC.y?= ${YACC} ${YFLAGS}
.s:
${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
.s.o:
${COMPILE.s} -o ${.TARGET} ${.IMPSRC}
${COMPILE.s} ${.IMPSRC}
.s.a:
${COMPILE.s} ${.IMPSRC}
${AR} ${ARFLAGS} $@ $*.o

3
pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.own.mk.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: SunOS.bsd.own.mk.in,v 1.1 2013/09/12 10:56:36 jperkin Exp $
# $NetBSD: SunOS.bsd.own.mk.in,v 1.2 2015/08/31 09:03:19 jperkin Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -118,6 +118,7 @@ NOPIC?=1
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68000" || \
${MACHINE_ARCH} == "arm" || \
!empty(MACHINE_ARCH:Mearm*) || \
${MACHINE} == "next68k" || \
${MACHINE} == "sun3" || \
${MACHINE} == "mvme68k" || \

21
pkgtools/bootstrap-mk-files/files/mods/SunOS.bsd.sys.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: SunOS.bsd.sys.mk,v 1.3 2015/06/04 17:11:33 ryoon Exp $
# $NetBSD: SunOS.bsd.sys.mk,v 1.4 2015/08/31 09:03:19 jperkin Exp $
#
# Overrides used for NetBSD source tree builds.
@@ -6,23 +6,20 @@
.if defined(WARNS)
.if ${WARNS} > 0
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
# XXX Delete -Wuninitialized by default for now -- the compiler doesn't
# XXX always get it right.
CFLAGS+= -Wno-uninitialized
.endif
.if ${WARNS} > 1
CFLAGS+= -Wreturn-type -Wpointer-arith
CFLAGS+=-Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings
CFLAGS+=-Wswitch -Wshadow
.endif
.if ${WARNS} > 2
CFLAGS+= -Wcast-qual -Wwrite-strings
.endif
CFLAGS+= -Wswitch -Wshadow
.endif
.if defined(WFORMAT) && defined(FORMAT_AUDIT)
.if ${WFORMAT} > 1
CFLAGS+= -Wnetbsd-format-audit -Wno-format-extra-args
CFLAGS+=-Wnetbsd-format-audit -Wno-format-extra-args
.endif
.endif
@@ -36,6 +33,10 @@ CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
LINTFLAGS+= -d ${DESTDIR}/usr/include
.endif
.if defined(AUDIT)
CPPFLAGS+= -D__AUDIT__
.endif
.if defined(MKSOFTFLOAT) && (${MKSOFTFLOAT} != "no")
COPTS+= -msoft-float
FOPTS+= -msoft-float
@@ -43,10 +44,6 @@ FOPTS+= -msoft-float
.endif # gcc
.if defined(AUDIT)
CPPFLAGS+= -D__AUDIT__
.endif
# Helpers for cross-compiling
HOST_CC?= cc
HOST_CFLAGS?= -O

34
pkgtools/bootstrap-mk-files/files/mods/SunOS.sys.mk
View File

@@ -1,13 +1,13 @@
# $NetBSD: SunOS.sys.mk,v 1.6 2013/08/30 14:47:29 jperkin Exp $
# $NetBSD: SunOS.sys.mk,v 1.7 2015/08/31 09:03:19 jperkin Exp $
# NetBSD: sys.mk,v 1.58 2000/08/22 17:38:49 bjh21 Exp
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run Unix.
OS?= SunOS.5
unix?= We run Unix
OS?= SunOS
.SUFFIXES: .out .a .ln .o .s .S .c .cc .cpp .cxx .C .F .f .r .y .l .cl .p .h
.SUFFIXES: .sh .m4
.LIBS: .a
AR?= ar
@@ -16,6 +16,9 @@ RANLIB?= ranlib
AS?= as
AFLAGS?=
.if ${MACHINE_ARCH} == "sparc64"
AFLAGS+= -Wa,-Av9a
.endif
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
COMPILE.S?= ${AS} ${AFLAGS} ${CPPFLAGS} -P
@@ -23,9 +26,20 @@ LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
# Unless told otherwise, assume GNU CC
CC?= gcc
DBG?= -O2
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm26" || \
${MACHINE_ARCH} == "arm32" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "m68k" || \
${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "vax"
DBG?= -O2
.elif ${MACHINE_ARCH} == "x86_64"
DBG?=
.else
DBG?= -O
.endif
CFLAGS?= ${DBG}
COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
@@ -47,13 +61,7 @@ CPP?= cpp
.else
CPP?= ${CC} -E
.endif
.if defined(NETBSD_COMPATIBLE)
CPPFLAGS?= -I${BSDDIR}/include -D__EXTENSIONS__ -D_XPG4_2 -DSUNOS_5
HOST_CPPFLAGS?= ${CPPFLAGS}
NOLINT=1
.else
CPPFLAGS?=
.endif
FC?= f77
FFLAGS?= -O

12
pkgtools/createbuildlink/files/createbuildlink
View File

@@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: createbuildlink,v 1.35 2010/01/13 15:27:52 wiz Exp $
# $NetBSD: createbuildlink,v 1.36 2015/07/04 16:18:39 joerg Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -39,7 +39,7 @@
# Create an initial buildlink3.mk from a package's Makefile and PLIST
#
REV=`echo '$Revision: 1.35 $' | sed 's/\\$//g'`
REV=`echo '$Revision: 1.36 $' | sed 's/\\$//g'`
tmpdir=/tmp
spacesintab=8
makefile=Makefile
@@ -90,13 +90,7 @@ PKGNAME=`@MAKE@ show-var VARNAME=PKGNAME`
PKGVER=`echo $PKGNAME | sed -e 's/^.*-//'`
PKGNOVER=`echo $PKGNAME | sed -e 's/-[^-]*$//'`
PKGUPPER=`echo $PKGNOVER | tr '[:lower:]' '[:upper:]' | tr - _`
PREFIX=X11PREFIX
USE_X11BASE=`@MAKE@ show-var VARNAME=USE_X11BASE`
if [ -z "$USE_X11BASE" ]; then
if ! grep "^USE_X11BASE" $makefile $commons > /dev/null; then
PREFIX=LOCALBASE
fi
fi
PREFIX=LOCALBASE
##
## create sed rules

6
pkgtools/cwrappers/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.12 2015/04/29 14:23:58 jperkin Exp $
# $NetBSD: Makefile,v 1.13 2015/07/07 15:00:25 jperkin Exp $
PKGNAME= cwrappers-20150318
PKGNAME= cwrappers-20150707
CATEGORIES= pkgtools sysutils
MAINTAINER= joerg@NetBSD.org
@@ -22,7 +22,7 @@ MAKE_ENV+= NEED_MI_VECTOR_HASH=1
.endif
CFLAGS.FreeBSD+= -D_WITH_GETLINE
CFLAGS.Linux+= -D_GNU_SOURCE=1
CFLAGS.Linux+= -D_GNU_SOURCE=1
do-extract:
${CP} -R ${FILESDIR}/bin ${WRKSRC}

18
pkgtools/cwrappers/files/bin/normalise-cc.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: normalise-cc.c,v 1.2 2015/04/19 14:30:07 jperkin Exp $ */
/* $NetBSD: normalise-cc.c,v 1.3 2015/07/07 15:00:25 jperkin Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -105,6 +105,10 @@ normalise_cc(struct arglist *args)
TAILQ_FOREACH_SAFE(arg, args, link, arg2) {
if (strcmp(arg->val, "-o") == 0 ||
strcmp(arg->val, "-dylib_file") == 0 ||
strcmp(arg->val, "-dylib_install_name") == 0 ||
strcmp(arg->val, "-install_name") == 0 ||
strcmp(arg->val, "-seg_addr_table_filename") == 0 ||
strcmp(arg->val, "--dynamic-linker") == 0) {
if (arg2 == NULL || arg2->val[0] == '-')
errx(255, "Missing argument for %s", arg->val);
@@ -121,11 +125,15 @@ normalise_cc(struct arglist *args)
if (len == 0)
continue;
last = next + len;
if (strncmp(last, ".so", 3) &&
strncmp(last, ".sl", 3))
if (strncmp(last, ".so", 3) == 0 ||
strncmp(last, ".sl", 3) == 0)
last += 3;
else if (strncmp(last, ".dylib", 6) == 0)
last += 6;
else
continue;
if (last[3] &&
(last[3] != '.' || last[4] < '0' || last[4] > '9'))
if (last[0] &&
(last[0] != '.' || last[1] < '0' || last[1] > '9'))
continue;
arg3 = argument_new(xasprintf("-l%*.*s", (int)len,
(int)len, next));

1831
pkgtools/libnbcompat/files/configure vendored
View File

File diff suppressed because it is too large Load Diff

3
pkgtools/libnbcompat/files/configure.ac
View File

@@ -1,4 +1,4 @@
dnl $NetBSD: configure.ac,v 1.85 2015/06/08 00:44:46 joerg Exp $
dnl $NetBSD: configure.ac,v 1.86 2015/09/01 23:17:51 kamil Exp $
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
@@ -7,6 +7,7 @@ AC_CONFIG_HEADER(nbcompat/config.h)
AC_ARG_PROGRAM
AC_CANONICAL_HOST
AC_GNU_SOURCE
CANONICAL_HOST=$host
AC_SUBST(CANONICAL_HOST)
AC_SUBST(INCLUDES)

32
pkgtools/libnbcompat/files/nbcompat/config.h.in
View File

@@ -564,6 +564,28 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
@@ -576,6 +598,16 @@
# endif
#endif
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
#define below would cause a syntax error. */

35
pkgtools/libnbcompat/files/unvis.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: unvis.c,v 1.12 2007/07/31 13:17:34 joerg Exp $ */
/* $NetBSD: unvis.c,v 1.13 2015/09/03 09:05:54 joerg Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: unvis.c,v 1.12 2007/07/31 13:17:34 joerg Exp $");
__RCSID("$NetBSD: unvis.c,v 1.13 2015/09/03 09:05:54 joerg Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -83,23 +83,11 @@ __warn_references(unvis,
#define isoctal(c) (((unsigned char)(c)) >= '0' && ((unsigned char)(c)) <= '7')
#define xtod(c) (isdigit(c) ? (c - '0') : ((tolower(c) - 'a') + 10))
int
unvis(cp, c, astate, flag)
char *cp;
int c;
int *astate, flag;
{
return __nbcompat_unvis13(cp, (int)c, astate, flag);
}
/*
* unvis - decode characters previously encoded by vis
*/
int
__nbcompat_unvis13(cp, c, astate, flag)
char *cp;
int c;
int *astate, flag;
static int
__nbcompat_unvis13(char *cp, int c, int *astate, int flag)
{
_DIAGASSERT(cp != NULL);
@@ -275,6 +263,12 @@ __nbcompat_unvis13(cp, c, astate, flag)
}
}
int
unvis(char *cp, int c, int *astate, int flag)
{
return __nbcompat_unvis13(cp, (int)c, astate, flag);
}
/*
* strunvis - decode src into dst
*
@@ -283,10 +277,7 @@ __nbcompat_unvis13(cp, c, astate, flag)
*/
int
strunvisx(dst, src, flag)
char *dst;
const char *src;
int flag;
strunvisx(char *dst, const char *src, int flag)
{
char c;
char *start = dst;
@@ -318,9 +309,7 @@ strunvisx(dst, src, flag)
}
int
strunvis(dst, src)
char *dst;
const char *src;
strunvis(char *dst, const char *src)
{
return strunvisx(dst, src, 0);
}

5
pkgtools/lintpkgsrc/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.20 2015/06/12 10:50:55 wiz Exp $
# $NetBSD: Makefile,v 1.21 2015/07/01 19:57:31 tron Exp $
PKGNAME= lintpkgsrc-4.88
PKGREVISION= 1
PKGNAME= lintpkgsrc-4.89
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users@NetBSD.org

6
pkgtools/lintpkgsrc/files/lintpkgsrc.pl
View File

@@ -1,6 +1,6 @@
#! @PERL@
# $NetBSD: lintpkgsrc.pl,v 1.5 2015/01/10 20:12:24 wiz Exp $
# $NetBSD: lintpkgsrc.pl,v 1.6 2015/07/01 19:57:31 tron Exp $
# Written by David Brownlee <abs@netbsd.org>.
#
@@ -1190,7 +1190,7 @@ sub parse_makefile_vars($$) {
# fully expand
if ( $incfile =~ m#/mk/bsd#
|| $incfile =~ /$magic_undefined/
|| $incfile =~ /\${/
|| $incfile =~ /\$\{/
|| ( !$opt{d} && $incfile =~ m#/(buildlink[^/]*\.mk)# ) )
{
debug("$file: .include \"$incfile\" skipped\n");
@@ -1307,7 +1307,7 @@ sub parse_makefile_vars($$) {
}
elsif ( $vars{$key} =~
m#\${([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)}# )
m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}# )
{
my ( $left, $subvar, $right ) = ( $`, $1, $' );
my (@patterns) = split( ':', $2 );

4
pkgtools/mksandbox/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.9 2015/04/14 08:55:07 jperkin Exp $
# $NetBSD: Makefile,v 1.10 2015/07/05 11:47:14 jperkin Exp $
PKGNAME= mksandbox-1.4
PKGNAME= mksandbox-1.5
CATEGORIES= pkgtools
MAINTAINER= agc@NetBSD.org

4
pkgtools/mksandbox/files/mksandbox
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# $NetBSD: mksandbox,v 1.7 2015/04/14 08:55:07 jperkin Exp $
# $NetBSD: mksandbox,v 1.8 2015/07/05 11:47:14 jperkin Exp $
# Copyright (c) 2002,2012 Alistair Crooks <agc@NetBSD.org>
# All rights reserved.
@@ -119,7 +119,7 @@ Linux)
fi
paxprog=""
sedprog=/bin/sed
sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos"
sandboxMountDirs="$sandboxMountDirs /lib64 /usr/lib64 /usr/kerberos /run"
sandboxWriteDirs="$sandboxWriteDirs /proc"
;;
NetBSD)

3
pkgtools/p5-pkgsrc-Dewey/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2015/06/18 06:29:18 dholland Exp $
# $NetBSD: Makefile,v 1.28 2015/08/21 07:40:39 wiz Exp $
PKGNAME= p5-pkgsrc-Dewey-1.1
PKGREVISION= 6
@@ -11,6 +11,7 @@ LICENSE= ${PERL5_LICENSE} OR 2-clause-bsd
CPPFLAGS+= -DHAVE_CTYPE_H -DHAVE_STDLIB_H -DHAVE_STRING_H
CPPFLAGS.NetBSD+= -DHAVE_ERR_H
CPPFLAGS.Linux+= -fPIC
USE_LANGUAGES= c
USE_FEATURES+= err

7
pkgtools/pbulk/MESSAGE
View File

@@ -1,7 +0,0 @@
===========================================================================
$NetBSD: MESSAGE,v 1.2 2008/02/13 21:04:10 tnn Exp $
If you are updating pbulk from earlier versions, please don't forget
to update the configuration file. Otherwise unexpected results can
occur.
===========================================================================

6
pkgtools/pbulk/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.70 2015/06/07 22:49:04 joerg Exp $
# $NetBSD: Makefile,v 1.73 2015/09/13 11:45:36 joerg Exp $
PKGNAME= pbulk-0.54
PKGNAME= pbulk-0.57
COMMENT= Modular bulk build framework
.include "../../pkgtools/pbulk/Makefile.common"
@@ -39,7 +39,7 @@ SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD ID MAIL_CMD NEATO \
CONF_FILES+= share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
PBULK_CONFIG= ${PKG_SYSCONFDIR}/pbulk.conf
PBULK_CONFIG_VERSION= 0.51
PBULK_CONFIG_VERSION= 0.53
INSTALLATION_DIRS= bin libexec/pbulk share/examples/pbulk
USE_BSD_MAKEFILE= yes

5
pkgtools/pbulk/files/pbulk/lib/event.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: event.c,v 1.6 2009/08/23 18:02:04 joerg Exp $ */
/* $NetBSD: event.c,v 1.7 2015/09/08 13:57:36 joerg Exp $ */
/*-
* Copyright (c) 2007, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -40,8 +40,7 @@
#endif
#if HAVE_POLL_H
#include <poll.h>
#endif
#if HAVE_SYS_POLL_H
#elif HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
#include <nbcompat/time.h>

15
pkgtools/pbulk/files/pbulk/pbulk.conf
View File

@@ -1,4 +1,4 @@
# $NetBSD: pbulk.conf,v 1.19 2013/01/07 14:15:35 jperkin Exp $
# $NetBSD: pbulk.conf,v 1.21 2015/09/13 11:45:37 joerg Exp $
# Version of the configuration file. This is bumped whenever the default
# config changes to notify the administrator about updates.
@@ -63,6 +63,10 @@ report_graph_script_limit=512
#
unprivileged_user=pbulk
# If yes, run the checksum phase as unprivileged user.
# Note: requires DISTDIR to be writeable for the unprivileged user.
use_unprivileged_checksum=no
# Variables used for the optional cross-compiling of packages.
#
cross_compile=no
@@ -127,3 +131,12 @@ script_phase_build=@PREFIX@/libexec/pbulk/build
script_phase_report=@PREFIX@/libexec/pbulk/report
script_phase_scan=@PREFIX@/libexec/pbulk/scan
script_phase_upload=@PREFIX@/libexec/pbulk/upload
# Arguments are buildlog and pkgname
sync_buildlog=:
# Arguments are path to the temporary package file, the package name
# and categories. The default handler just copies the file to ${packages}
# and creates the symlinks.
sync_package=default_sync_package
# PKG_SUFX as set in mk.conf
pkg_sufx=.tgz

44
pkgtools/pbulk/files/pbulk/scripts/pkg-build
View File

@@ -1,5 +1,5 @@
#!@SH@
# $NetBSD: pkg-build,v 1.25 2012/11/23 12:13:35 joerg Exp $
# $NetBSD: pkg-build,v 1.27 2015/09/13 11:45:37 joerg Exp $
#
# Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -38,6 +38,14 @@ if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then
exit 1
fi
default_sync_package() {
cp "$1" "${packages}/All/${pkgname}${pkg_sufx}"
for cat in $3; do
mkdir -p ${packages}/$cat
ln -fs ../All/${pkgname}${pkg_sufx} ${packages}/$cat/${pkgname}${pkg_sufx}
done
}
cleanup() {
if [ "$keep_wrkdir" = yes ]; then
${make} pbulk-save-wrkdir INTO=${bulklog}/${pkgname}/wrkdir.tar.gz TAR="${tar}"
@@ -51,6 +59,7 @@ cleanup() {
${tar} -czf ${bulklog}/${pkgname}/prefix.tar.gz ${cur_destdir}${prefix}
fi
${make} clean > /dev/null 2>&1 || true
${sync_buildlog} ${bulklog} ${pkgname}
exit 1
}
@@ -61,12 +70,11 @@ run_make() {
local run_cmd
run_cmd=$1
shift
${run_cmd} ${make} $1 \
${run_cmd} ${make} "$@" \
BATCH=1 \
DEPENDS_TARGET=/nonexistent \
${MAKE_FLAGS} \
WRKLOG=${bulklog}/${pkgname}/work.log
}
run_usergroup() {
@@ -95,6 +103,9 @@ while read build_info_line; do
DEPENDS=*)
dependencies=${build_info_line#DEPENDS=}
;;
CATEGORIES=*)
categories=${build_info_line#CATEGORIES=}
;;
MULTI_VERSION=*)
MAKE_FLAGS=${build_info_line#MULTI_VERSION=}
;;
@@ -109,6 +120,11 @@ while read build_info_line; do
esac
done
if [ "$use_unprivileged_checksum" != "no" ]; then
run_checksum=run_su
else
run_checksum=run_direct
fi
case "$use_destdir" in
user-destdir)
run_build=run_su
@@ -125,6 +141,7 @@ destdir)
esac
if [ `@ID@ -u` -ne 0 ]; then
run_checksum=run_direct
run_build=run_direct
run_install=run_direct
fi
@@ -178,41 +195,44 @@ if [ ! -z "$dependencies" ]; then
${pkg_add_cmd} $dependencies > ${bulklog}/${pkgname}/depends.log 2>&1
fi
# Build package, create a separate log file for each major phase
run_make run_direct checksum > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
run_make ${run_checksum} checksum > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
run_usergroup configure > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
run_make ${run_build} configure >> ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
run_usergroup build> ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
run_make ${run_build} all >> ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
run_usergroup install > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
run_make ${run_install} stage-install >> ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
run_make run_direct package > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
run_make run_direct stage-package-create > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
pkgfile=$(run_make run_direct show-var VARNAME=STAGE_PKGFILE)
# When using DESTDIR build, add the package once to test install rules.
# This is not done for potential bootstrap packages as they might already
# be installed.
if [ "${use_destdir}" != "no" ] && \
[ -z "${is_bootstrap}" ]; then
if ! ${pkg_add_cmd} ${pkgname} \
if ! ${pkg_add_cmd} ${pkgfile} \
>> ${bulklog}/${pkgname}/package.log 2>&1; then
run_make run_direct package-clean
cleanup
fi
fi
# Clean build area
${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1
# Test uninstall rules. This is not for cross-compiling as the install script
# is not run in that case anyway. This is also not done for packages marked as
# part of the bootstrap, those have the preserve flag set.
if [ "$cross_compile" = "no" ] && \
[ -z "${is_bootstrap}" ]; then
${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1
${pkg_delete} -K ${cur_pkgdb} ${pkgname} > ${bulklog}/${pkgname}/deinstall.log 2>&1 || cleanup
fi
# Comment the following out if you want to test all deinstall scripts.
# This is quite expensive and mostly redundant, so it is disabled by default.
#${pkg_delete} -r \* > /dev/null 2>&1 || true
#${pkg_delete} -r \* > /dev/null 2>&1 || cleanup
${sync_package} ${pkgfile} ${pkgname} "${categories}"
# Clean build area
${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1 || true
# Cleanup build logs on success
rm -R ${bulklog}/${pkgname}

32
pkgtools/pbulk/files/pbulk/scripts/pre-build
View File

@@ -1,5 +1,5 @@
#!@SH@
# $NetBSD: pre-build,v 1.11 2012/11/23 12:13:35 joerg Exp $
# $NetBSD: pre-build,v 1.14 2015/09/12 23:04:30 joerg Exp $
#
# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -65,8 +65,15 @@ if [ -d "${bulklog}/meta" ]; then
sleep 5
if [ "${reuse_scan_results}" = yes -a -f "${bulklog}/meta/pscan" ]; then
echo "Reusing old scan results"
rm -rf "${bulklog}.old"
mv "${bulklog}" "${bulklog}.old"
rm -rf "${bulklog}.old" 2> /dev/null || true
if [ -d "${bulklog}.old" ]; then
rm -rf "${bulklog}.old"/* || true
find "${bulklog}" -maxdepth 1 -mindepth 1 ! -name meta -exec rm -rf {} \; || true
cp -pr "${bulklog}/." "${bulklog}.old/"
rm -rf "${bulklog}"/* || true
else
mv "${bulklog}" "${bulklog}.old"
fi
else
echo "Removing old scan results"
rm -rf "${bulklog}"/* || true
@@ -82,6 +89,25 @@ mkdir -p "${bulklog}" "${loc}"
# Log common settings...
opsys=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OPSYS`
opver=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OS_VERSION`
# Check if it is an OS with variants where we would rather use the
# variant name and version rather than common name and version
case "$opsys" in
SunOS | Cygwin | SCO_SV)
opvar=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OS_VARIANT`
case "$opsys" in
Cygwin | SCO_SV)
opsys=$opvar
;;
SunOS)
if [ -n "$opvar" ]; then
opsys=$opvar
opver=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=LOWER_VARIANT_VERSION`
fi
;;
esac
;;
esac
platform=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=MACHINE_ARCH`
compiler=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=PKGSRC_COMPILER`

3
pkgtools/pkg/DESCR Normal file
View File

@@ -0,0 +1,3 @@
pkg is built on top of libpkg, a new library to interface with package
registration backends. It abstracts package management details such as
registration, remote repositories, package creation, updating, etc.

84
pkgtools/pkg/Makefile Normal file
View File

@@ -0,0 +1,84 @@
# $NetBSD: Makefile,v 1.1 2015/07/04 14:37:25 khorben Exp $
VERSION= 1.5.4
DISTNAME= ${VERSION}
PKGNAME= pkg-${VERSION}
CATEGORIES= pkgtools
MASTER_SITES= ${MASTER_SITE_GITHUB:=freebsd/pkg/archive/}
MAINTAINER= khorben@defora.org
HOMEPAGE= https://wiki.freebsd.org/pkgng
COMMENT= Package management tool for FreeBSD
LICENSE= 2-clause-bsd
WRKSRC= ${WRKDIR}/pkg-${VERSION}
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= autoconf
USE_TOOLS+= automake
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
CPPFLAGS+= -D_LOCALBASE="\"${PREFIX}\""
CPPFLAGS+= -DPORTSDIR="\"/usr/pkgsrc\""
AUTO_MKDIRS= yes
EGDIR= ${PREFIX}/share/examples/pkg
CONF_FILES+= ${EGDIR}/bash_completion.d/_pkg.bash \
${PKG_SYSCONFDIR}/bash_completion.d/_pkg.bash
CONF_FILES+= ${EGDIR}/periodic/daily/411.pkg-backup \
${PKG_SYSCONFDIR}/periodic/daily/411.pkg-backup
CONF_FILES+= ${EGDIR}/periodic/daily/490.status-pkg-changes \
${PKG_SYSCONFDIR}/periodic/daily/490.status-pkg-changes
CONF_FILES+= ${EGDIR}/periodic/security/410.pkg-audit \
${PKG_SYSCONFDIR}/periodic/security/410.pkg-audit
CONF_FILES+= ${EGDIR}/periodic/security/460.pkg-checksum \
${PKG_SYSCONFDIR}/periodic/security/460.pkg-checksum
CONF_FILES+= ${EGDIR}/periodic/weekly/400.status-pkg \
${PKG_SYSCONFDIR}/periodic/weekly/400.status-pkg
CONF_FILES+= ${EGDIR}/pkg.conf.sample \
${PKG_SYSCONFDIR}/pkg.conf
SUBST_CLASSES+= manpages-prefix
SUBST_STAGE.manpages-prefix= pre-install
SUBST_FILES.manpages-prefix= docs/pkg-install.8 docs/pkg-repo.8
SUBST_FILES.manpages-prefix+= docs/pkg-search.8 docs/pkg-update.8
SUBST_FILES.manpages-prefix+= docs/pkg-upgrade.8 docs/pkg.8
SUBST_FILES.manpages-prefix+= docs/pkg.conf.5
SUBST_SED.manpages-prefix+= -e "s|/usr/local|${PREFIX}|g"
SUBST_MESSAGE.manpages-prefix= Correct the installation prefix in manual pages.
SUBST_CLASSES+= pkgconf-prefix
SUBST_STAGE.pkgconf-prefix= pre-install
SUBST_FILES.pkgconf-prefix= src/pkg.conf.sample
SUBST_SED.pkgconf-prefix+= -e "s|/usr/local|${PREFIX}|g"
SUBST_MESSAGE.pkgconf-prefix= Correct the installation prefix in pkg.conf(5).
pre-configure:
cd ${WRKSRC} && ./autogen.sh
post-install:
${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d/_pkg.bash \
${DESTDIR}${EGDIR}/bash_completion.d/_pkg.bash
${RMDIR} ${DESTDIR}${PREFIX}/etc/bash_completion.d
${MV} ${DESTDIR}${PREFIX}/etc/periodic/daily/411.pkg-backup \
${DESTDIR}${EGDIR}/periodic/daily/411.pkg-backup
${MV} ${DESTDIR}${PREFIX}/etc/periodic/daily/490.status-pkg-changes \
${DESTDIR}${EGDIR}/periodic/daily/490.status-pkg-changes
${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily
${MV} ${DESTDIR}${PREFIX}/etc/periodic/security/410.pkg-audit \
${DESTDIR}${EGDIR}/periodic/security/410.pkg-audit
${MV} ${DESTDIR}${PREFIX}/etc/periodic/security/460.pkg-checksum \
${DESTDIR}${EGDIR}/periodic/security/460.pkg-checksum
${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/security
${MV} ${DESTDIR}${PREFIX}/etc/periodic/weekly/400.status-pkg \
${DESTDIR}${EGDIR}/periodic/weekly/400.status-pkg
${RMDIR} ${DESTDIR}${PREFIX}/etc/periodic/weekly
${MV} ${DESTDIR}${PREFIX}/etc/pkg.conf.sample \
${DESTDIR}${EGDIR}/pkg.conf.sample
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

55
pkgtools/pkg/PLIST Normal file
View File

@@ -0,0 +1,55 @@
@comment $NetBSD: PLIST,v 1.1 2015/07/04 14:37:25 khorben Exp $
include/pkg.h
lib/libpkg.la
lib/libpkg_static.la
libdata/pkgconfig/pkg.pc
man/man3/pkg_printf.3
man/man3/pkg_repos.3
man/man5/pkg-repository.5
man/man5/pkg.conf.5
man/man8/pkg-add.8
man/man8/pkg-alias.8
man/man8/pkg-annotate.8
man/man8/pkg-audit.8
man/man8/pkg-autoremove.8
man/man8/pkg-backup.8
man/man8/pkg-check.8
man/man8/pkg-clean.8
man/man8/pkg-config.8
man/man8/pkg-convert.8
man/man8/pkg-create.8
man/man8/pkg-delete.8
man/man8/pkg-fetch.8
man/man8/pkg-info.8
man/man8/pkg-install.8
man/man8/pkg-lock.8
man/man8/pkg-query.8
man/man8/pkg-register.8
man/man8/pkg-remove.8
man/man8/pkg-repo.8
man/man8/pkg-rquery.8
man/man8/pkg-search.8
man/man8/pkg-set.8
man/man8/pkg-shell.8
man/man8/pkg-shlib.8
man/man8/pkg-ssh.8
man/man8/pkg-static.8
man/man8/pkg-stats.8
man/man8/pkg-unlock.8
man/man8/pkg-update.8
man/man8/pkg-updating.8
man/man8/pkg-upgrade.8
man/man8/pkg-version.8
man/man8/pkg-which.8
man/man8/pkg.8
sbin/pkg
sbin/pkg-static
sbin/pkg2ng
share/examples/pkg/bash_completion.d/_pkg.bash
share/examples/pkg/periodic/daily/411.pkg-backup
share/examples/pkg/periodic/daily/490.status-pkg-changes
share/examples/pkg/periodic/security/410.pkg-audit
share/examples/pkg/periodic/security/460.pkg-checksum
share/examples/pkg/periodic/weekly/400.status-pkg
share/examples/pkg/pkg.conf.sample
share/zsh/site-functions/_pkg

5
pkgtools/pkg/distinfo Normal file
View File

@@ -0,0 +1,5 @@
$NetBSD: distinfo,v 1.1 2015/07/04 14:37:25 khorben Exp $
SHA1 (1.5.4.tar.gz) = 2e58510fa9b9eb97b6d9e0d62e527228601af1c1
RMD160 (1.5.4.tar.gz) = b38582e325752a329eb353212783850db6b138ea
Size (1.5.4.tar.gz) = 2937244 bytes

4
pkgtools/pkg_comp/Makefile
View File

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

17
pkgtools/pkg_comp/files/pkg_comp.8
View File

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

11
pkgtools/pkg_comp/files/pkg_comp.sh
View File

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

4
pkgtools/pkg_filecheck/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.39 2015/06/12 10:50:56 wiz Exp $
# $NetBSD: Makefile,v 1.40 2015/07/04 16:18:39 joerg Exp $
#
PKGNAME= pkg_filecheck-0.4
@@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR}
USE_TOOLS+= perl:run
USE_FEATURES= fts_open
FILES_SUBST+= X11PREFIX=${X11PREFIX:Q}
FILES_SUBST+= PKG_DBDIR=${PKG_DBDIR:Q}
CONF_FILES= ${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
${PKG_SYSCONFDIR}/pkg_filecheck.conf
@@ -27,7 +26,6 @@ SUBST_FILES.paths= builddb.pl builddb.1 pkg_filecheck.conf
SUBST_FILES.paths+= pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_SED.paths+= -e 's,@PERL5@,${PERL5},g'
SUBST_SED.paths+= -e 's,@X11PREFIX@,${X11PREFIX},g'
SUBST_SED.paths+= -e 's,@PKG_DBDIR@,${PKG_DBDIR},g'
SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_STAGE.paths= post-patch

8
pkgtools/pkg_filecheck/files/pkg_filecheck.conf
View File

@@ -1,4 +1,4 @@
# $NetBSD: pkg_filecheck.conf,v 1.3 2006/07/02 10:32:09 rillig Exp $
# $NetBSD: pkg_filecheck.conf,v 1.4 2015/07/04 16:18:39 joerg Exp $
# location of package database
dir @PKG_DBDIR@
@@ -7,12 +7,6 @@ db pkgdb.byfile.db
# installation prefix for packages
check @PREFIX@
# If not using xpkgwedge:
# xdb.byfile.db has to be created by running builddb
#db xdb.byfile.db
# installation prefix for X11-based packages
#check @X11PREFIX@
ignore @PREFIX@/etc
ignore @PREFIX@/var/scrollkeeper
ignore @PKG_DBDIR@

15
pkgtools/pkg_install/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $
# $NetBSD: Makefile,v 1.211 2015/09/07 09:06:04 jperkin Exp $
# Notes to package maintainers:
#
@@ -128,6 +128,7 @@ FILESDIR.bzip2?= ${.CURDIR}/../../archivers/bzip2/files
FILESDIR.libarchive?= ${.CURDIR}/../../archivers/libarchive/files
FILESDIR.zlib?= ${.CURDIR}/../../devel/zlib/files
FILESDIR.libfetch?= ${.CURDIR}/../../net/libfetch/files
FILESDIR.netpgpverify?= ${.CURDIR}/../../security/netpgpverify/files
.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
CPPFLAGS+= -I${WRKDIR}/bzip2
@@ -176,6 +177,10 @@ pre-configure: config-guess-override config-sub-override
.endif
CPPFLAGS+= -I${WRKDIR}/libfetch
LDFLAGS+= -L${WRKDIR}/libfetch
# Avoid duplicate and conflicting headers, pull in any we need
# directly with <netpgpgverify/*.h>
CPPFLAGS+= -I${WRKDIR}
LDFLAGS+= -L${WRKDIR}/netpgpverify
CONFIGURE_ENV+= LIBS=${LIBS:Q}
@@ -191,6 +196,7 @@ do-extract:
@${CP} -R ${FILESDIR.libarchive} ${WRKDIR}/libarchive
.endif
@${CP} -R ${FILESDIR.libfetch} ${WRKDIR}/libfetch
@${CP} -R ${FILESDIR.netpgpverify} ${WRKDIR}/netpgpverify
pre-configure:
.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
@@ -213,7 +219,12 @@ pre-configure:
${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} \
-f ${MAKE_FILE} depend all
cd ${WRKDIR}/netpgpverify && \
${SED} -e '/zlib/d' Makefile.lib.in >Makefile.in && \
${RM} -f bzlib.h zlib.h && \
${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} ./configure && \
${SETENV} ${MAKE_ENV} ${BSD_MAKE_ENV} ${MAKE_PROGRAM} \
${MAKE_FLAGS} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} all
# XXX Reverse the order that update does things since
# XXX we need pkg_delete built before we can deinstall.

4
pkgtools/pkg_install/files/add/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.29 2015/01/22 09:19:47 jperkin Exp $
# $NetBSD: Makefile.in,v 1.31 2015/09/07 09:06:04 jperkin Exp $
srcdir= @srcdir@
@@ -20,7 +20,7 @@ LDFLAGS= @LDFLAGS@ -L../lib
SSL_SUPPORT= @ssl_support@
LIBS= -linstall -larchive -lfetch
LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto
.endif

6
pkgtools/pkg_install/files/add/main.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $ */
/* $NetBSD: main.c,v 1.30 2015/07/20 13:59:44 khorben Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: main.c,v 1.29 2015/05/08 16:29:37 agc Exp $");
__RCSID("$NetBSD: main.c,v 1.30 2015/07/20 13:59:44 khorben Exp $");
/*
*
@@ -64,7 +64,7 @@ usage(void)
{
(void) fprintf(stderr, "%s\n%s\n%s\n",
"usage: pkg_add [-AfhInRuVv] [-C config] [-P destdir] [-K pkg_dbdir]",
" [-m machine] [-p prefix] [-s verification-type]",
" [-m machine] [-p prefix]",
" [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
exit(1);
}

4
pkgtools/pkg_install/files/admin/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.27 2015/01/22 09:19:47 jperkin Exp $
# $NetBSD: Makefile.in,v 1.29 2015/09/07 09:06:05 jperkin Exp $
srcdir= @srcdir@
@@ -28,7 +28,7 @@ PROG= pkg_admin
SCRIPTS= audit-packages download-vulnerability-list
.if empty(BOOTSTRAP)
LIBS= -linstall -larchive -lfetch
LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto
CFLAGS+= -DHAVE_SSL

4
pkgtools/pkg_install/files/create/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.25 2015/01/22 09:19:47 jperkin Exp $
# $NetBSD: Makefile.in,v 1.27 2015/09/07 09:06:05 jperkin Exp $
srcdir= @srcdir@
@@ -26,7 +26,7 @@ PROG= pkg_create
SSL_SUPPORT= @ssl_support@
.if empty(BOOTSTRAP)
LIBS= -linstall -larchive -lfetch @LIBS@
LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto
.endif

4
pkgtools/pkg_install/files/delete/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.22 2015/01/22 09:19:47 jperkin Exp $
# $NetBSD: Makefile.in,v 1.24 2015/09/07 09:06:05 jperkin Exp $
srcdir= @srcdir@
@@ -15,7 +15,7 @@ SSL_SUPPORT= @ssl_support@
CC= @CC@
CCLD= $(CC)
LIBS= -linstall -larchive -lfetch @LIBS@
LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto

4
pkgtools/pkg_install/files/info/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.28 2015/01/22 09:19:47 jperkin Exp $
# $NetBSD: Makefile.in,v 1.30 2015/09/07 09:06:05 jperkin Exp $
srcdir= @srcdir@
@@ -17,7 +17,7 @@ SSL_SUPPORT= @ssl_support@
CC= @CC@
CCLD= $(CC)
.if empty(BOOTSTRAP)
LIBS= -linstall -larchive -lfetch @LIBS@
LIBS= -linstall -lnetpgpverify -larchive -lbz2 -lz -lfetch @LIBS@
.if !empty(SSL_SUPPORT)
LIBS+= -lssl -lcrypto
.endif

6
pkgtools/pkg_install/files/lib/Makefile.in
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile.in,v 1.34 2013/09/12 11:03:10 jperkin Exp $
# $NetBSD: Makefile.in,v 1.35 2015/09/01 12:14:06 jperkin Exp $
srcdir= @srcdir@
@@ -27,7 +27,7 @@ INSTALL= @INSTALL@
LIB= libinstall.a
OBJS= automatic.o conflicts.o dewey.o fexec.o file.o \
gpgsig.o global.o iterate.o license.o lpkg.o opattern.o \
global.o iterate.o license.o lpkg.o opattern.o \
parse-config.o pkgdb.o plist.o remove.o \
str.o var.o version.o vulnerabilities-file.o xwrapper.o
@@ -36,7 +36,7 @@ CPPFLAGS+= -DSYSCONFDIR=\"$(sysconfdir)\"
.if !empty(BOOTSTRAP)
CPPFLAGS+= -DBOOTSTRAP
.else
OBJS+= pkg_io.o pkg_signature.o
OBJS+= gpgsig.o pkg_io.o pkg_signature.o
.endif
.if !empty(SSL_SUPPORT)

122
pkgtools/pkg_install/files/lib/gpgsig.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: gpgsig.c,v 1.3 2009/08/02 17:56:45 joerg Exp $ */
/* $NetBSD: gpgsig.c,v 1.4 2015/09/01 12:14:06 jperkin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: gpgsig.c,v 1.3 2009/08/02 17:56:45 joerg Exp $");
__RCSID("$NetBSD: gpgsig.c,v 1.4 2015/09/01 12:14:06 jperkin Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -51,105 +51,45 @@ __RCSID("$NetBSD: gpgsig.c,v 1.3 2009/08/02 17:56:45 joerg Exp $");
#endif
#include "lib.h"
static void
verify_signature(const char *input, size_t input_len, const char *keyring,
const char *detached_signature)
{
const char *argv[8], **argvp;
pid_t child;
int fd[2], status;
if (pipe(fd) == -1)
err(EXIT_FAILURE, "cannot create input pipes");
child = vfork();
if (child == -1)
err(EXIT_FAILURE, "cannot fork GPG process");
if (child == 0) {
close(fd[1]);
close(STDIN_FILENO);
if (dup2(fd[0], STDIN_FILENO) == -1) {
static const char err_msg[] =
"cannot redirect stdin of GPG process\n";
write(STDERR_FILENO, err_msg, sizeof(err_msg) - 1);
_exit(255);
}
close(fd[0]);
argvp = argv;
*argvp++ = gpg_cmd;
*argvp++ = "--verify";
if (keyring != NULL) {
*argvp++ = "--no-default-keyring";
*argvp++ = "--keyring";
*argvp++ = keyring;
}
if (detached_signature != NULL)
*argvp++ = detached_signature;
*argvp++ = "-";
*argvp = NULL;
execvp(gpg_cmd, __UNCONST(argv));
_exit(255);
}
close(fd[0]);
if (write(fd[1], input, input_len) != (ssize_t)input_len)
errx(EXIT_FAILURE, "Short read from GPG");
close(fd[1]);
waitpid(child, &status, 0);
if (status)
errx(EXIT_FAILURE, "GPG could not verify the signature");
}
#include "netpgpverify/verify.h"
int
inline_gpg_verify(const char *content, size_t len, const char *keyring)
gpg_verify(const char *content, size_t len, const char *keyring,
const char *sig, size_t sig_len)
{
verify_signature(content, len, keyring, NULL);
pgpv_t pgp;
pgpv_cursor_t cursor;
static const char hdr1[] = "-----BEGIN PGP SIGNED MESSAGE-----\n";
static const char hdr2[] = "Hash: SHA512\n\n";
ssize_t buflen;
char *buf;
return 0;
}
int
detached_gpg_verify(const char *content, size_t len,
const char *signature, size_t signature_len, const char *keyring)
{
int fd;
const char *tmpdir;
char *tempsig;
ssize_t ret;
if (gpg_cmd == NULL) {
warnx("GPG variable not set, failing signature check");
return -1;
/*
* If there is a detached signature we need to construct a format that
* netpgp can parse, otherwise use as-is.
*/
if (sig_len) {
buf = xasprintf("%s%s%s%s", hdr1, hdr2, content, sig);
buflen = strlen(buf);
} else {
buf = content;
buflen = len;
}
if ((tmpdir = getenv("TMPDIR")) == NULL)
tmpdir = "/tmp";
tempsig = xasprintf("%s/pkg_install.XXXXXX", tmpdir);
memset(&pgp, 0, sizeof(pgp));
memset(&cursor, 0, sizeof(cursor));
fd = mkstemp(tempsig);
if (fd == -1) {
warnx("Creating temporary file for GPG signature failed");
return -1;
}
if (!pgpv_read_pubring(&pgp, keyring, -1))
err(EXIT_FAILURE, "cannot read keyring");
while (signature_len) {
ret = write(fd, signature, signature_len);
if (ret == -1)
err(EXIT_FAILURE, "Write to GPG failed");
if (ret == 0)
errx(EXIT_FAILURE, "Short write to GPG");
signature_len -= ret;
signature += ret;
}
if (!pgpv_verify(&cursor, &pgp, buf, buflen))
errx(EXIT_FAILURE, "unable to verify signature: %s",
cursor.why);
verify_signature(content, len, keyring, tempsig);
pgpv_close(&pgp);
unlink(tempsig);
close(fd);
free(tempsig);
if (sig_len)
free(buf);
return 0;
}

6
pkgtools/pkg_install/files/lib/lib.h
View File

@@ -1,4 +1,4 @@
/* $NetBSD: lib.h,v 1.65 2014/12/30 15:13:21 wiz Exp $ */
/* $NetBSD: lib.h,v 1.66 2015/09/01 12:14:06 jperkin Exp $ */
/* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
@@ -400,9 +400,7 @@ int easy_pkcs7_sign(const char *, size_t, char **, size_t *, const char *,
const char *);
#endif
int inline_gpg_verify(const char *, size_t, const char *);
int detached_gpg_verify(const char *, size_t, const char *, size_t,
const char *);
int gpg_verify(const char *, size_t, const char *, const char *, size_t);
int detached_gpg_sign(const char *, size_t, char **, size_t *, const char *,
const char *);

8
pkgtools/pkg_install/files/lib/license.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: license.c,v 1.41 2015/05/08 10:37:32 wiz Exp $ */
/* $NetBSD: license.c,v 1.44 2015/09/13 11:25:52 leot Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -63,9 +63,10 @@ const char *default_acceptable_licenses =
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
"gnu-gpl-v3 gnu-lgpl-v3 "
"ibm-public-license-1.0 "
"info-zip "
"ipafont "
"isc "
"lppl-1.2 lppl-1.3c "
"lppl-1.0 lppl-1.2 lppl-1.3c "
"lucent "
"miros "
"mit "
@@ -83,10 +84,11 @@ const char *default_acceptable_licenses =
"sgi-free-software-b-v2.0 "
"sleepycat-public "
"unlicense "
"vera-ttf-license "
"w3c "
"x11 "
"zlib "
"zpl";
"zpl-2.0 zpl-2.1";
#ifdef DEBUG
static size_t hash_collisions;

8
pkgtools/pkg_install/files/lib/pkg_signature.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $ */
/* $NetBSD: pkg_signature.c,v 1.12 2015/09/01 12:14:06 jperkin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -7,7 +7,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: pkg_signature.c,v 1.11 2013/09/11 14:10:05 khorben Exp $");
__RCSID("$NetBSD: pkg_signature.c,v 1.12 2015/09/01 12:14:06 jperkin Exp $");
/*-
* Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -366,8 +366,8 @@ pkg_verify_signature(const char *archive_name, struct archive **archive,
free(state);
goto no_valid_signature;
}
has_sig = !detached_gpg_verify(hash_file, hash_len,
signature_file, signature_len, gpg_keyring_verify);
has_sig = !gpg_verify(hash_file, hash_len, gpg_keyring_verify,
signature_file, signature_len);
free(signature_file);
} else {

4
pkgtools/pkg_install/files/lib/version.h
View File

@@ -1,4 +1,4 @@
/* $NetBSD: version.h,v 1.168 2015/05/08 16:29:37 agc Exp $ */
/* $NetBSD: version.h,v 1.169 2015/09/01 12:14:06 jperkin Exp $ */
/*
* Copyright (c) 2001 Thomas Klausner. All rights reserved.
@@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
#define PKGTOOLS_VERSION 20150508
#define PKGTOOLS_VERSION 20150901
#endif /* _INST_LIB_VERSION_H_ */

11
pkgtools/pkg_install/files/lib/vulnerabilities-file.c
View File

@@ -1,4 +1,4 @@
/* $NetBSD: vulnerabilities-file.c,v 1.7 2010/06/16 23:02:49 joerg Exp $ */
/* $NetBSD: vulnerabilities-file.c,v 1.8 2015/09/01 12:14:06 jperkin Exp $ */
/*-
* Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -38,7 +38,7 @@
#if HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
__RCSID("$NetBSD: vulnerabilities-file.c,v 1.7 2010/06/16 23:02:49 joerg Exp $");
__RCSID("$NetBSD: vulnerabilities-file.c,v 1.8 2015/09/01 12:14:06 jperkin Exp $");
#if HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -110,12 +110,7 @@ verify_signature_pkcs7(const char *input)
static void
verify_signature(const char *input, size_t input_len)
{
if (gpg_cmd == NULL && certs_pkg_vulnerabilities == NULL)
errx(EXIT_FAILURE,
"At least GPG or CERTIFICATE_ANCHOR_PKGVULN "
"must be configured");
if (gpg_cmd != NULL)
inline_gpg_verify(input, input_len, gpg_keyring_pkgvuln);
gpg_verify(input, input_len, gpg_keyring_pkgvuln, NULL, 0);
if (certs_pkg_vulnerabilities != NULL)
verify_signature_pkcs7(input);
}

4
pkgtools/pkg_select/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.20 2014/10/09 14:06:50 wiz Exp $
# $NetBSD: Makefile,v 1.22 2015/08/18 07:31:16 wiz Exp $
#
DISTNAME= pkg_select-20090308
PKGREVISION= 3
PKGREVISION= 5
CATEGORIES= pkgtools
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/

12
pkgtools/pkgdepgraph/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:56 wiz Exp $
# $NetBSD: Makefile,v 1.38 2015/07/10 17:01:16 dholland Exp $
#
PKGNAME= pkgdepgraph-2.8
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= pkgtools devel
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -21,10 +21,6 @@ DISTVER= ${PKGVERSION_NOREV}
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
USE_TOOLS+= nroff
.endif
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
do-extract:
@@ -48,10 +44,6 @@ do-build:
< ${WRKSRC}/${file}.in \
> ${WRKSRC}/${file}
.endfor
.if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
# the pre-generated man-pages are 'mandoc'; these OS need 'man'
nroff -man ${WRKSRC}/pkgdepgraph.1 > ${WRKSRC}/pkgdepgraph.0
.endif
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph

9
pkgtools/pkgdiff/Makefile
View File

@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.87 2015/06/12 10:50:56 wiz Exp $
# $NetBSD: Makefile,v 1.89 2015/09/15 08:36:07 wiz Exp $
PKGNAME= pkgdiff-1.6
PKGREVISION= 1
PKGNAME= pkgdiff-1.7
CATEGORIES= pkgtools devel
MAINTAINER= wiz@NetBSD.org
@@ -39,11 +38,13 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/cat1
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.endif
PKGDIFF_MAKE?= ${MAKE}
do-build:
.for f in mkpatches patchdiff
${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-e 's|@PERL5@|${PERL5}|g' \
-e 's|@MAKE@|${MAKE}|g' \
-e 's|@MAKE@|${PKGDIFF_MAKE}|g' \
< ${FILESDIR}/${f}.pl \
> ${WRKSRC}/${f}
.endfor

28
pkgtools/pkgdiff/files/mkpatches.pl
View File

@@ -1,6 +1,6 @@
#!@PERL5@
#
# $NetBSD: mkpatches.pl,v 1.19 2015/02/03 22:50:27 abs Exp $
# $NetBSD: mkpatches.pl,v 1.20 2015/09/15 08:36:07 wiz Exp $
#
# mkpatches: creates a set of patches patch-aa, patch-ab, ...
# in work/.newpatches by looking for *.orig files in and below
@@ -13,7 +13,7 @@
# It retains the naming and header (RCS Id and comment) from the
# patches directory.
#
# Copyright (c) 2000, 2011 by Thomas Klausner <wiz@NetBSD.org>
# Copyright (c) 2000, 2011, 2015 by Thomas Klausner <wiz@NetBSD.org>
# 2004 by Dieter Baron <dillo@NetBSD.org>
# All rights reserved.
#
@@ -61,6 +61,18 @@ sub create_patchdir {
}
}
sub get_variable {
my ($variable) = shift;
my ($value);
$value = `@MAKE@ show-var VARNAME=$variable`;
if (${^CHILD_ERROR_NATIVE} == 0) {
chomp($value);
return $value;
}
die("error executing \"make show-var VARNAME=$variable\": returned with exit code " . (${^CHILD_ERROR_NATIVE} >> 8));
}
# read command line arguments
undef($opt_c);
@@ -95,15 +107,9 @@ if ($opt_d && $opt_D) {
# get some pkgsrc variables
$wrksrc=`@MAKE@ show-var VARNAME=WRKSRC` or
die ("can't find WRKSRC -- wrong dir?");
chomp($wrksrc);
$wrkdir=`@MAKE@ show-var VARNAME=WRKDIR` or
die ("can't find WRKDIR -- wrong dir?");
chomp($wrkdir);
$origpatchdir=`@MAKE@ show-var VARNAME=PATCHDIR` or
die ("can't find PATCHDIR -- wrong dir?");
chomp($origpatchdir);
$wrksrc = get_variable("WRKSRC");
$wrkdir = get_variable("WRKDIR");
$origpatchdir = get_variable("PATCHDIR");
if ($opt_D) {
$patchdir = "$wrkdir/.newpatches";

11
pkgtools/pkgin/Makefile
View File

@@ -1,11 +1,10 @@
# $NetBSD: Makefile,v 1.53 2015/04/06 08:17:36 adam Exp $
# $NetBSD: Makefile,v 1.60 2015/09/04 19:37:13 jperkin Exp $
GHCOMMIT= 2e1630265953c9c01836a4b62acfa8397579346a
GHCOMMIT= b08581b094980b6fc32beb304b8d3dda0689cc82
DISTNAME= ${GHCOMMIT}
PKGNAME= pkgin-0.8.0
PKGREVISION= 1
PKGNAME= pkgin-0.9.3
CATEGORIES= pkgtools
MASTER_SITES= https://github.com/NetBSDfr/pkgin/archive/
MASTER_SITES= ${MASTER_SITE_GITHUB:=NetBSDfr/pkgin/archive/}
MAINTAINER= imil@NetBSD.org
HOMEPAGE= http://pkgin.net/
@@ -24,6 +23,8 @@ WRKSRC= ${WRKDIR}/pkgin-${GHCOMMIT}
BUILD_DEFS+= PKGIN_REPOSITORY_URL
BUILD_DEFS+= VARBASE
OWN_DIRS+= ${VARBASE}/db/pkgin
SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
SUBST_MESSAGE.path= Adjusting path.

9
pkgtools/pkgin/distinfo
View File

@@ -1,6 +1,5 @@
$NetBSD: distinfo,v 1.35 2015/03/25 02:10:01 rodent Exp $
$NetBSD: distinfo,v 1.40 2015/08/18 19:31:29 jperkin Exp $
SHA1 (2e1630265953c9c01836a4b62acfa8397579346a.tar.gz) = 7c2256c6d3da3913735876ee98349714a3d3dd2e
RMD160 (2e1630265953c9c01836a4b62acfa8397579346a.tar.gz) = c458ec864925694790cb6202acc4c042d437b401
Size (2e1630265953c9c01836a4b62acfa8397579346a.tar.gz) = 197231 bytes
SHA1 (patch-external_progressmeter.h) = 76c272c68eab4769d02e21748037933e5cea6c38
SHA1 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = f9bdb53a6e404b83a8c5d4f7e54ceb3d1de8c786
RMD160 (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 42f2903fd180cb6ef43f331cdbaf530ba8f479b9
Size (b08581b094980b6fc32beb304b8d3dda0689cc82.tar.gz) = 198425 bytes

15
pkgtools/pkgin/patches/patch-external_progressmeter.h
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-external_progressmeter.h,v 1.1 2015/03/25 02:10:02 rodent Exp $
Including sys/termios.h on FreeBSD throws a warning and breaks the build.
--- external/progressmeter.h.orig 2015-03-08 17:49:37.000000000 +0000
+++ external/progressmeter.h
@@ -26,7 +26,7 @@
#include "config.h"
-#ifdef HAVE_SYS_TERMIOS_H
+#if defined(HAVE_SYS_TERMIOS_H) && !defined(__FreeBSD__)
#include <sys/termios.h>
#elif HAVE_TERMIOS_H
#include <termios.h>

4
pkgtools/pkglint/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.463 2015/06/14 18:18:34 wiz Exp $
# $NetBSD: Makefile,v 1.464 2015/07/03 09:52:04 abs Exp $
PKGNAME= pkglint-4.155
PKGNAME= pkglint-4.156
CATEGORIES= pkgtools
OWNER= wiz@NetBSD.org

8
pkgtools/pkglint/files/makevars.map
View File

@@ -1,4 +1,4 @@
# $NetBSD: makevars.map,v 1.264 2015/05/03 15:20:24 bsiegert Exp $
# $NetBSD: makevars.map,v 1.267 2015/07/04 16:18:39 joerg Exp $
#
# This file contains the guessed type of some variables, according to
@@ -484,11 +484,11 @@ MASTER_SITE_MOZILLA_ESR List of FetchURL [$system]
MASTER_SITE_MYSQL List of FetchURL [$system]
MASTER_SITE_NETLIB List of FetchURL [$system]
MASTER_SITE_OPENOFFICE List of FetchURL [$system]
MASTER_SITE_OSDN List of FetchURL [$system]
MASTER_SITE_PERL_CPAN List of FetchURL [$system]
MASTER_SITE_R_CRAN List of FetchURL [$system]
MASTER_SITE_RUBYGEMS List of FetchURL [$system]
MASTER_SITE_SOURCEFORGE List of FetchURL [$system]
MASTER_SITE_SOURCEFORGE_JP List of FetchURL [$system]
MASTER_SITE_SUNSITE List of FetchURL [$system]
MASTER_SITE_SUSE List of FetchURL [$system]
MASTER_SITE_TEX_CTAN List of FetchURL [$system]
@@ -745,7 +745,7 @@ USE_GNU_CONFIGURE_HOST YesNo [$package]
USE_GNU_ICONV Yes [m:s,c:s,o:s]
USE_IMAKE Yes [m:s]
USE_JAVA { run yes build } [$package]
USE_JAVA2 { YES yes no 1.4 1.5 6 7 } [$package]
USE_JAVA2 { YES yes no 1.4 1.5 6 7 8 } [$package]
USE_LANGUAGES List of { ada c c99 c++ fortran fortran77 java objc } [m:s,c:s,o:s]
USE_LIBTOOL Yes [$package]
USE_MAKEINFO Yes [$package]
@@ -757,7 +757,6 @@ USE_PKGLOCALEDIR YesNo [$package]
USE_PKGSRC_GCC Yes [$user]
USE_TOOLS List of Tool [*:a]
USE_X11 Yes [$package]
USE_X11BASE Yes [$package]
WARNING_MSG ShellCommand [$system]
WARNING_CAT ShellCommand [$system]
WRAPPER_REORDER_CMDS List of WrapperReorder [b:a,c:a,m:a]
@@ -765,6 +764,5 @@ WRAPPER_TRANSFORM_CMDS List of WrapperTransform [b:a,c:a,m:a]
WRKDIR Pathname [$system]
WRKSRC WrkdirSubdirectory [$package]
X11_PKGSRCDIR.* Pathname [$system]
X11PREFIX Pathname [$system]
XAW_TYPE { 3d neXtaw standard xpm } [$user]
XMKMF_FLAGS List of ShellWord

4
pkgtools/url2pkg/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.79 2015/06/17 11:59:58 wiz Exp $
# $NetBSD: Makefile,v 1.80 2015/07/15 19:01:44 wiz Exp $
PKGNAME= url2pkg-2.23
PKGNAME= url2pkg-2.24
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users@NetBSD.org

4
pkgtools/url2pkg/files/url2pkg.pl
View File

@@ -1,5 +1,5 @@
#! @PERL@
# $NetBSD: url2pkg.pl,v 1.29 2015/06/17 11:59:58 wiz Exp $
# $NetBSD: url2pkg.pl,v 1.30 2015/07/15 19:01:44 wiz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -331,7 +331,7 @@ sub generate_initial_package($) {
$distfile = "$4$5";
$found = true;
} else {
die("$0: ERROR: Invalid GitHub URL: ${url}\n");
print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n");
}
} else {
$gh_project = ""; $gh_release = ""; $dist_subdir = "";

4
pkgtools/x11-links/Makefile
View File

@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.163 2015/05/05 07:51:43 wiz Exp $
# $NetBSD: Makefile,v 1.167 2015/09/13 12:27:42 bouyer Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
# usually the most recent.
PKGNAME= x11-links-0.94
PKGNAME= x11-links-0.98
CATEGORIES= pkgtools x11
MAINTAINER= pkgsrc-users@NetBSD.org

6
pkgtools/x11-links/files/xorg.freetype2
View File

@@ -1,4 +1,4 @@
# $NetBSD: xorg.freetype2,v 1.17 2015/03/12 14:46:09 ryoon Exp $
# $NetBSD: xorg.freetype2,v 1.20 2015/07/31 08:51:31 jperkin Exp $
#
bin/freetype-config
include/freetype2/config/ftconfig.h
@@ -7,6 +7,8 @@ include/freetype2/config/ftmodule.h
include/freetype2/config/ftoption.h
include/freetype2/config/ftstdlib.h
include/freetype2/freetype.h
include/freetype2/freetype/config/ftconfig-32.h
include/freetype2/freetype/config/ftconfig-64.h
include/freetype2/freetype/config/ftconfig.h
include/freetype2/freetype/config/ftheader.h
include/freetype2/freetype/config/ftmodule.h
@@ -68,6 +70,7 @@ include/freetype2/ftchapters.h
include/freetype2/ftcid.h
include/freetype2/fterrdef.h
include/freetype2/fterrors.h
include/freetype2/ftfntfmt.h
include/freetype2/ftgasp.h
include/freetype2/ftglyph.h
include/freetype2/ftgxval.h
@@ -112,6 +115,7 @@ lib/libfreetype.so.17.0
lib/libfreetype.so.17.2.11
lib/libfreetype.so.17.4.11
lib/libfreetype.so.18.0
lib/libfreetype.so.18.0.12
lib/libfreetype.so.18.1
lib/libfreetype.so.18.3
lib/libfreetype.so.20.0

3
pkgtools/x11-links/files/xorg.libX11
View File

@@ -1,4 +1,4 @@
# $NetBSD: xorg.libX11,v 1.14 2014/05/03 21:31:10 ryoon Exp $
# $NetBSD: xorg.libX11,v 1.15 2015/08/12 11:34:00 szptvlfn Exp $
#
include/X11/ImUtil.h
include/X11/XKBlib.h
@@ -16,6 +16,7 @@ include/X11/Xutil.h
include/X11/cursorfont.h
lib/libX11-xcb.1.0.0.dylib
lib/libX11-xcb.1.dylib
lib/libX11-xcb.a
lib/libX11-xcb.dylib
lib/libX11-xcb.la
lib/libX11-xcb.so

3
pkgtools/x11-links/files/xorg.libXrandr
View File

@@ -1,4 +1,4 @@
# $NetBSD: xorg.libXrandr,v 1.10 2014/05/03 21:31:10 ryoon Exp $
# $NetBSD: xorg.libXrandr,v 1.11 2015/07/21 12:51:42 ryoon Exp $
#
include/X11/extensions/Xrandr.h
lib/libXrandr.2.2.0.dylib
@@ -14,6 +14,7 @@ lib/libXrandr.so.2.1
lib/libXrandr.so.3
lib/libXrandr.so.3.0
lib/libXrandr.so.3.1
lib/libXrandr.so.3.2
lib/libXrandr.so.6.1
lib/libXrandr.so.6.2
lib/libXrandr.so.7.0

5
pkgtools/x11-links/files/xorg.libdrm
View File

@@ -1,6 +1,7 @@
# $NetBSD: xorg.libdrm,v 1.8 2014/05/03 21:31:10 ryoon Exp $
# $NetBSD: xorg.libdrm,v 1.10 2015/09/13 12:27:42 bouyer Exp $
#
include/libdrm/drm.h
include/libdrm/drm_fourcc.h
include/libdrm/drm_mode.h
include/libdrm/drm_sarea.h
include/libdrm/i915_drm.h
@@ -16,6 +17,7 @@ include/libdrm/radeon_cs.h
include/libdrm/radeon_cs_gem.h
include/libdrm/radeon_cs_int.h
include/libdrm/radeon_drm.h
include/libdrm/radeon_surface.h
include/libdrm/savage_drm.h
include/libdrm/sis_drm.h
include/libdrm/via_drm.h
@@ -39,6 +41,7 @@ lib/libdrm_intel.a
lib/libdrm_intel.so
lib/libdrm_intel.so.0
lib/libdrm_intel.so.0.0
lib/libdrm_intel.so.0.1
lib/libdrm_intel.so.1.3
lib/libdrm_intel.so.3.1
lib/libdrm_radeon.a

55
pkgtools/xpkgwedge/DEINSTALL
View File

@@ -1,55 +0,0 @@
# $NetBSD: DEINSTALL,v 1.9 2004/04/30 19:44:21 tv Exp $
FONT_PROGS="@FONT_PROGS@"
X11BASE=@X11BASE@
X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
case ${STAGE} in
VIEW-DEINSTALL)
${ECHO_N} "Removing font program symlinks from view..."
for prog in ${FONT_PROGS}; do
if [ -f ${PKG_PREFIX}/bin/$prog -a \
${PKG_PREFIX} != ${X11BASE} ]; then
${RM} -f ${PKG_PREFIX}/bin/$prog
fi
done
${ECHO} "done."
${ECHO_N} "Updating ${HOSTDEF}..."
${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
( ${GREP} -v xpkgwedge ${HOSTDEF}.bak || ${TRUE} ) > ${HOSTDEF}
${RM} -f ${HOSTDEF}.bak
if [ ${PKG_PREFIX} != ${X11BASE} -a -f ${X11_HOSTDEF} ] && \
${CMP} -s ${X11_HOSTDEF} ${HOSTDEF}; then
${RM} -f ${HOSTDEF}
fi
case `uname`:${X11BASE} in
*:*openwin)
${RM} -f ${SITEDEF} ${SV4LIB}
;;
Interix:/usr/X11R6)
${RM} -f ${SITEDEF}
;;
esac
${ECHO} "done."
;;
DEINSTALL)
${ECHO_N} "Removing font program symlinks..."
for prog in ${FONT_PROGS}; do
if [ -f ${PKG_PREFIX}/bin/$prog -a \
${PKG_PREFIX} != ${X11BASE} ]; then
${RM} -f ${PKG_PREFIX}/bin/$prog
fi
done
${ECHO} "done."
;;
POST-DEINSTALL)
${RMDIR} -p ${PKG_PREFIX}/lib/X11/config 2>/dev/null || ${TRUE}
;;
esac

8
pkgtools/xpkgwedge/DESCR
View File

@@ -1,8 +0,0 @@
Xpkgwedge, not a "real" program in the traditional sense, is a hack that
allows users to compile X11 pkgs from pkgsrc and install them outside of
the X11 tree - even if they use imake - by using pkgxmkmf.
Pkgxmkmf is a slightly modified xmkmf from the X11R6.3 release and supports
finding config files in ${LOCALBASE}/lib/X11/config, if it exists, and in
${X11BASE}/lib/X11/config. In all other respects, it is identical to xmkmf.
Please refer to xmkmf(1) for more information.

63
pkgtools/xpkgwedge/INSTALL
View File

@@ -1,63 +0,0 @@
# $NetBSD: INSTALL,v 1.11 2004/04/30 19:44:21 tv Exp $
FONT_PROGS="@FONT_PROGS@"
X11BASE=@X11BASE@
X11_HOSTDEF=${X11BASE}/lib/X11/config/host.def
HOSTDEF=${PKG_PREFIX}/lib/X11/config/host.def
X11_SITEDEF=${X11BASE}/lib/X11/config/site.def
SITEDEF=${PKG_PREFIX}/lib/X11/config/site.def
X11_SV4LIB=${X11BASE}/lib/X11/config/sv4Lib.tmpl
SV4LIB=${PKG_PREFIX}/lib/X11/config/sv4Lib.tmpl
SV4LIB_SUBST_SED="-e s/^ / /"
SITEDEF_SUBST_SED="-e s/\#endif.*VendorCF.*/\#include <host.def>\\
&/"
case ${STAGE} in
POST-INSTALL)
${ECHO_N} "Symlinking font programs..."
for prog in ${FONT_PROGS}; do
if [ -f ${X11BASE}/bin/$prog -a \
${PKG_PREFIX} != ${X11BASE} ]; then
${LN} -fs ${X11BASE}/bin/$prog \
${PKG_PREFIX}/bin/$prog
fi
done
${ECHO} "done."
;;
VIEW-INSTALL)
if [ ${PKG_PREFIX} = ${X11BASE} -o -s ${HOSTDEF} ]; then
${ECHO_N} "Updating ${HOSTDEF}..."
${CP} -f ${HOSTDEF} ${HOSTDEF}.bak
else
${ECHO_N} "Creating ${HOSTDEF}..."
if [ -f ${X11_HOSTDEF} ]; then
${CP} -f ${X11_HOSTDEF} ${HOSTDEF}.bak
else
${CP} -f /dev/null ${HOSTDEF}.bak
fi
fi
( ${ECHO} '#include <xpkgwedge.def>'; \
${GREP} -v xpkgwedge ${HOSTDEF}.bak; \
) > ${HOSTDEF}
${RM} -f ${HOSTDEF}.bak
${ECHO} "done."
case `uname`:${X11BASE} in
*:*openwin)
${ECHO_N} "Patching OpenWindows templates..."
${SED} "${SITEDEF_SUBST_SED}" ${X11_SITEDEF} > ${SITEDEF}
${SED} "${SV4LIB_SUBST_SED}" ${X11_SV4LIB} > ${SV4LIB}
${ECHO} "done."
;;
Interix:/usr/X11R6)
${ECHO_N} "Patching Interix templates..."
${SED} -e "1i\\
#include <host.def>
" -e "/CcCmd/d;/ProjectRoot/d" ${X11_SITEDEF} > ${SITEDEF}
${ECHO} "done."
;;
esac
;;
esac

23
pkgtools/xpkgwedge/MESSAGE
View File

@@ -1,23 +0,0 @@
===========================================================================
$NetBSD: MESSAGE,v 1.3 2003/10/19 07:16:33 grant Exp $
NOTES:
* You MUST set the environment variable XAPPLRESDIR in /etc/profile and
/etc/csh.login by hand in order to make pkgs built with xpkgwedge run
properly, e.g.
XAPPLRESDIR=${PREFIX}/lib/X11/app-defaults
export XAPPLRESDIR
and
setenv XAPPLRESDIR ${PREFIX}/lib/X11/app-defaults
respectively.
If any users set XAPPLRESDIR in their own environment, these settings
will not work -- such users need to set XUSERFILESEARCHPATH (syntax
can be found in XtResolvePathname(3Xt)).
===========================================================================

110
pkgtools/xpkgwedge/Makefile
View File

@@ -1,110 +0,0 @@
# $NetBSD: Makefile,v 1.83 2014/10/09 14:06:51 wiz Exp $
PKGNAME= xpkgwedge-1.17
CATEGORIES= pkgtools devel x11
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
COMMENT= Allows X11 pkgs to be built and used outside of $${X11BASE}
LICENSE= original-bsd
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # empty
NO_BUILD= yes
NO_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
USE_TOOLS+= imake:run xmkmf:run
.if ${LOCALBASE} == ${X11BASE}
PKG_FAIL_REASON+= "xpkgwedge is not needed when X11BASE is LOCALBASE"
.endif
.if exists(${X11BASE}/bin/mkfontscale)
CONFLICTS+= mkfontscale-[0-9]*
.endif
INSTALLATION_DIRS= bin lib/X11/config
# FONT_PROGS are symlinked from ${X11BASE}/bin to ${PREFIX}/bin to allow
# ${PREFIX}/bin/${prog} to always work.
#
FONT_PROGS= bdftopcf fstobdf mkfontdir mkfontscale
FILES_SUBST+= VIEWBASE=${VIEWBASE}
FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q}
FILES_SUBST+= MAKE=${IMAKE_MAKE:Q}
USE_TOOLS+= ${IMAKE_TOOLS}
PLIST_VARS+= Darwin IRIX IRIX5 IRIX6
.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
APPLY_DARWIN_PATCH= ${TRUE}
PLIST.Darwin= yes
USE_TOOLS+= patch
.else
APPLY_DARWIN_PATCH= ${FALSE}
.endif
.if ${OPSYS} == "IRIX"
PLIST.IRIX= yes
USE_TOOLS+= patch
. if !empty(OS_VERSION:M6*)
PLIST.IRIX6= yes
. else
PLIST.IRIX5= yes
. endif
.endif
.include "../../mk/x11.buildlink3.mk"
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKDIR}/pkgxmkmf
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},g'
SUBST_SED.paths+= -e 's,@VIEWBASE@,${VIEWBASE},g'
SUBST_SED.paths+= -e 's,@MAKE@,${IMAKE_MAKE},g'
SUBST_STAGE.paths= post-patch
post-extract:
@${CP} ${FILESDIR}/xpkgwedge.def ${WRKSRC}
@${CP} ${FILESDIR}/pkgxmkmf.in ${WRKDIR}/pkgxmkmf
.if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
X11TYPEFLAGS?= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= xpkgwedge.def
SUBST_SED.fix= -e "s|@X11TYPEFLAGS@|${X11TYPEFLAGS}|"
.else # X11_TYPE == xorg.
SUBST_CLASSES+= foo
SUBST_STAGE.foo= post-patch
SUBST_FILES.foo= xpkgwedge.def
SUBST_SED.foo= -e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||"
.endif # X11_TYPE == native.
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/X11/config
${INSTALL_DATA} ${WRKSRC}/xpkgwedge.def ${DESTDIR}${PREFIX}/lib/X11/config
${INSTALL_SCRIPT} ${WRKSRC}/pkgxmkmf ${DESTDIR}${PREFIX}/bin/pkgxmkmf
@case ${OPSYS} in \
Darwin) \
if ${APPLY_DARWIN_PATCH}; then \
${INSTALL_DATA} ${X11BASE}/lib/X11/config/darwin.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/darwin.cf.patch; \
fi; \
;; \
IRIX) \
${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgi.cf ${DESTDIR}${PREFIX}/lib/X11/config; \
if [ ${OS_VERSION} -ge 6 ]; then \
${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \
else \
${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${DESTDIR}${PREFIX}/lib/X11/config; \
cd ${DESTDIR}${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \
fi; \
;; \
esac
.include "../../mk/bsd.pkg.mk"

7
pkgtools/xpkgwedge/PLIST
View File

@@ -1,7 +0,0 @@
@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $
bin/pkgxmkmf
lib/X11/config/xpkgwedge.def
${PLIST.Darwin}lib/X11/config/darwin.cf
${PLIST.IRIX}lib/X11/config/sgi.cf
${PLIST.IRIX5}lib/X11/config/sgiLib.rules
${PLIST.IRIX6}lib/X11/config/X11.rules

13
pkgtools/xpkgwedge/files/darwin.cf.patch
View File

@@ -1,13 +0,0 @@
$NetBSD: darwin.cf.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
--- darwin.cf.orig 2005-12-04 20:52:30.000000000 +0100
+++ darwin.cf 2005-12-04 20:51:38.000000000 +0100
@@ -289,6 +289,8 @@
# undef ServerExtraDefines
# define ServerExtraDefines XFree86ServerDefines -UX_BYTE_ORDER -DROOTLESS -DDDXTIME
+#ifndef InstallFlags
#define InstallFlags -c -o root -g wheel
+#endif
#endif /* XAppleServer */

102
pkgtools/xpkgwedge/files/irix5.patch
View File

@@ -1,102 +0,0 @@
$NetBSD: irix5.patch,v 1.3 2006/09/10 13:44:58 schwarz Exp $
--- sgi.cf.orig 2006-09-09 17:13:25.000000000 +0200
+++ sgi.cf 2006-09-10 10:15:18.000000000 +0200
@@ -178,8 +178,10 @@
#define AsCmd $(TOOLROOT)/usr/bin/as
#define CcCmd $(TOOLROOT)/usr/bin/cc
#ifdef UseInstalled
+#ifndef InstallCmd
#define InstallCmd bsdinst
#endif
+#endif
#ifndef LdCmd
#define LdCmd $(TOOLROOT)/usr/bin/ld
#endif
@@ -188,12 +190,14 @@
* Actually, it doesn't matter what MakeCmd is, since we don't use it.
* We assume that $(MAKE) gets set for us by make.
*/
-#define MakeCmd $(TOOLROOT)/bin/make
+/*#define MakeCmd $(TOOLROOT)/bin/make */
#define TroffCmd psroff -t
#define StandardIncludes -nostdinc -I$(ROOT)/usr/include
+#ifndef ExtraLibraries
#define ExtraLibraries /**/
+#endif
/*
* If we specify -nostdlib, we must supply the complete library
@@ -252,23 +256,19 @@
#define ManSuffix 1
#define LibManSuffix 3
-#undef ManDir
-#undef LibmanDir
-#define ManDir $(CATMAN1DIR)$(MANPACKAGE)
-#define LibmanDir $(CATMAN3DIR)$(MANPACKAGE)
#define NroffManDir $(MAN1DIR)$(MANPACKAGE)
#define NroffLibmanDir $(MAN3DIR)$(MANPACKAGE)
#ifdef UseInstalled
- MANUSR = /usr/share/local
+ MANUSR = ManUsr
#else
MANUSR = /usr/share
#endif
- CATMAN1DIR = $(MANUSR)/catman/u_man/cat1
- CATMAN3DIR = $(MANUSR)/catman/p_man/cat3
- MAN1DIR = $(MANUSR)/man/u_man/man1
- MAN3DIR = $(MANUSR)/man/p_man/man3
+ CATMAN1DIR = $(MANUSR)/tman/cat1
+ CATMAN3DIR = $(MANUSR)/tman/cat3
+ MAN1DIR = $(MANUSR)/man/man1
+ MAN3DIR = $(MANUSR)/man/man3
/*
* MANPACKAGE is the directory inside of cat? or man? that man pages should
@@ -281,22 +281,22 @@
* InstallManPageLong - misc changes for sgi.
*/
#define InstallManPageLong(file,destdir,dest) @@\
-file.nr.z : file.man @@\
+file.nr.gz : file.man @@\
@if [ -f file.man ]; then \ @@\
- $(RM) file.nr file.nr.z && \ @@\
+ $(RM) file.nr file.nr.gz && \ @@\
tbl file.man | eqn | nroff -man - > file.nr && \ @@\
- pack -f file.nr; \ @@\
+ $(GZIP_CMD) file.nr; \ @@\
fi @@\
@@\
-install.man:: file.nr.z @@\
+install.man:: file.nr.gz @@\
MakeDir($(DESTDIR)destdir); \ @@\
if [ -f file.man ]; then \ @@\
$(INSTALL) -c $(INSTMANFLAGS) \ @@\
- file.nr.z $(DESTDIR)destdir/dest.z; \ @@\
+ file.nr.gz $(DESTDIR)destdir/dest.$(MANSUFFIX).gz; \ @@\
fi @@\
@@\
clean:: @@\
- $(RM) file.nr file.nr.z
+ $(RM) file.nr file.nr.gz
/*
* InstallManPageAliases - generate rules to install manual page aliases.
--- sgiLib.rules.orig 2006-09-10 10:29:23.000000000 +0200
+++ sgiLib.rules 2006-09-09 21:06:23.000000000 +0200
@@ -97,8 +97,8 @@
$(INSTALL) -c $(INSTLIBFLAGS) Concat4(lib,libname,.so,rev) \ @@\
$(DESTDIR)dest ; \ @@\
STR=rev; if [ -n "$${STR}" ]; then \ @@\
- $(INSTALL) -c -l Concat4(lib,libname,.so,rev) \ @@\
- Concat3(lib,libname,.so) $(DESTDIR)dest ; \ @@\
+ $(LN) Concat4(lib,libname,.so,rev) \ @@\
+ $(DESTDIR)dest/Concat3(lib,libname,.so) ; \ @@\
fi
/*

40
pkgtools/xpkgwedge/files/irix6.patch
View File

@@ -1,40 +0,0 @@
$NetBSD: irix6.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
--- X11.rules.orig Thu Jun 12 09:12:20 2003
+++ X11.rules Sun Jun 8 10:31:35 2003
@@ -79,7 +79,7 @@
#if UseInstalledX11
#if defined(X11ProjectRoot)
# define X11BuildLibPath $(XPROJECTROOT)/lib
-else
+#else
# define X11BuildLibPath $(USRLIBDIR)
#endif
#elif ImportX11
--- sgi.cf.orig Thu Jun 12 09:12:20 2003
+++ sgi.cf Sun Jun 8 12:55:50 2003
@@ -241,7 +241,9 @@
* Actually, it doesn't matter what MakeCmd is, since we don't use it.
* We assume that $(MAKE) gets set for us by make.
*/
+#ifndef MakeCmd
#define MakeCmd $(TOOLROOTSAFE) $(TOOLROOT)/sbin/make
+#endif
#define TroffCmd psroff -t
#define StandardIncludes -nostdinc -I$(ROOT)/usr/include
@@ -320,10 +322,14 @@
#define NroffFilemanDir $(MAN4DIR)$(MANPACKAGE)
#define NroffMiscmanDir $(MAN5DIR)$(MANPACKAGE)
+#ifndef ManUsr
#ifdef UseInstalled
MANUSR = /usr/share/local
#else
MANUSR = /usr/share
+#endif
+#else
+ MANUSR = ManUsr
#endif
CATMAN1DIR = $(MANUSR)/catman/u_man/cat1

83
pkgtools/xpkgwedge/files/pkgxmkmf.in
View File

@@ -1,83 +0,0 @@
#!/bin/sh
#
# XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp
# XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws
#
# $NetBSD: pkgxmkmf.in,v 1.6 2005/06/14 20:12:51 jlam Exp $
#
# make a Makefile from an Imakefile from inside or outside the sources
# with support for config files in ${PREFIX}/lib/X11/config
usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]"
xcfgdir=@X11BASE@/lib/X11/config
lcfgdir=@PREFIX@/lib/X11/config
vcfgdir=@VIEWBASE@/lib/X11/config
configdirspec=''
if [ "${xcfgdir}" != "${lcfgdir}" -a -d ${lcfgdir} ]; then
configdirspec="${configdirspec} -I${lcfgdir}"
fi
if [ "${lcfgdir}" != "${vcfgdir}" -a -d ${vcfgdir} ]; then
configdirspec="${configdirspec} -I${vcfgdir}"
fi
configdirspec="${configdirspec} -I${xcfgdir}"
topdir=
curdir=.
do_all=
imake_defines=
while [ $# -gt 0 ]
do
case "$1" in
-D*)
imake_defines="$imake_defines $1"
shift
;;
-a)
do_all="yes"
shift
;;
*)
break
;;
esac
done
case $# in
0) ;;
1) topdir=$1 ;;
2) topdir=$1 curdir=$2 ;;
*) echo "$usage" 1>&2; exit 1 ;;
esac
case "$topdir" in
-*) echo "$usage" 1>&2; exit 1 ;;
esac
if [ -f Makefile ]; then
echo mv -f Makefile Makefile.bak
mv -f Makefile Makefile.bak
fi
if [ "$topdir" = "" ]; then
args="-DUseInstalled "$configdirspec
else
args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
fi
echo imake $imake_defines $args
case "$do_all" in
yes)
imake $imake_defines $args &&
echo "make Makefiles" &&
@MAKE@ Makefiles &&
echo "make includes" &&
@MAKE@ includes &&
echo "make depend" &&
@MAKE@ depend
;;
*)
imake $imake_defines $args
;;
esac

131
pkgtools/xpkgwedge/files/xpkgwedge.def
View File

@@ -1,131 +0,0 @@
/* $NetBSD: xpkgwedge.def,v 1.13 2010/06/06 03:45:17 dholland Exp $ */
#ifdef BeforeVendorCF
/*
* OS-specific overrides for Interix to make it behave similarly to NetBSD
* when creating binaries for pkgsrc.
*/
#ifdef __INTERIX
#undef ForceNormalLib /* this is always YES on Interix */
#define NullMakeCommand @ true
#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH)
#ifdef UseInstalled
#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
#define LinkBuildSonameLibrary(lib) true
#else
#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
#endif
/*
* Oy, what a hack: see pkgsrc/devel/libtool for an explanation of the
* bizarre --image-base option used below.
*/
#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
AllTarget(Concat(lib,libname.so.rev)) @@\
@@\
Concat(lib,libname.so.rev): solist @@\
$(RM) $@~ @@\
@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) \ @@\
-Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280)) \ @@\
-Wl,-h,$$SONAME solist $(REQUIREDLIBS)); \ @@\
$(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
LinkBuildSonameLibrary($$SONAME) @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
LinkBuildLibrary($@) @@\
$(RM) Concat(lib,libname.so) @@\
$(LN) $@ Concat(lib,libname.so) @@\
LinkBuildLibrary(Concat(lib,libname.so)) @@\
@@\
clean:: @@\
@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
set -x; $(RM) $$SONAME @@\
$(RM) Concat(lib,libname.so) @@\
$(RM) Concat(lib,libname.so.rev)
#define InstallSharedLibrary(libname,rev,dest) @@\
install:: Concat(lib,libname.so.rev) @@\
MakeDir($(DESTDIR)dest) @@\
$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\ @@\
set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T @@\
$(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\
$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
#endif /* __INTERIX && BeforeVendorCF */
#endif /* BeforeVendorCF */
#ifdef AfterVendorCF
/*
* The following defines inject a "PREFIX=" make-time option that lets the
* user twiddle the ProjectRoot setting with a single switch. This makes
* the command "make PREFIX=/path/to/install all install" work as expected.
*/
#ifndef ProjectRoot
/*
* Assume the worst: this should not happen in practice, as this setup
* does not work with the classical /usr/{include,lib}/X11 layout.
*/
#define ProjectRoot /usr/X11
#endif
X11_ROOT = ProjectRoot
#undef ProjectRoot
#define ProjectRoot $(PREFIX)
#undef ConfigDir
#define ConfigDir $(X11_ROOT)/lib/X11/config
/*
* This emits dual -I and -L options to cc automatically, one for the actual
* X11 root, and one for the user-set prefix.
*/
#define X11ProjectRoot $(X11_ROOT)
#define ExtraLoadFlags @X11TYPEFLAGS@
/*
* InstallAppDefaultsLong - general rule to install application default file
* if the InstallAppDefFiles configuration parameter is set.
*
* This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
* LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
* and creates a link to the real X11 app-defaults directory and moves the old
* app-defaults files into it. This is not what we want for pkgsrc.
*/
#ifndef InstallAppDefaultsLong
#if InstallAppDefFiles
#define InstallAppDefaultsLong(file,class) @@\
InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#else
#define InstallAppDefaultsLong(file,class) @@\
InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
#endif /* InstallAppDefFiles */
#endif /* InstallAppDefaultsLong */
#ifdef UseInstalled
/*
* We need to redefine ImakeCmd so that imake will look in both
* $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before*
* looking in the standard X11 config directory to override any
* configuration files installed there.
*/
#undef ImakeCmd
#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config
#endif
#ifdef __linux__
#if LinuxDistribution == LinuxDebian
#undef ManPath
#define ManPath $(PREFIX)/man
#endif /* Debian */
#endif /* __linux__ */
#endif /* AfterVendorCF */