Permalink
Browse files

Backport a change from 1.5.22 to 1.5.18 that fixes some issues with

temp dir creation when using relink-based finalization.
  • Loading branch information...
tv
tv committed Jan 31, 2006
1 parent 6601c3c commit c79002b59b073bf568f0059177dbb7e33553f289
Showing 38,629 changed files with 79 additions and 2,174,599 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
242 Makefile
@@ -1,242 +0,0 @@
-# $NetBSD: Makefile,v 1.76 2005/09/28 07:49:22 rillig Exp $
-#
-
-# tools used by this Makefile
-USE_TOOLS+= [ awk cat cmp echo env expr false fgrep grep mv rm sed \
- sort wc
-
-# additional tools used by bsd.pkg.subdir.mk
-USE_TOOLS+= basename touch
-
-# additional tools used by bsd.bulk-pkg.mk
-USE_TOOLS+= egrep find ls sh tee true tsort
-
-.include "mk/bsd.prefs.mk"
-
-.ifdef SPECIFIC_PKGS
-SUBDIR+= ${SITE_SPECIFIC_PKGS}
-SUBDIR+= ${HOST_SPECIFIC_PKGS}
-SUBDIR+= ${GROUP_SPECIFIC_PKGS}
-SUBDIR+= ${USER_SPECIFIC_PKGS}
-.else
-SUBDIR+= archivers
-SUBDIR+= audio
-SUBDIR+= benchmarks
-SUBDIR+= biology
-SUBDIR+= cad
-SUBDIR+= chat
-SUBDIR+= comms
-SUBDIR+= converters
-SUBDIR+= cross
-SUBDIR+= crosspkgtools
-SUBDIR+= databases
-SUBDIR+= devel
-SUBDIR+= editors
-SUBDIR+= emulators
-SUBDIR+= finance
-SUBDIR+= fonts
-SUBDIR+= games
-SUBDIR+= geography
-SUBDIR+= graphics
-SUBDIR+= ham
-SUBDIR+= inputmethod
-SUBDIR+= lang
-SUBDIR+= mail
-SUBDIR+= math
-SUBDIR+= mbone
-SUBDIR+= meta-pkgs
-SUBDIR+= misc
-SUBDIR+= multimedia
-SUBDIR+= net
-SUBDIR+= news
-SUBDIR+= parallel
-SUBDIR+= pkgtools
-SUBDIR+= print
-#SUBDIR+= regress # regression tests must be started manually
-SUBDIR+= security
-SUBDIR+= shells
-SUBDIR+= sysutils
-SUBDIR+= textproc
-SUBDIR+= time
-SUBDIR+= wm
-SUBDIR+= www
-SUBDIR+= x11
-.endif
-
-.ifdef USER_ADDITIONAL_PKGS
-SUBDIR+= ${USER_ADDITIONAL_PKGS}
-.endif
-
-PKGSRCTOP= yes
-
-
-# If PACKAGES is set to the default (${PKGSRCDIR}/packages), the current
-# ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
-# structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
-# The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
-# the target used to generate the README.html file.
-.PHONY: README.html
-_README_TYPE_FLAG?= none
-README.html: .PRECIOUS
-.if ${_README_TYPE_FLAG} == "--ftp" || ${_README_TYPE_FLAG} == "--cdrom"
- ${SETENV} TMPDIR=${TMPDIR:U/tmp}/mkreadme \
- BMAKE=${MAKE} \
- ./mk/scripts/mkreadme --pkgsrc ${.CURDIR} \
- --packages ${PACKAGES} ${_README_TYPE_FLAG} \
- --prune
-.else
- @${ECHO} "ERROR: please do not use the README.html target directly."
- @${ECHO} " Instead use either the \"readme\" or \"cdrom-readme\""
- @${ECHO} " target."
- @${FALSE}
-.endif
-
-.include "mk/bsd.pkg.subdir.mk"
-
-# the bulk-cache and clean-bulk-cache targets are a global-pkgsrc
-# thing and thus it makes sense to run it from the top level pkgsrc
-# directory.
-.if make(bulk-cache) || make(clean-bulk-cache)
-.include "${.CURDIR}/mk/bulk/bsd.bulk-pkg.mk"
-.endif
-
-.PHONY: ${.CURDIR}/PKGDB
-${.CURDIR}/PKGDB:
- @${RM} -f ${.CURDIR}/PKGDB
- @${ECHO_MSG} "Extracting complete dependency database. This may take a while..."
- @DB=${.CURDIR}/PKGDB ; \
- PKGSRCDIR=${.CURDIR} ; \
- npkg=1; \
- list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'` ; \
- for pkgdir in $$list ; do \
- if [ ! -d $$pkgdir ]; then \
- echo " " ; \
- echo "WARNING: the package directory $$pkgdir is listed in" > /dev/stderr ; \
- echo $$pkgdir | ${SED} 's;/.*;/Makefile;g' > /dev/stderr ; \
- echo "but the directory does not exist. Please fix this!" > /dev/stderr ; \
- else \
- cd $$pkgdir ; \
- l=`${MAKE} print-summary-data` ; \
- if [ $$? != 0 ]; then \
- echo "WARNING (printdepends): the package in $$pkgdir had problem with" \
- > /dev/stderr ; \
- echo " ${MAKE} print-summary-data" > /dev/stderr ; \
- echo " database information for this package" > /dev/stderr ; \
- echo " will be dropped." > /dev/stderr ; \
- ${MAKE} print-summary-data 2>&1 > /dev/stderr ; \
- else \
- echo "$$l" >> $$DB ; \
- fi ; \
- fi ; \
- echo -n "." ; \
- if [ `${EXPR} $$npkg % 100 = 0` -eq 1 ]; then \
- echo " " ; \
- echo "$$npkg" ; \
- fi ; \
- npkg=`${EXPR} $$npkg + 1` ; \
- cd $$PKGSRCDIR ; \
- done
-
-.PHONY: index
-index: ${.CURDIR}/INDEX
-
-${.CURDIR}/INDEX: ${.CURDIR}/PKGDB
- @${RM} -f ${.CURDIR}/INDEX
- @${AWK} -f ./mk/scripts/genindex.awk PKGSRCDIR=${.CURDIR} SORT=${SORT} ${.CURDIR}/PKGDB
- @${RM} -f ${.CURDIR}/PKGDB
-
-print-index: ${.CURDIR}/INDEX
- @${AWK} -F\| '{ printf("Pkg:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }' < ${.CURDIR}/INDEX
-
-search: ${.CURDIR}/INDEX
-.if !defined(key)
- @${ECHO} "The search target requires a keyword parameter,"
- @${ECHO} "e.g.: \"${MAKE} search key=somekeyword\""
-.else
- @${GREP} ${key} ${.CURDIR}/INDEX | ${AWK} -F\| '{ printf("Pkg:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nArch:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$10); }'
-.endif
-
-#
-# Generate list of all packages by extracting information from
-# the category/README.html pages
-#
-readme-all:
- @if [ -f README-all.html ]; then \
- ${MV} README-all.html README-all.html.BAK ; \
- fi
- @${MAKE} README-all.html
- @if ${CMP} -s README-all.html README-all.html.BAK ; then \
- ${MV} README-all.html.BAK README-all.html ; \
- else \
- ${RM} -f README-all.html.BAK ; \
- fi
-
-README-all.html:
- @${RM} -f $@.new
- @${RM} -f $@.newsorted
- @${ECHO} -n "Processing categories for $@:"
-.for category in ${SUBDIR}
- @if [ -f ${category}/README.html ]; then \
- ${ECHO} -n ' ${category}' ; \
- ${GREP} '^<TR>' ${category}/README.html \
- | ${SED} -e 's|"|"${category}/|' \
- -e 's| <TD>| <TD>(<A HREF="${category}/README.html">${category}</A>) <TD>|' \
- -e 's|<TR>|<TR VALIGN=TOP>|' \
- -e 's|<TD VALIGN=TOP>|<TD>|' \
- >> $@.new ; \
- fi
-.endfor
- @${ECHO} "."
- @if [ ! -f $@.new ]; then \
- ${ECHO} "There are no categories with README.html files available."; \
- ${ECHO} "You need to run \`${MAKE} readme' to generate them before running this target."; \
- ${FALSE}; \
- fi
- @${SORT} -f -t '">' +2 <$@.new >$@.newsorted
- @${WC} -l $@.newsorted | ${AWK} '{ print $$1 }' >$@.npkgs
- @${CAT} templates/README.all \
- | ${SED} \
- -e '/%%NPKGS%%/r$@.npkgs' \
- -e '/%%NPKGS%%/d' \
- -e '/%%PKGS%%/r$@.newsorted' \
- -e '/%%PKGS%%/d' \
- > $@
- @${RM} -f $@.npkgs
- @${RM} -f $@.new
- @${RM} -f $@.newsorted
-
-readme-ipv6:
- @if [ -f README-IPv6.html ]; then \
- ${MV} README-IPv6.html README-IPv6.html.BAK ; \
- fi
- @${MAKE} README-IPv6.html
- @if ${CMP} -s README-IPv6.html README-IPv6.html.BAK ; then \
- ${MV} README-IPv6.html.BAK README-IPv6.html ; \
- else \
- ${RM} -f README-IPv6.html.BAK ; \
- fi
-
-README-IPv6.html:
- @${GREP} -l -e '^BUILD_DEFS.*=.*USE_INET6' -e '^PKG_SUPPORTED_OPTIONS.*=.*inet6' \
- */*/Makefile */*/options.mk \
- | ${SED} -e s,Makefile,, -e s,options.mk,, >$@.pkgs
- @${FGREP} -f $@.pkgs README-all.html | ${SORT} -t/ +1 >$@.trs
- @${CAT} templates/README.ipv6 \
- | ${SED} \
- -e '/%%TRS%%/r$@.trs' \
- -e '/%%TRS%%/d' \
- >$@
- @${RM} $@.pkgs $@.trs
-
-show-host-specific-pkgs:
- @${ECHO} "HOST_SPECIFIC_PKGS= \\"; \
- ${MAKE} show-pkgsrc-dir | ${AWK} '/^===/ { next; } { printf("%s \\\n", $$1) }'; \
- ${ECHO} ""
-
-# list all packages that depend on a particular package; needs the INDEX file
-# usage: 'make show-deps PKG=openssl'
-# PKG: name of the package
-show-deps:
- @if [ ! -f "${.CURDIR}/INDEX" ]; then ${ECHO} "No index available -- please build it with 'make index'" >&2; ${FALSE}; fi
- @if [ -z "${PKG}" ]; then ${ECHO} "PKG variable not set" >&2; ${FALSE}; fi
- @${GREP} -E "^([^|]*\|){7}([^|]* |)${PKG}>=" ${.CURDIR}/INDEX | ${SED} -n "s/^[^|]*|\([^|]*\)|.*/\1/p" | ${SORT}
View
3 README
@@ -1,3 +0,0 @@
-$NetBSD: README,v 1.18 2005/05/07 22:18:28 wiz Exp $
-
-Please see doc/pkgsrc.txt for information.
View
@@ -1,15 +0,0 @@
-9e is a program to explore Plan9 archives. You can do whatever you
-like with the source so long as you clearly indicate all modifications
-and the author responsible for each.
-
-Usage Summary:
- 9e [options] <file> ...
-
-Options:
- -h: dump headers only
- -v: dump file names and sizes while extracting
- -r: specify alternate root directory
- -?: help
-
-If no file is named on the command line, standard input is assumed.
-Note that the input file must be a decompressed Plan9 archive.
View
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:48 tv Exp $
-
-DISTNAME= 9e
-PKGNAME= 9e-1.0
-CATEGORIES= plan9 archivers
-MASTER_SITES= http://www.eecs.harvard.edu/~wkj/Software/9e/
-
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.eecs.harvard.edu/~wkj/Software/9e/
-COMMENT= Explode Plan9 archives
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-NO_CONFIGURE= yes
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/9e ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
View
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/18 13:36:20 cjep Exp $
-bin/9e
View
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 14:45:22 agc Exp $
-
-SHA1 (9e.tar.gz) = fc966f51a167e4ed3dc371e399bbc8909f074b54
-RMD160 (9e.tar.gz) = bbcdde8d9b4989a12edd935c6156d80aaf5f8f5e
-Size (9e.tar.gz) = 2019 bytes
-SHA1 (patch-aa) = 5d5982bfc544910f3d36eb40a9de9c5caa8432fd
-SHA1 (patch-ab) = 7c81596f86905d6b9a42cab77fbfad6b15c911c3
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/18 13:36:20 cjep Exp $
-
---- Makefile.orig Thu Jun 22 18:59:41 2000
-+++ Makefile Thu Jun 22 19:04:02 2000
-@@ -1,14 +1,9 @@
- # Makefile for 9e
-
--CC = gcc
--
--CFLAGS = -g3 -ggdb
-+CFLAGS = -O
-
- .PHONY: all clean distclean
-
--LIBS = -lefence
--
--HDRS = 9a.h
- SRCS = 9e.c
- OBJS = 9e.o
-
-@@ -17,7 +12,7 @@
- all: $(BINARIES)
-
- 9e: $(OBJS)
-- $(CC) -o 9e 9e.o $(LIBS)
-+ $(CC) -o 9e 9e.o
-
- clean:
- rm -f *.o *~ a.out
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/02/06 15:06:18 yyamano Exp $
-
---- 9e.c.orig Thu Jun 15 22:40:52 2000
-+++ 9e.c
-@@ -1,6 +1,9 @@
- /* 9e.c */
-
- #include <assert.h>
-+#ifdef __APPLE__
-+#include <sys/types.h>
-+#endif
- #include <dirent.h>
- #include <errno.h>
- #include <stdio.h>
-@@ -139,17 +142,16 @@
- }
-
- if(Hdrs) {
-- fprintf(stderr, "%s %lo %s %s %ld %ld\n", namebuf, mode,
-+ fprintf(stderr, "%s %lo %s %s %ld %ld\n", name, mode,
- owner, group, mtime, size);
- fout = NULL;
- } else {
- if (Verbose)
-- fprintf(stderr, "%s %d\n", namebuf, size);
-+ fprintf(stderr, "%s\n", name);
- if(mode & CHDIR) {
- assert(size == 0);
- /* Give ourselves read, write, and execute permission */
-- if(mkdir(name, (mode & ~CHDIR) | 0700) < 0)
-- warn("mkdir(2) failed for", name);
-+ mkdir(name, (mode & ~CHDIR) | 0700);
- continue;
- }
- if((fout=fopen(name, "w+b")) == NULL)
Oops, something went wrong.

0 comments on commit c79002b

Please sign in to comment.