]> git.saurik.com Git - apple/file_cmds.git/commitdiff
file_cmds-188.tar.gz mac-os-x-1056 mac-os-x-1057 mac-os-x-1058 v188
authorApple <opensource@apple.com>
Tue, 8 Jan 2008 23:33:35 +0000 (23:33 +0000)
committerApple <opensource@apple.com>
Tue, 8 Jan 2008 23:33:35 +0000 (23:33 +0000)
132 files changed:
Makefile
Makefile.postamble [deleted file]
Makefile.preamble [deleted file]
PB.project [deleted file]
PROJECT [deleted file]
chflags/Makefile
chflags/Makefile.postamble [deleted file]
chflags/Makefile.preamble [deleted file]
chflags/PB.project [deleted file]
chmod/Makefile
chmod/Makefile.postamble [deleted file]
chmod/Makefile.preamble [deleted file]
chmod/PB.project [deleted file]
chown/Makefile
chown/Makefile.postamble [deleted file]
chown/Makefile.preamble [deleted file]
chown/PB.project [deleted file]
cksum/Makefile
cksum/Makefile.postamble [deleted file]
cksum/Makefile.preamble [deleted file]
cksum/PB.project [deleted file]
compress/Makefile
compress/Makefile.postamble [deleted file]
compress/Makefile.preamble [deleted file]
compress/PB.project [deleted file]
compress/doc/NOTES [new file with mode: 0644]
compress/doc/README [new file with mode: 0644]
compress/doc/revision.log [new file with mode: 0644]
compress/zcat.sh [new file with mode: 0644]
cp/Makefile
cp/Makefile.postamble [deleted file]
cp/Makefile.preamble [deleted file]
cp/PB.project [deleted file]
cp/cp.c
cp/utils.c
csh/strpct.c [new file with mode: 0644]
dd/Makefile
dd/Makefile.postamble [deleted file]
dd/Makefile.preamble [deleted file]
dd/PB.project [deleted file]
df/Makefile
df/Makefile.postamble [deleted file]
df/Makefile.preamble [deleted file]
df/PB.project [deleted file]
df/df.1
df/df.c
du/Makefile
du/Makefile.postamble [deleted file]
du/Makefile.preamble [deleted file]
du/PB.project [deleted file]
du/du.1
du/du.c
install/Makefile
install/Makefile.postamble [deleted file]
install/Makefile.preamble [deleted file]
install/PB.project [deleted file]
install/xinstall.c
ipcrm/Makefile
ipcrm/Makefile.postamble [deleted file]
ipcrm/Makefile.preamble [deleted file]
ipcrm/PB.project [deleted file]
ipcs/Makefile
ipcs/Makefile.postamble [deleted file]
ipcs/Makefile.preamble [deleted file]
ipcs/PB.project [deleted file]
ln/Makefile
ln/Makefile.postamble [deleted file]
ln/Makefile.preamble [deleted file]
ln/PB.project [deleted file]
ls/Makefile
ls/Makefile.postamble [deleted file]
ls/Makefile.preamble [deleted file]
ls/PB.project [deleted file]
mkdir/Makefile
mkdir/Makefile.postamble [deleted file]
mkdir/Makefile.preamble [deleted file]
mkdir/PB.project [deleted file]
mkfifo/Makefile
mkfifo/Makefile.postamble [deleted file]
mkfifo/Makefile.preamble [deleted file]
mkfifo/PB.project [deleted file]
mknod/Makefile
mknod/Makefile.postamble [deleted file]
mknod/Makefile.preamble [deleted file]
mknod/PB.project [deleted file]
mtree/Makefile
mtree/Makefile.postamble [deleted file]
mtree/Makefile.preamble [deleted file]
mtree/PB.project [deleted file]
mtree/test/test00.sh [new file with mode: 0644]
mtree/test/test01.sh [new file with mode: 0644]
mtree/test/test02.sh [new file with mode: 0644]
mtree/test/test03.sh [new file with mode: 0644]
mtree/test/test04.sh [new file with mode: 0644]
mv/Makefile
mv/Makefile.postamble [deleted file]
mv/Makefile.preamble [deleted file]
mv/PB.project [deleted file]
pathchk/Makefile
pathchk/Makefile.postamble [deleted file]
pathchk/Makefile.preamble [deleted file]
pathchk/PB.project [deleted file]
pax/Makefile
pax/Makefile.postamble [deleted file]
pax/Makefile.preamble [deleted file]
pax/PB.project [deleted file]
pax/file_subs.c
pax/pax_format.h [new file with mode: 0644]
rm/Makefile
rm/Makefile.postamble [deleted file]
rm/Makefile.preamble [deleted file]
rm/PB.project [deleted file]
rmdir/Makefile
rmdir/Makefile.postamble [deleted file]
rmdir/Makefile.preamble [deleted file]
rmdir/PB.project [deleted file]
rmt/Makefile
rmt/Makefile.postamble [deleted file]
rmt/Makefile.preamble [deleted file]
rmt/PB.project [deleted file]
shar/Makefile
shar/Makefile.postamble [deleted file]
shar/Makefile.preamble [deleted file]
shar/PB.project [deleted file]
stat/Makefile
stat/Makefile.postamble [deleted file]
stat/Makefile.preamble [deleted file]
stat/PB.project [deleted file]
touch/Makefile
touch/Makefile.postamble [deleted file]
touch/Makefile.preamble [deleted file]
touch/PB.project [deleted file]

index 4b7ee0b4a0a39fb54c95ad45456dcaeb7109c050..f240adde783d046bda8e1867a3ea6b871c27e0f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,15 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
+Project = file_cmds
 
-NAME = file_cmds
+Embedded = $(shell tconf --test TARGET_OS_EMBEDDED)
 
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Aggregate
-ifneq ($(shell tconf --test TARGET_OS_EMBEDDED),YES)
-#libcrypto missing
-MTREE=mtree
-endif
-
-TOOLS = chflags chmod chown cksum compress cp dd df du install ipcrm ipcs ln ls\
-        mkdir mkfifo mknod $(MTREE) mv pathchk pax rm rmdir rmt shar stat\
+SubProjects = chflags chmod chown cksum compress cp dd df du install \
+       ipcrm ipcs ln ls\
+        mkdir mkfifo mknod mv pathchk pax rm rmdir rmt shar stat\
         touch
 
-OTHERSRCS = PROJECT Makefile.preamble Makefile Makefile.postamble
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = aggregate.make
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-OTHER_LDFLAGS += -dead_strip
-NEXTSTEP_PB_CFLAGS = -mdynamic-no-pic -no-cpp-precomp -I "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -include TargetConditionals.h
-ifneq ($(SDKROOT),)
-OTHER_CFLAGS  += -isysroot "$(SDKROOT)"
-OTHER_LDFLAGS += -Wl,-syslibroot,"$(SDKROOT)"
+ifeq ($(Embedded),NO)
+#libcrypto missing
+SubProjects += mtree
 endif
 
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/Makefile.postamble b/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/Makefile.preamble b/Makefile.preamble
deleted file mode 100644 (file)
index 8f8a3bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(MAKEFILEPATH)/CoreOS/ProjectBuilder/Makefile.Preamble.Common
diff --git a/PB.project b/PB.project
deleted file mode 100644 (file)
index 5ab9509..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        OTHER_SOURCES = (PROJECT, Makefile.preamble, Makefile, Makefile.postamble); 
-        SUBPROJECTS = (
-            chflags, 
-            chmod, 
-            chown, 
-            compress, 
-            cp, 
-            dd, 
-            df, 
-            du, 
-            install, 
-            ipcrm, 
-            ipcs, 
-            ln, 
-            ls, 
-            mkdir, 
-            mkfifo, 
-            mknod, 
-            mtree, 
-            mv, 
-            pax, 
-            rm, 
-            rmdir, 
-            rmt, 
-            shar, 
-            tcopy, 
-            touch
-        ); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_COMPILEROPTIONS = "-Wall -Werror"; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = file_cmds; 
-    PROJECTTYPE = Aggregate; 
-    PROJECTVERSION = 2.8; 
-    TARGETS = (); 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/PROJECT b/PROJECT
deleted file mode 100644 (file)
index 6c7fd2c..0000000
--- a/PROJECT
+++ /dev/null
@@ -1,10 +0,0 @@
-Project                : file_cmds
-Description    : File Commands
-Distribution   : NetBSD Tue Oct  6 14:50:43 PDT 1998
-Source         : NetBSD Foundation, Inc.
-Location       : cvs.netbsd.org:/cvsroot
-Owner          : wsanchez
-Releases       : Titan
-Dependancies   : 
-
-Some file commands in NetBSD implement the -h flag and can otherwise charge permissions on symlinks. But this requires lchmod(2) from NetBSD and we don't currently have that, so it is disabled with -D__APPLE__. 
index aeeabe47a234115a4877f802d7af5b1dc253590e..46cdbe1fa3a2efbdab56ec266e71c8d788f8d4b7 100644 (file)
@@ -1,49 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = chflags
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = chflags
+Install_Dir = /usr/bin
 
 CFILES = chflags.c
+MANPAGES = chflags.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chflags.1
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/chflags/Makefile.postamble b/chflags/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/chflags/Makefile.preamble b/chflags/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/chflags/PB.project b/chflags/PB.project
deleted file mode 100644 (file)
index bf7e967..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (chflags.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chflags.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = chflags; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index e46896c3a98de18146521fe002e4cf8d385add3c..49f5bbc62ee8d772f6d24508b4987a4b7373ff71 100644 (file)
@@ -1,50 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = chmod
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = chmod_acl.h
+Project = chmod
+Install_Dir = /bin
 
 CFILES = chmod.c chmod_acl.c
+MANPAGES = chmod.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chmod.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/chmod/Makefile.postamble b/chmod/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/chmod/Makefile.preamble b/chmod/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/chmod/PB.project b/chmod/PB.project
deleted file mode 100644 (file)
index 644371e..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (chmod.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chmod.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = chmod; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index eb0029c8eb10cf6fe159546389d1e1fa130fe222..9d811a03d37da5624d888b5595a7de28e2374d2f 100644 (file)
@@ -1,50 +1,15 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = chown
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = chown
+Install_Dir = /usr/sbin
 
 CFILES = chown.c
+MANPAGES = chgrp.1 chown.8
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble chgrp.1\
-            chown.8
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/sbin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS = -DSUPPORT_DOT
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/chown \
+               $(DSTROOT)/usr/bin/chgrp
diff --git a/chown/Makefile.postamble b/chown/Makefile.postamble
deleted file mode 100644 (file)
index 4da9b62..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)/usr/bin/chgrp
diff --git a/chown/Makefile.preamble b/chown/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/chown/PB.project b/chown/PB.project
deleted file mode 100644 (file)
index d716382..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (chown.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, chgrp.1, chown.8); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_COMPILEROPTIONS = "-DSUPPORT_DOT"; 
-    NEXTSTEP_INSTALLDIR = /usr/sbin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = chown; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 24e3168a5ab2378f579e396101380a55f5ae4eb5..a43c0ecaa15e6e1200126d6753242767462f84b7 100644 (file)
@@ -1,51 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = cksum
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = extern.h
+Project = cksum
+Install_Dir = /usr/bin
 
 CFILES = cksum.c crc.c print.c sum1.c sum2.c crc32.c
+MANPAGES = cksum.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble cksum.1
-
-OTHER_CFLAGS=-D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/doc_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(JDKBINDIR)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+        -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/cksum \
+               $(DSTROOT)$(Install_Dir)/sum
+       $(LN) -f $(DSTROOT)/usr/share/man/man1/cksum.1 \
+               $(DSTROOT)/usr/share/man/man1/sum.1
diff --git a/cksum/Makefile.postamble b/cksum/Makefile.postamble
deleted file mode 100644 (file)
index a0b1af9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/sum
-       $(LN) -f $(DSTROOT)/usr/share/man/man1/cksum.1 $(DSTROOT)/usr/share/man/man1/sum.1
diff --git a/cksum/Makefile.preamble b/cksum/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/cksum/PB.project b/cksum/PB.project
deleted file mode 100644 (file)
index 63b0f64..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (extern.h); 
-        OTHER_LINKED = (cksum.c, crc.c, print.c, sum1.c, sum2.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, cksum.1, sum.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/doc_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(JDKBINDIR)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = cksum; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index f312cf5bcf75d936f6951cd4cc126cbc7570bb1b..11660d069c84bcef9629171770f4847e9b5a548d 100644 (file)
@@ -1,47 +1,15 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = compress
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = compress
+Install_Dir = /usr/bin
 
 CFILES = compress.c zopen.c
+MANPAGES = compress.1 uncompress.1 zopen.3
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble compress.1\
-            zopen.3 uncompress.1 zopen.h
-
-NEXTSTEP_PB_CFLAGS += -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/file_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/compress \
+                 $(DSTROOT)$(Install_Dir)/uncompress
diff --git a/compress/Makefile.postamble b/compress/Makefile.postamble
deleted file mode 100644 (file)
index cb8937b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/uncompress
-#      $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/zcat
diff --git a/compress/Makefile.preamble b/compress/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/compress/PB.project b/compress/PB.project
deleted file mode 100644 (file)
index d9c8269..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (compress.c, zopen.c); 
-        OTHER_SOURCES = (
-            Makefile, 
-            Makefile.preamble, 
-            Makefile.postamble, 
-            compress.1, 
-            zopen.3, 
-            uncompress.1
-        ); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = compress; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/compress/doc/NOTES b/compress/doc/NOTES
new file mode 100644 (file)
index 0000000..aec6b75
--- /dev/null
@@ -0,0 +1,142 @@
+
+  $FreeBSD: src/usr.bin/compress/doc/NOTES,v 1.2 2002/10/16 12:42:15 charnier Exp $
+
+From: James A. Woods <jaw@eos.arc.nasa.gov>
+
+>From vn Fri Dec  2 18:05:27 1988
+Subject: Re: Looking for C source for RSA
+Newsgroups: sci.crypt
+
+# Illegitimi noncarborundum
+
+Patents are a tar pit.
+
+A good case can be made that most are just a license to sue, and nothing
+is illegal until a patent is upheld in court.
+
+For example, if you receive netnews by means other than 'nntp',
+these very words are being modulated by 'compress',
+a variation on the patented Lempel-Ziv-Welch algorithm.
+
+Original Ziv-Lempel is patent number 4,464,650, and the more powerful
+LZW method is #4,558,302.  Yet despite any similarities between 'compress'
+and LZW (the public-domain 'compress' code was designed and given to the
+world before the ink on the Welch patent was dry), no attorneys from Sperry
+(the assignee) have asked you to unplug your Usenet connection.
+
+Why?  I can't speak for them, but it is possible the claims are too broad,
+or, just as bad, not broad enough.  ('compress' does things not mentioned
+in the Welch patent.)  Maybe they realize that they can commercialize
+LZW better by selling hardware implementations rather than by licensing
+software.  Again, the LZW software delineated in the patent is *not*
+the same as that of 'compress'.
+
+At any rate, court-tested software patents are a different animal;
+corporate patents in a portfolio are usually traded like baseball cards
+to shut out small fry rather than actually be defended before
+non-technical juries.  Perhaps RSA will undergo this test successfully,
+although the grant to "exclude others from making, using, or selling"
+the invention would then only apply to the U.S. (witness the 
+Genentech patent of the TPA molecule in the U.S. but struck down
+in Great Britain as too broad.)
+
+The concept is still exotic for those who learned in school the rule of thumb
+that one may patent "apparatus" but not an "idea".
+Apparently this all changed in Diamond v. Diehr (1981) when the U. S. Supreme
+Court reversed itself.  
+
+Scholars should consult the excellent article in the Washington and Lee
+Law Review (fall 1984, vol. 41, no. 4) by Anthony and Colwell for a
+comprehensive survey of an area which will remain murky for some time.
+
+Until the dust clears, how you approach ideas which are patented depends
+on how paranoid you are of a legal onslaught.  Arbitrary?  Yes.  But
+the patent bar the the CCPA (Court of Customs and Patent Appeals)
+thanks you for any uncertainty as they, at least, stand to gain
+from any trouble.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+From: James A. Woods <jaw@eos.arc.nasa.gov>
+Subject: Re: Looking for C source for RSA (actually 'compress' patents)
+
+       In article <2042@eos.UUCP> you write:
+       >The concept is still exotic for those who learned in school the rule of thumb
+       >that one may patent "apparatus" but not an "idea".
+
+A rule of thumb that has never been completely valid, as any chemical
+engineer can tell you.  (Chemical processes were among the earliest patents,
+as I recall.)
+
+       ah yes -- i date myself when relaying out-of-date advice from elderly
+       attorneys who don't even specialize in patents.  one other interesting
+       class of patents include the output of optical lens design programs,
+       which yield formulae which can then fairly directly can be molded
+       into glass.  although there are restrictions on patenting equations,
+       the "embedded systems" seem to fly past the legal gauntlets.
+
+       anyway, I'm still learning about intellectual property law after
+       several conversations from a Unisys (nee sperry) lawyer re 'compress'.
+
+       it's more complicated than this, but they're letting (oral
+       communication only) software versions of 'compress' slide
+       as far as licensing fees go.  this includes 'arc', 'stuffit',
+       and other commercial wrappers for 'compress'.  yet they are
+       signing up licensees for hardware chips.  Hewlett-Packard
+       supposedly has an active vlsi project, and Unisys has
+       board-level LZW-based tape controllers.  (to build LZW into
+       a disk controller would be strange, as you'd have to build
+       in a filesystem too!)
+
+       it's byzantine
+       that Unisys is in a tiff with HP regarding the patents,
+       after discovering some sort of "compress" button on some
+       HP terminal product.  why?  well, professor Abraham Lempel jumped
+       from being department chairman of computer science at technion in
+       Israel to sperry (where he got the first patent), but then to work
+       at Hewlett-Packard on sabbatical.  the second Welch patent
+       is only weakly derivative of the first, so they want chip
+       licenses and HP relented.  however, everyone agrees something
+       like the current Unix implementation is the way to go with
+       software, so HP (and UCB) long ago asked spencer Thomas and i to sign
+       off on copyright permission (although they didn't need to, it being pd).
+       Lempel, HP, and Unisys grumbles they can't make money off the
+       software since a good free implementation (not the best --
+       i have more ideas!) escaped via Usenet.  (Lempel's own pascal
+       code was apparently horribly slow.)
+       i don't follow the IBM 'arc' legal bickering; my impression
+       is that the pc folks are making money off the archiver/wrapper
+       look/feel of the thing [if ms-dos can be said to have a look and feel]. 
+
+       now where is telebit with the compress firmware?  in a limbo
+       netherworld, probably, with sperry still welcoming outfits
+       to sign patent licenses, a common tactic to bring other small fry
+       into the fold.  the guy who crammed 12-bit compress into the modem
+       there left.  also what is transpiring with 'compress' and sys 5 rel 4?
+       beats me, but if sperry got a hold of them on these issues,
+       at&t would likely re-implement another algorithm if they
+       thought 'compress' infringes.  needful to say, i don't think
+       it does after the above mentioned legal conversation.
+       my own beliefs on whether algorithms should be patentable at all
+       change with the weather.  if the courts finally nail down
+       patent protection for algorithms, academic publication in
+       textbooks will be somewhat at odds with the engineering world,
+       where the textbook codes will simply be a big tease to get
+       money into the patent holder coffers...
+
+       oh, if you implement LZW from the patent, you won't get
+       good rates because it doesn't mention adaptive table reset,
+       lack thereof being *the* serious deficiency of Thomas' first version.
+
+       now i know that patent law generally protects against independent
+       re-invention (like the 'xor' hash function pleasantly mentioned
+       in the patent [but not the paper]).
+       but the upshot is that if anyone ever wanted to sue us,
+       we're partially covered with
+       independently-developed twists, plus the fact that some of us work
+       in a bureaucratic morass (as contractor to a public agency in my case).
+
+       quite a mess, huh?  I've wanted to tell someone this stuff
+       for a long time, for posterity if nothing else.
+
+james 
+
diff --git a/compress/doc/README b/compress/doc/README
new file mode 100644 (file)
index 0000000..0828cdf
--- /dev/null
@@ -0,0 +1,284 @@
+
+       @(#)README      8.1 (Berkeley) 6/9/93
+  $FreeBSD: src/usr.bin/compress/doc/README,v 1.3 2002/12/30 21:18:11 schweikh Exp $
+
+Compress version 4.0 improvements over 3.0:
+       o compress() speedup (10-50%) by changing division hash to xor
+       o decompress() speedup (5-10%)
+       o Memory requirements reduced (3-30%)
+       o Stack requirements reduced to less than 4kb
+       o Removed 'Big+Fast' compress code (FBITS) because of compress speedup
+       o Portability mods for Z8000 and PC/XT (but not zeus 3.2)
+       o Default to 'quiet' mode
+       o Unification of 'force' flags
+       o Manual page overhaul
+       o Portability enhancement for M_XENIX
+       o Removed text on #else and #endif
+       o Added "-V" switch to print version and options
+       o Added #defines for SIGNED_COMPARE_SLOW
+       o Added Makefile and "usermem" program
+       o Removed all floating point computations
+       o New programs: [deleted]
+
+The "usermem" script attempts to determine the maximum process size.  Some
+editing of the script may be necessary (see the comments).  [It should work
+fine on 4.3 BSD.] If you can't get it to work at all, just create file
+"USERMEM" containing the maximum process size in decimal.
+
+The following preprocessor symbols control the compilation of "compress.c":
+
+       o USERMEM               Maximum process memory on the system
+       o SACREDMEM             Amount to reserve for other processes
+       o SIGNED_COMPARE_SLOW   Unsigned compare instructions are faster
+       o NO_UCHAR              Don't use "unsigned char" types
+       o BITS                  Overrules default set by USERMEM-SACREDMEM
+       o vax                   Generate inline assembler
+       o interdata             Defines SIGNED_COMPARE_SLOW
+       o M_XENIX               Makes arrays < 65536 bytes each
+       o pdp11                 BITS=12, NO_UCHAR
+       o z8000                 BITS=12
+       o pcxt                  BITS=12
+       o BSD4_2                Allow long filenames ( > 14 characters) &
+                               Call setlinebuf(stderr)
+
+The difference "usermem-sacredmem" determines the maximum BITS that can be
+specified with the "-b" flag.
+
+memory: at least               BITS
+------  -- -----                ----
+     433,484                    16
+     229,600                    15
+     127,536                    14
+      73,464                    13
+           0                    12
+
+The default is BITS=16.
+
+The maximum bits can be overruled by specifying "-DBITS=bits" at
+compilation time.
+
+WARNING: files compressed on a large machine with more bits than allowed by 
+a version of compress on a smaller machine cannot be decompressed!  Use the
+"-b12" flag to generate a file on a large machine that can be uncompressed 
+on a 16-bit machine.
+
+The output of compress 4.0 is fully compatible with that of compress 3.0.
+In other words, the output of compress 4.0 may be fed into uncompress 3.0 or
+the output of compress 3.0 may be fed into uncompress 4.0.
+
+The output of compress 4.0 not compatible with that of
+compress 2.0.  However, compress 4.0 still accepts the output of
+compress 2.0.  To generate output that is compatible with compress
+2.0, use the undocumented "-C" flag.
+
+       -from mod.sources, submitted by vax135!petsd!joe (Joe Orost), 8/1/85
+--------------------------------
+
+Enclosed is compress version 3.0 with the following changes:
+
+1.     "Block" compression is performed.  After the BITS run out, the
+       compression ratio is checked every so often.  If it is decreasing,
+       the table is cleared and a new set of substrings are generated.
+
+       This makes the output of compress 3.0 not compatible with that of
+       compress 2.0.  However, compress 3.0 still accepts the output of
+       compress 2.0.  To generate output that is compatible with compress
+       2.0, use the undocumented "-C" flag.
+
+2.     A quiet "-q" flag has been added for use by the news system.
+
+3.     The character chaining has been deleted and the program now uses
+       hashing.  This improves the speed of the program, especially
+       during decompression.  Other speed improvements have been made,
+       such as using putc() instead of fwrite().
+
+4.     A large table is used on large machines when a relatively small
+       number of bits is specified.  This saves much time when compressing
+       for a 16-bit machine on a 32-bit virtual machine.  Note that the
+       speed improvement only occurs when the input file is > 30000
+       characters, and the -b BITS is less than or equal to the cutoff
+       described below.
+
+Most of these changes were made by James A. Woods (ames!jaw).  Thank you
+James!
+
+To compile compress:
+
+       cc -O -DUSERMEM=usermem -o compress compress.c
+
+Where "usermem" is the amount of physical user memory available (in bytes).  
+If any physical memory is to be reserved for other processes, put in 
+"-DSACREDMEM sacredmem", where "sacredmem" is the amount to be reserved.
+
+The difference "usermem-sacredmem" determines the maximum BITS that can be
+specified, and the cutoff bits where the large+fast table is used.
+
+memory: at least               BITS            cutoff
+------  -- -----                ----            ------
+   4,718,592                    16               13
+   2,621,440                    16               12
+   1,572,864                    16               11
+   1,048,576                    16               10
+     631,808                    16               --
+     329,728                    15               --
+     178,176                    14               --
+      99,328                    13               --
+           0                    12               --
+
+The default memory size is 750,000 which gives a maximum BITS=16 and no
+large+fast table.
+
+The maximum bits can be overruled by specifying "-DBITS=bits" at
+compilation time.
+
+If your machine doesn't support unsigned characters, define "NO_UCHAR" 
+when compiling.
+
+If your machine has "int" as 16-bits, define "SHORT_INT" when compiling.
+
+After compilation, move "compress" to a standard executable location, such 
+as /usr/local.  Then:
+       cd /usr/local
+       ln compress uncompress
+       ln compress zcat
+
+On machines that have a fixed stack size (such as Perkin-Elmer), set the
+stack to at least 12kb.  ("setstack compress 12" on Perkin-Elmer).
+
+Next, install the manual (compress.l).
+       cp compress.l /usr/man/manl
+       cd /usr/man/manl
+       ln compress.l uncompress.l
+       ln compress.l zcat.l
+
+               - or -
+
+       cp compress.l /usr/man/man1/compress.1
+       cd /usr/man/man1
+       ln compress.1 uncompress.1
+       ln compress.1 zcat.1
+
+                                       regards,
+                                       petsd!joe
+
+Here is a note from the net:
+
+>From hplabs!pesnta!amd!turtlevax!ken Sat Jan  5 03:35:20 1985
+Path: ames!hplabs!pesnta!amd!turtlevax!ken
+From: ken@turtlevax.UUCP (Ken Turkowski)
+Newsgroups: net.sources
+Subject: Re: Compress release 3.0 : sample Makefile
+Organization: CADLINC, Inc. @ Menlo Park, CA
+
+In the compress 3.0 source recently posted to mod.sources, there is a
+#define variable which can be set for optimum performance on a machine
+with a large amount of memory.  A program (usermem) to calculate the
+usable amount of physical user memory is enclosed, as well as a sample
+4.2BSD Vax Makefile for compress.
+
+Here is the README file from the previous version of compress (2.0):
+
+>Enclosed is compress.c version 2.0 with the following bugs fixed:
+>
+>1.    The packed files produced by compress are different on different
+>      machines and dependent on the vax sysgen option.
+>              The bug was in the different byte/bit ordering on the
+>              various machines.  This has been fixed.
+>
+>              This version is NOT compatible with the original vax posting
+>              unless the '-DCOMPATIBLE' option is specified to the C
+>              compiler.  The original posting has a bug which I fixed, 
+>              causing incompatible files.  I recommend you NOT to use this
+>              option unless you already have a lot of packed files from
+>              the original posting by Thomas.
+>2.    The exit status is not well defined (on some machines) causing the
+>      scripts to fail.
+>              The exit status is now 0,1 or 2 and is documented in
+>              compress.l.
+>3.    The function getopt() is not available in all C libraries.
+>              The function getopt() is no longer referenced by the
+>              program.
+>4.    Error status is not being checked on the fwrite() and fflush() calls.
+>              Fixed.
+>
+>The following enhancements have been made:
+>
+>1.    Added facilities of "compact" into the compress program.  "Pack",
+>      "Unpack", and "Pcat" are no longer required (no longer supplied).
+>2.    Installed work around for C compiler bug with "-O".
+>3.    Added a magic number header (\037\235).  Put the bits specified
+>      in the file.
+>4.    Added "-f" flag to force overwrite of output file.
+>5.    Added "-c" flag and "zcat" program.  'ln compress zcat' after you
+>      compile.
+>6.    The 'uncompress' script has been deleted; simply 
+>      'ln compress uncompress' after you compile and it will work.
+>7.    Removed extra bit masking for machines that support unsigned
+>      characters.  If your machine doesn't support unsigned characters,
+>      define "NO_UCHAR" when compiling.
+>
+>Compile "compress.c" with "-O -o compress" flags.  Move "compress" to a
+>standard executable location, such as /usr/local.  Then:
+>      cd /usr/local
+>      ln compress uncompress
+>      ln compress zcat
+>
+>On machines that have a fixed stack size (such as Perkin-Elmer), set the
+>stack to at least 12kb.  ("setstack compress 12" on Perkin-Elmer).
+>
+>Next, install the manual (compress.l).
+>      cp compress.l /usr/man/manl             - or -
+>      cp compress.l /usr/man/man1/compress.1
+>
+>Here is the README that I sent with my first posting:
+>
+>>Enclosed is a modified version of compress.c, along with scripts to make it
+>>run identically to pack(1), unpack(1), and pcat(1).  Here is what I
+>>(petsd!joe) and a colleague (petsd!peora!srd) did:
+>>
+>>1. Removed VAX dependencies.
+>>2. Changed the struct to separate arrays; saves mucho memory.
+>>3. Did comparisons in unsigned, where possible.  (Faster on Perkin-Elmer.)
+>>4. Sorted the character next chain and changed the search to stop
+>>prematurely.  This saves a lot on the execution time when compressing.
+>>
+>>This version is totally compatible with the original version.  Even though
+>>lint(1) -p has no complaints about compress.c, it won't run on a 16-bit
+>>machine, due to the size of the arrays.
+>>
+>>Here is the README file from the original author:
+>> 
+>>>Well, with all this discussion about file compression (for news batching
+>>>in particular) going around, I decided to implement the text compression
+>>>algorithm described in the June Computer magazine.  The author claimed
+>>>blinding speed and good compression ratios.  It's certainly faster than
+>>>compact (but, then, what wouldn't be), but it's also the same speed as
+>>>pack, and gets better compression than both of them.  On 350K bytes of
+>>>Unix-wizards, compact took about 8 minutes of CPU, pack took about 80
+>>>seconds, and compress (herein) also took 80 seconds.  But, compact and
+>>>pack got about 30% compression, whereas compress got over 50%.  So, I
+>>>decided I had something, and that others might be interested, too.
+>>>
+>>>As is probably true of compact and pack (although I haven't checked),
+>>>the byte order within a word is probably relevant here, but as long as
+>>>you stay on a single machine type, you should be ok.  (Can anybody
+>>>elucidate on this?)  There are a couple of asm's in the code (extv and
+>>>insv instructions), so anyone porting it to another machine will have to
+>>>deal with this anyway (and could probably make it compatible with Vax
+>>>byte order at the same time).  Anyway, I've linted the code (both with
+>>>and without -p), so it should run elsewhere.  Note the longs in the
+>>>code, you can take these out if you reduce BITS to <= 15.
+>>>
+>>>Have fun, and as always, if you make good enhancements, or bug fixes,
+>>>I'd like to see them.
+>>>
+>>>=Spencer (thomas@utah-20, {harpo,hplabs,arizona}!utah-cs!thomas)
+>>
+>>                                     regards,
+>>                                     joe
+>>
+>>--
+>>Full-Name:  Joseph M. Orost
+>>UUCP:       ..!{decvax,ucbvax,ihnp4}!vax135!petsd!joe
+>>US Mail:    MS 313; Perkin-Elmer; 106 Apple St; Tinton Falls, NJ 07724
+>>Phone:      (201) 870-5844
diff --git a/compress/doc/revision.log b/compress/doc/revision.log
new file mode 100644 (file)
index 0000000..fb23b08
--- /dev/null
@@ -0,0 +1,124 @@
+/* $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.4 2001/08/13 14:06:30 ru Exp $ */
+
+/*
+ * $Header: /Users/Shared/file_cmds/file_cmds/compress/doc/revision.log,v 1.3 2005/04/12 23:51:24 nicolai Exp $
+ * $Log: revision.log,v $
+ * Revision 1.3  2005/04/12 23:51:24  nicolai
+ * merging Tiger back to head
+ *
+ * Revision 1.1.1.2  2004/07/21 04:59:15  llattanz
+ * Freshen source for standards conformance
+ *
+ * Revision 4.0  85/07/30  12:50:00  joe
+ * Removed ferror() calls in output routine on every output except first.
+ * Prepared for release to the world.
+ * 
+ * Revision 3.6  85/07/04  01:22:21  joe
+ * Remove much wasted storage by overlaying hash table with the tables
+ * used by decompress: tab_suffix[1<<BITS], stack[8000].  Updated USERMEM
+ * computations.  Fixed dump_tab() DEBUG routine.
+ *
+ * Revision 3.5  85/06/30  20:47:21  jaw
+ * Change hash function to use exclusive-or.  Rip out hash cache.  These
+ * speedups render the megamemory version defunct, for now.  Make decoder
+ * stack global.  Parts of the RCS trunks 2.7, 2.6, and 2.1 no longer apply.
+ *
+ * Revision 3.4  85/06/27  12:00:00  ken
+ * Get rid of all floating-point calculations by doing all compression ratio
+ * calculations in fixed point.
+ *
+ * Revision 3.3  85/06/24  21:53:24  joe
+ * Incorporate portability suggestion for M_XENIX.  Got rid of text on #else
+ * and #endif lines.  Cleaned up #ifdefs for vax and interdata.
+ *
+ * Revision 3.2  85/06/06  21:53:24  jaw
+ * Incorporate portability suggestions for Z8000, IBM PC/XT from mailing list.
+ * Default to "quiet" output (no compression statistics).
+ *
+ * Revision 3.1  85/05/12  18:56:13  jaw
+ * Integrate decompress() stack speedups (from early pointer mods by McKie).
+ * Repair multi-file USERMEM gaffe.  Unify 'force' flags to mimic semantics
+ * of SVR2 'pack'.  Streamline block-compress table clear logic.  Increase 
+ * output byte count by magic number size.
+ * 
+ * Revision 3.0   84/11/27  11:50:00  petsd!joe
+ * Set HSIZE depending on BITS.  Set BITS depending on USERMEM.  Unrolled
+ * loops in clear routines.  Added "-C" flag for 2.0 compatibility.  Used
+ * unsigned compares on Perkin-Elmer.  Fixed foreground check.
+ *
+ * Revision 2.7   84/11/16  19:35:39  ames!jaw
+ * Cache common hash codes based on input statistics; this improves
+ * performance for low-density raster images.  Pass on #ifdef bundle
+ * from Turkowski.
+ *
+ * Revision 2.6   84/11/05  19:18:21  ames!jaw
+ * Vary size of hash tables to reduce time for small files.
+ * Tune PDP-11 hash function.
+ *
+ * Revision 2.5   84/10/30  20:15:14  ames!jaw
+ * Junk chaining; replace with the simpler (and, on the VAX, faster)
+ * double hashing, discussed within.  Make block compression standard.
+ *
+ * Revision 2.4   84/10/16  11:11:11  ames!jaw
+ * Introduce adaptive reset for block compression, to boost the rate
+ * another several percent.  (See mailing list notes.)
+ *
+ * Revision 2.3   84/09/22  22:00:00  petsd!joe
+ * Implemented "-B" block compress.  Implemented REVERSE sorting of tab_next.
+ * Bug fix for last bits.  Changed fwrite to putchar loop everywhere.
+ *
+ * Revision 2.2   84/09/18  14:12:21  ames!jaw
+ * Fold in news changes, small machine typedef from thomas,
+ * #ifdef interdata from joe.
+ *
+ * Revision 2.1   84/09/10  12:34:56  ames!jaw
+ * Configured fast table lookup for 32-bit machines.
+ * This cuts user time in half for b <= FBITS, and is useful for news batching
+ * from VAX to PDP sites.  Also sped up decompress() [fwrite->putc] and
+ * added signal catcher [plus beef in writeerr()] to delete effluvia.
+ *
+ * Revision 2.0   84/08/28  22:00:00  petsd!joe
+ * Add check for foreground before prompting user.  Insert maxbits into
+ * compressed file.  Force file being uncompressed to end with ".Z".
+ * Added "-c" flag and "zcat".  Prepared for release.
+ *
+ * Revision 1.10  84/08/24  18:28:00  turtlevax!ken
+ * Will only compress regular files (no directories), added a magic number
+ * header (plus an undocumented -n flag to handle old files without headers),
+ * added -f flag to force overwriting of possibly existing destination file,
+ * otherwise the user is prompted for a response.  Will tack on a .Z to a
+ * filename if it doesn't have one when decompressing.  Will only replace
+ * file if it was compressed.
+ *
+ * Revision 1.9  84/08/16  17:28:00  turtlevax!ken
+ * Removed scanargs(), getopt(), added .Z extension and unlimited number of
+ * filenames to compress.  Flags may be clustered (-Ddvb12) or separated
+ * (-D -d -v -b 12), or combination thereof.  Modes and other status is
+ * copied with copystat().  -O bug for 4.2 seems to have disappeared with
+ * 1.8.
+ *
+ * Revision 1.8  84/08/09  23:15:00  joe
+ * Made it compatible with vax version, installed jim's fixes/enhancements
+ *
+ * Revision 1.6  84/08/01  22:08:00  joe
+ * Sped up algorithm significantly by sorting the compress chain.
+ *
+ * Revision 1.5  84/07/13  13:11:00  srd
+ * Added C version of vax asm routines.  Changed structure to arrays to
+ * save much memory.  Do unsigned compares where possible (faster on
+ * Perkin-Elmer)
+ *
+ * Revision 1.4  84/07/05  03:11:11  thomas
+ * Clean up the code a little and lint it.  (Lint complains about all
+ * the regs used in the asm, but I'm not going to "fix" this.)
+ *
+ * Revision 1.3  84/07/05  02:06:54  thomas
+ * Minor fixes.
+ *
+ * Revision 1.2  84/07/05  00:27:27  thomas
+ * Add variable bit length output.
+ *
+ */
+
+static char rcs_ident[] =
+       "$Header: /Users/Shared/file_cmds/file_cmds/compress/doc/revision.log,v 1.3 2005/04/12 23:51:24 nicolai Exp $";
diff --git a/compress/zcat.sh b/compress/zcat.sh
new file mode 100644 (file)
index 0000000..6799f46
--- /dev/null
@@ -0,0 +1,38 @@
+#!/bin/sh -
+#      $NetBSD: zcat.sh,v 1.4 1995/03/26 19:54:37 glass Exp $
+#
+# Copyright (c) 1992, 1993
+#      The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#      This product includes software developed by the University of
+#      California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#      @(#)zcat.sh     8.1 (Berkeley) 6/6/93
+#
+
+uncompress -c $*
index aba3cc8664905f489d67bd19135ca87aefa032c0..7ca7ec8940e131a973bc45c7f357819bedd61b44 100644 (file)
@@ -1,53 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = cp
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = extern.h
+Project = cp
+Install_Dir = /bin
 
 CFILES = cp.c utils.c
+MANPAGES = cp.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble cp.1
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS =
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/cp/Makefile.postamble b/cp/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/cp/Makefile.preamble b/cp/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/cp/PB.project b/cp/PB.project
deleted file mode 100644 (file)
index f0014c5..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (extern.h); 
-        OTHER_LINKED = (cp.c, utils.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, cp.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_COMPILEROPTIONS = ""; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = cp; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/cp/cp.c b/cp/cp.c
index f421cc9383ead6c51e7b104d8af6e52456cc4a80..c08ec23f3d1e155cf93bab1941d3377cdb1a2a49 100644 (file)
--- a/cp/cp.c
+++ b/cp/cp.c
@@ -290,7 +290,7 @@ copy(char *argv[], enum op type, int fts_options)
        mask = ~umask(0777);
        umask(~mask);
 
-       if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+       if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
                err(1, "fts_open");
        for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
                switch (curr->fts_info) {
index 2235939e248eb745f731929c671f595fc68ebfca..75d53d67d83bcfcce8d266d65b517a752e426d12 100644 (file)
@@ -79,6 +79,8 @@ copy_file(const FTSENT *entp, int dne)
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
        char *p;
 #endif
+       mode_t mode = 0;
+       struct stat to_stat;
 
        if ((from_fd = open(entp->fts_path, O_RDONLY, 0)) == -1) {
                warn("%s", entp->fts_path);
@@ -171,6 +173,16 @@ copy_file(const FTSENT *entp, int dne)
        }
 #endif /* __APPLE__ */
 
+       if (fstat(to_fd, &to_stat) != -1) {
+              mode = to_stat.st_mode;
+              if ((mode & (S_IRWXG|S_IRWXO))
+                  && fchmod(to_fd, mode & ~(S_IRWXG|S_IRWXO))) {
+                      warn("%s: fchmod failed", to.p_path);
+                      mode = 0;
+              }
+       } else {
+              warn("%s", to.p_path);
+       }
        /*
         * Mmap and write if less than 8M (the limit is so we don't totally
         * trash memory on big files.  This is really a minor hack, but it
@@ -248,7 +260,9 @@ copy_file(const FTSENT *entp, int dne)
         * or its contents might be irreplaceable.  It would only be safe
         * to remove it if we created it and its length is 0.
         */
-
+       if (mode != 0)
+               if (fchmod(to_fd, mode))
+                       warn("%s: fchmod failed", to.p_path);
 #ifdef __APPLE__
        /* do these before setfile in case copyfile changes mtime */
        if (!Xflag && S_ISREG(fs->st_mode)) { /* skip devices, etc */
diff --git a/csh/strpct.c b/csh/strpct.c
new file mode 100644 (file)
index 0000000..ac3b32d
--- /dev/null
@@ -0,0 +1,99 @@
+/*     $NetBSD: strpct.c,v 1.2 1998/05/08 18:43:54 fair Exp $  */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Erik E. Fair
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Calculate a percentage without resorting to floating point
+ * and return a pointer to a string
+ *
+ * "digits" is the number of digits past the decimal place you want
+ * (zero being the straight percentage with no decimals)
+ *
+ * Erik E. Fair <fair@clock.org>, May 8, 1997
+ */
+
+#include <sys/types.h>
+#include <machine/limits.h>
+
+#include <stdio.h>
+
+char * strpct __P((u_long, u_long, u_int));
+
+char *
+strpct(numerator, denominator, digits)
+       u_long  numerator, denominator;
+       u_int   digits;
+{
+        int i;
+        u_long result, factor;
+        static char     percent[32];
+
+        /* I should check for digit overflow here, too XXX */
+       factor = 100L;
+        for(i = 0; i < digits; i++) {
+                factor *= 10;
+        }
+
+        /* watch out for overflow! */
+        if (numerator < (ULONG_MAX / factor)) {
+                numerator *= factor;
+        } else {
+                /* toss some of the bits of lesser significance */
+                denominator /= factor;
+        }
+
+        if (denominator == 0L)
+                denominator = 1L;
+
+        result = numerator / denominator;
+
+        if (digits == 0) {
+                (void) snprintf(percent, sizeof(percent), "%lu%%", result);
+        } else {
+                char    fmt[32];
+
+                /* indirection to produce the right output format */
+                (void) snprintf(fmt, sizeof(fmt), "%%lu.%%0%ulu%%%%", digits);
+
+                factor /= 100L;         /* undo initialization */
+
+                (void) snprintf(percent, sizeof(percent),
+                        fmt, result / factor, result % factor);
+        }       
+
+        return(percent);
+}
index 323723af36e839c3d521af0b2986a3b92fa4b745..4b9c70f116eba8b9e7e51f6c0c201eff713fe085 100644 (file)
@@ -1,50 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = dd
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = dd.h extern.h
+Project = dd
+Install_Dir = /bin
 
 CFILES = args.c conv.c conv_tab.c dd.c misc.c position.c
+MANPAGES = dd.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble dd.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/dd/Makefile.postamble b/dd/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/dd/Makefile.preamble b/dd/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/dd/PB.project b/dd/PB.project
deleted file mode 100644 (file)
index db89643..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (dd.h, extern.h); 
-        OTHER_LINKED = (args.c, conv.c, conv_tab.c, dd.c, misc.c, position.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, dd.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = dd; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 36d8c06323388d80c3a059f248bc7a36696fbce4..67896b16a69763e27f36dfdb7bb62ff5a902d66f 100644 (file)
@@ -1,50 +1,14 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = df
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = df
+Install_Dir = /bin
 
 CFILES = df.c vfslist.c
+MANPAGES = df.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble df.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = -lutil
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID \
+       "-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \
+       -D_DARWIN_USE_64_BIT_INODE
+Extra_LD_Flags = -dead_strip \
+       -lutil
 
-ALL_CFLAGS += -I "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -D_DARWIN_USE_64_BIT_INODE
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/df/Makefile.postamble b/df/Makefile.postamble
deleted file mode 100644 (file)
index a480e49..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
diff --git a/df/Makefile.preamble b/df/Makefile.preamble
deleted file mode 100644 (file)
index 6fcac4e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-vpath strpct.c ../csh
-
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/df/PB.project b/df/PB.project
deleted file mode 100644 (file)
index b036be4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (df.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, df.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = df; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/df/df.1 b/df/df.1
index 7dd8624cce9245d6e1a873f4fa87fbefe7acdfe8..9067fcb8a2ac3d6b394cb2ddb7e215ff579c34c4 100644 (file)
--- a/df/df.1
+++ b/df/df.1
@@ -42,7 +42,7 @@
 .Nm df
 .Oo
 .Fl b | h | H | k |
-.Fl m | P
+.Fl m | g | P
 .Oc
 .Op Fl ailn
 .Op Fl t
diff --git a/df/df.c b/df/df.c
index 3438bca095571aa428b159a62d8711fadefd0b5d..e83cb396bd570582567a07b7712e6fe60fd5c51f 100644 (file)
--- a/df/df.c
+++ b/df/df.c
@@ -562,7 +562,7 @@ usage(void)
 
        char *t_flag = COMPAT_MODE("bin/df", "unix2003") ? "[-t]" : "[-t type]";
        (void)fprintf(stderr,
-           "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-T type] %s [filesystem ...]\n", t_flag);
+           "usage: df [-b | -H | -h | -k | -m | -g | -P] [-ailn] [-T type] %s [filesystem ...]\n", t_flag);
        exit(EX_USAGE);
 }
 
index c6c7ead6eb97cdd0d30887d54ba0f433e1d0d543..637be1b60745f9efa18be17b43afe153a1320a02 100644 (file)
@@ -1,49 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = du
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = du
+Install_Dir = /usr/bin
 
 CFILES = du.c
+MANPAGES = du.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble du.1
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/file_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/du/Makefile.postamble b/du/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/du/Makefile.preamble b/du/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/du/PB.project b/du/PB.project
deleted file mode 100644 (file)
index 6334025..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (du.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, du.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = du; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/du/du.1 b/du/du.1
index 51427a87f0d128dbbd97964ceed98d98b6f6542b..993a5ab22841a5619b5d180072be0c9319df2d39 100644 (file)
--- a/du/du.1
+++ b/du/du.1
@@ -43,7 +43,7 @@
 .Op Fl H | L | P
 .Op Fl a | s | d Ar depth
 .Op Fl c
-.Op Fl h | k | m
+.Op Fl h | k | m | g
 .Op Fl x
 .Op Fl I Ar mask
 .Op Ar
@@ -76,6 +76,8 @@ Gigabyte, Terabyte and Petabyte.
 .It Fl I Ar mask
 Ignore files and directories matching the specified
 .Ar mask .
+.It Fl g
+Display block counts in 1073741824-byte (1-Gbyte) blocks.
 .It Fl k
 Display block counts in 1024-byte (1-Kbyte) blocks.
 .It Fl L
diff --git a/du/du.c b/du/du.c
index 4a426eef05075b0cc9590b00f93dac6d2b88e64d..99564dafff539b719c623eb938014ea30c8ade0f 100644 (file)
--- a/du/du.c
+++ b/du/du.c
@@ -138,7 +138,7 @@ main(int argc, char *argv[])
        depth = INT_MAX;
        SLIST_INIT(&ignores);
 
-       while ((ch = getopt(argc, argv, "HI:LPasd:chkmrx")) != -1)
+       while ((ch = getopt(argc, argv, "HI:LPasd:cghkmrx")) != -1)
                switch (ch) {
                        case 'H':
                                Lflag = Pflag = 0;
@@ -186,6 +186,10 @@ main(int argc, char *argv[])
                                hflag = 0;
                                putenv("BLOCKSIZE=1048576");
                                break;
+                       case 'g':
+                               hflag = 0;
+                               putenv("BLOCKSIZE=1g");
+                               break;
                        case 'r':                /* Compatibility. */
                                break;
                        case 'x':
@@ -537,7 +541,7 @@ static void
 usage(void)
 {
        (void)fprintf(stderr,
-               "usage: du [-H | -L | -P] [-a | -s | -d depth] [-c] [-h | -k | -m] [-x] [-I mask] [file ...]\n");
+               "usage: du [-H | -L | -P] [-a | -s | -d depth] [-c] [-h | -k | -m | -g] [-x] [-I mask] [file ...]\n");
        exit(EX_USAGE);
 }
 
index d36083c8598e7d7961b66884956ce4d954f5d47d..8b297383677ad2605880119770ce48e12dad7727 100644 (file)
@@ -1,50 +1,12 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = install
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = pathnames.h
+Project = install
+Install_Dir = /usr/bin
 
 CFILES = xinstall.c
+MANPAGES = install.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble install.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID \
+       -include TargetConditionals.h
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/install/Makefile.postamble b/install/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/install/Makefile.preamble b/install/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/install/PB.project b/install/PB.project
deleted file mode 100644 (file)
index 519a9e7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (pathnames.h); 
-        OTHER_LINKED = (xinstall.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, install.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = install; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index e6d732f8d004e212cb9ecbccb73b6c4ac436bfac..0b3e56780df15585a2b55ce06df96057b836cb1d 100644 (file)
@@ -730,7 +730,7 @@ strip(to_name)
                errno = serrno;
                err(EX_TEMPFAIL, "fork");
        case 0:
-               execlp("strip", "strip", to_name, NULL);
+               execlp("strip", "strip", "-", to_name, NULL);
                err(EX_OSERR, "exec(strip)");
        default:
                if (wait(&status) == -1 || status) {
index c14dc3eec9d12eecc971dd0ab5c2d97d45f2bf1b..eedfdbbfbaebc2780e4904af0871e37ab0c567e6 100644 (file)
@@ -1,49 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = ipcrm
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = ipcrm
+Install_Dir = /usr/bin
 
 CFILES = ipcrm.c
+MANPAGES = ipcrm.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ipcrm.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS =
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+        -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/ipcrm/Makefile.postamble b/ipcrm/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/ipcrm/Makefile.preamble b/ipcrm/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/ipcrm/PB.project b/ipcrm/PB.project
deleted file mode 100644 (file)
index 6304e07..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (ipcrm.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ipcrm.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = ipcrm; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index f2ac495ab4f3e36672fd71a4770085f5714e832a..0d77995c3a06f49067ec6cf55aebe3920b4040c7 100644 (file)
@@ -1,45 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = ipcs
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = ipcs
+Install_Dir = /usr/bin
 
 CFILES = ipcs.c
+MANPAGES = ipcs.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ipcs.1
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-NEXTSTEP_PB_CFLAGS = -iquote "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" -iquote "$(SDKROOT)/System/Library/Frameworks/Kernel.framework/PrivateHeaders"
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+        -D__FBSDID=__RCSID \
+       -iquote \
+       "$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \
+       -iquote \
+       "$(SDKROOT)/System/Library/Frameworks/Kernel.framework/PrivateHeaders"
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+Install_Program_Mode = 04511
diff --git a/ipcs/Makefile.postamble b/ipcs/Makefile.postamble
deleted file mode 100644 (file)
index 54e0481..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-INSTALL_AS_USER     = root
-INSTALL_PERMISSIONS = 4511
diff --git a/ipcs/Makefile.preamble b/ipcs/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/ipcs/PB.project b/ipcs/PB.project
deleted file mode 100644 (file)
index 3caab57..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (ipcs.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ipcs.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = ipcs; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index db22a08052a4c71ae9be8656e516f6683160307b..8716c954567ced74eb3ee706fb777bf42abdc67a 100644 (file)
@@ -1,50 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = ln
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = ln
+Install_Dir = /bin
 
 CFILES = ln.c
+MANPAGES = ln.1 symlink.7
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ln.1\
-            symlink.7
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/ln \
+               $(DSTROOT)$(Install_Dir)/link
+       $(LN) -f $(DSTROOT)/usr/share/man/man1/ln.1 \
+               $(DSTROOT)/usr/share/man/man1/link.1
diff --git a/ln/Makefile.postamble b/ln/Makefile.postamble
deleted file mode 100644 (file)
index b347e1a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/link
-       mkdir -p "$(DSTROOT)/usr/share/man/man1"
-       ln -f "$(DSTROOT)/usr/share/man/man1/ln.1" "$(DSTROOT)/usr/share/man/man1/link.1"
-
diff --git a/ln/Makefile.preamble b/ln/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/ln/PB.project b/ln/PB.project
deleted file mode 100644 (file)
index fe1d0a7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (ln.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ln.1, symlink.7); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = ln; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index f593549c563fa36e5e21136375a4d3765b11f39e..8523d35718106387915fee8a98f7bcac170355d6 100644 (file)
@@ -1,52 +1,16 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = ls
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = extern.h ls.h
+Project = ls
+Install_Dir = /bin
 
 CFILES = cmp.c ls.c print.c util.c humanize_number.c
-
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ls.1
-
-OTHER_CFLAGS = -DCOLORLS -I/System/Library/Frameworks/System.framework/PrivateHeaders -D__FBSDID=__RCSID -D_DARWIN_USE_64_BIT_INODE
-OTHER_LDFLAGS = -lncurses
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+MANPAGES = ls.1
+
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID \
+       "-I$(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders" \
+       -DCOLORLS \
+       -D_DARWIN_USE_64_BIT_INODE \
+       -include TargetConditionals.h
+Extra_LD_Flags = -dead_strip \
+       -lncurses
+
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/ls/Makefile.postamble b/ls/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/ls/Makefile.preamble b/ls/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/ls/PB.project b/ls/PB.project
deleted file mode 100644 (file)
index 32e2a56..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (extern.h, ls.h); 
-        OTHER_LINKED = (cmp.c, ls.c, print.c, stat_flags.c, util.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, ls.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = ls; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index d26e5adc18137259d814dc4e4676e36051f73db4..bf85a88f8e22e57954757b0fd83c4e352929da2d 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = mkdir
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = mkdir
+Install_Dir = /bin
 
 CFILES = mkdir.c
+MANPAGES = mkdir.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mkdir.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/mkdir/Makefile.postamble b/mkdir/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/mkdir/Makefile.preamble b/mkdir/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/mkdir/PB.project b/mkdir/PB.project
deleted file mode 100644 (file)
index 0d6316a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (mkdir.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mkdir.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = mkdir; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index ed49dbe538f1d597d6e250991a049851993b8cff..9cd7b57baff40349057d3117aedf01cf8006d0c7 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = mkfifo
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = mkfifo
+Install_Dir = /usr/bin
 
 CFILES = mkfifo.c
+MANPAGES = mkfifo.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mkfifo.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/mkfifo/Makefile.postamble b/mkfifo/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/mkfifo/Makefile.preamble b/mkfifo/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/mkfifo/PB.project b/mkfifo/PB.project
deleted file mode 100644 (file)
index b348276..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (mkfifo.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mkfifo.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = mkfifo; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index b91bcdc5099b6c69051e5361183e1e826ac032ee..e764c7b158ad3e6e19a437b6b5ec8465b65a403d 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = mknod
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = mknod
+Install_Dir = /sbin
 
 CFILES = mknod.c
+MANPAGES = mknod.8
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mknod.8
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /sbin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/mknod/Makefile.postamble b/mknod/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/mknod/Makefile.preamble b/mknod/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/mknod/PB.project b/mknod/PB.project
deleted file mode 100644 (file)
index db5f15a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (mknod.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mknod.8); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /sbin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = mknod; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index dbee24e7da85f595656080d77ffe9a4f57dad226..0f859bd4aa80b9158670f6a1039eb97d2a570b13 100644 (file)
@@ -1,51 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = mtree
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = extern.h mtree.h
-
-CFILES = compare.c create.c excludes.c misc.c mtree.c spec.c specspec.c verify.c
-
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mtree.8
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID -DENABLE_MD5 -DENABLE_RMD160 -DENABLE_SHA1
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/sbin
-LIBS = -lmd -lcrypto
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+Project = mtree
+Install_Dir = /usr/sbin
+
+CFILES = compare.c create.c excludes.c misc.c mtree.c spec.c specspec.c \
+       verify.c \
+       ../cksum/crc.c
+MANPAGES = mtree.8
+
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID \
+       -DENABLE_MD5 \
+       -DENABLE_RMD160 \
+       -DENABLE_SHA1
+Extra_LD_Flags = -dead_strip \
+       -lmd -lcrypto
+
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/mtree/Makefile.postamble b/mtree/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/mtree/Makefile.preamble b/mtree/Makefile.preamble
deleted file mode 100644 (file)
index 65868da..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-vpath crc.c ../cksum
-
-CFILES += crc.c
-
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/mtree/PB.project b/mtree/PB.project
deleted file mode 100644 (file)
index 22cc839..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (extern.h, mtree.h); 
-        OTHER_LINKED = (compare.c, create.c, misc.c, mtree.c, spec.c, verify.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mtree.8); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/sbin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = mtree; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
diff --git a/mtree/test/test00.sh b/mtree/test/test00.sh
new file mode 100644 (file)
index 0000000..a2e4b28
--- /dev/null
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (c) 2003 Poul-Henning Kamp
+# All rights reserved.
+#
+# Please see src/share/examples/etc/bsd-style-copyright.
+#
+# $FreeBSD: src/usr.sbin/mtree/test/test00.sh,v 1.3 2003/11/05 22:26:08 phk Exp $
+#
+
+set -e
+
+TMP=/tmp/mtree.$$
+
+rm -rf ${TMP}
+mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt
+
+
+mkdir ${TMP}/mt/foo
+mkdir ${TMP}/mr/\*
+mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1
+if [ -d ${TMP}/mt/foo ] ; then
+       echo "ERROR Mtree create fell for filename with '*' char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+rmdir ${TMP}/mr/\*
+
+mkdir -p ${TMP}/mt/foo
+mkdir ${TMP}/mr/\[f\]oo
+mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1
+if [ -d ${TMP}/mt/foo ] ; then
+       echo "ERROR Mtree create fell for filename with '[' char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+rmdir ${TMP}/mr/\[f\]oo
+
+mkdir -p ${TMP}/mt/foo
+mkdir ${TMP}/mr/\?oo
+mtree -c -p ${TMP}/mr | mtree -U -r -p ${TMP}/mt > /dev/null 2>&1
+if [ -d ${TMP}/mt/foo ] ; then
+       echo "ERROR Mtree create fell for filename with '?' char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+rmdir ${TMP}/mr/\?oo
+
+mkdir ${TMP}/mr/\#
+mtree -c -p ${TMP}/mr > ${TMP}/_
+if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then
+       true
+else
+       echo "ERROR Mtree create fell for filename with '#' char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+       
+if [ ! -d ${TMP}/mt/\# ] ; then
+       echo "ERROR Mtree update failed to create name with '#' char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+rmdir ${TMP}/mr/\#
+
+rm -rf ${TMP}
+exit 0
diff --git a/mtree/test/test01.sh b/mtree/test/test01.sh
new file mode 100644 (file)
index 0000000..d056b91
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Copyright (c) 2003 Poul-Henning Kamp
+# All rights reserved.
+#
+# Please see src/share/examples/etc/bsd-style-copyright.
+#
+# $FreeBSD: src/usr.sbin/mtree/test/test01.sh,v 1.1 2003/10/30 12:01:32 phk Exp $
+#
+
+set -e
+
+TMP=/tmp/mtree.$$
+
+rm -rf ${TMP}
+mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt
+
+
+ln -s "xx this=is=wrong" ${TMP}/mr/foo
+mtree -c -p ${TMP}/mr > ${TMP}/_
+
+if mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null 2>&1 ; then
+       true
+else
+       echo "ERROR Mtree failed on symlink with space char" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+
+x=x`(cd ${TMP}/mr ; ls -l foo 2>&1) || true`
+y=x`(cd ${TMP}/mt ; ls -l foo 2>&1) || true`
+
+if [ "$x" != "$y" ] ; then
+       echo "ERROR Recreation of spaced symlink failed" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+
+rm -rf ${TMP}
+exit 0
diff --git a/mtree/test/test02.sh b/mtree/test/test02.sh
new file mode 100644 (file)
index 0000000..450ebb3
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright (c) 2003 Dan Nelson
+# All rights reserved.
+#
+# Please see src/share/examples/etc/bsd-style-copyright.
+#
+# $FreeBSD: src/usr.sbin/mtree/test/test02.sh,v 1.1 2003/10/31 13:39:19 phk Exp $
+#
+
+set -e
+
+TMP=/tmp/mtree.$$
+
+rm -rf ${TMP}
+mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt
+
+touch -t 199901020304 ${TMP}/mr/oldfile
+touch ${TMP}/mt/oldfile
+
+mtree -c -p ${TMP}/mr > ${TMP}/_ 
+
+mtree -U -r -p ${TMP}/mt < ${TMP}/_ > /dev/null
+
+x=x`(cd ${TMP}/mr ; ls -l 2>&1) || true`
+y=x`(cd ${TMP}/mt ; ls -l 2>&1) || true`
+
+if [ "$x" != "$y" ] ; then
+       echo "ERROR Update of mtime failed" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+
+rm -rf ${TMP}
+exit 0
+
diff --git a/mtree/test/test03.sh b/mtree/test/test03.sh
new file mode 100644 (file)
index 0000000..52e08c3
--- /dev/null
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# Copyright (c) 2003 Poul-Henning Kamp
+# All rights reserved.
+#
+# Please see src/share/examples/etc/bsd-style-copyright.
+#
+# $FreeBSD: src/usr.sbin/mtree/test/test03.sh,v 1.2 2005/03/29 11:44:17 tobez Exp $
+#
+
+set -e
+
+TMP=/tmp/mtree.$$
+
+rm -rf ${TMP}
+mkdir -p ${TMP}
+
+K=uid,uname,gid,gname,flags,md5digest,size,ripemd160digest,sha1digest,sha256digest,cksum
+
+rm -rf _FOO
+mkdir _FOO
+touch _FOO/_uid
+touch _FOO/_size
+touch _FOO/zztype
+
+touch _FOO/_bar
+mtree -c -K $K -p .. > ${TMP}/_r
+mtree -c -K $K -p .. > ${TMP}/_r2
+rm -rf _FOO/_bar 
+
+rm -rf _FOO/zztype
+mkdir _FOO/zztype
+
+date > _FOO/_size
+
+chown nobody _FOO/_uid
+
+touch _FOO/_foo
+mtree -c -K $K -p .. > ${TMP}/_t
+
+rm -fr _FOO
+
+if mtree -f ${TMP}/_r -f ${TMP}/_r2 ; then
+       true
+else
+       echo "ERROR Compare identical failed" 1>&2
+       exit 1
+fi
+       
+if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then
+       echo "ERROR Compare different succeeded" 1>&2
+       exit 1
+fi
+
+if [ `wc -l  < ${TMP}/_` -ne 10 ] ; then
+       echo "ERROR wrong number of lines: `wc -l  ${TMP}/_`" 1>&2
+       exit 1
+fi
+       
+exit 0
diff --git a/mtree/test/test04.sh b/mtree/test/test04.sh
new file mode 100644 (file)
index 0000000..453d146
--- /dev/null
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Copyright (c) 2003 Dan Nelson
+# All rights reserved.
+#
+# Please see src/share/examples/etc/bsd-style-copyright.
+#
+# $FreeBSD: src/usr.sbin/mtree/test/test04.sh,v 1.1 2003/11/13 11:02:57 phk Exp $
+#
+
+set -e
+
+TMP=/tmp/mtree.$$
+
+rm -rf ${TMP}
+mkdir -p ${TMP} ${TMP}/mr ${TMP}/mt
+
+mkdir ${TMP}/mr/a
+mkdir ${TMP}/mr/b
+mkdir ${TMP}/mt/a
+mkdir ${TMP}/mt/b
+touch ${TMP}/mt/z
+
+mtree -c -p ${TMP}/mr > ${TMP}/_r
+mtree -c -p ${TMP}/mt > ${TMP}/_t
+
+if mtree -f ${TMP}/_r -f ${TMP}/_t > ${TMP}/_ ; then
+       echo "ERROR wrong exit on difference" 1>&2
+       exit 1
+fi
+
+if [ `wc -l < ${TMP}/_` -ne 1 ] ; then
+       echo "ERROR spec/spec compare generated wrong output" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+
+if mtree -f ${TMP}/_t -f ${TMP}/_r > ${TMP}/_ ; then
+       echo "ERROR wrong exit on difference" 1>&2
+       exit 1
+fi
+
+if [ `wc -l < ${TMP}/_` -ne 1 ] ; then
+       echo "ERROR spec/spec compare generated wrong output" 1>&2
+       rm -rf ${TMP}
+       exit 1
+fi
+
+rm -rf ${TMP}
+exit 0
+
index 52e16a45c394e88bc6855176219c675828555b72..635b9abf7b7a56b31a2b547d25266c3f14032a71 100644 (file)
@@ -1,50 +1,12 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = mv
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = pathnames.h
+Project = mv
+Install_Dir = /bin
 
 CFILES = mv.c
+MANPAGES = mv.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble mv.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
diff --git a/mv/Makefile.postamble b/mv/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/mv/Makefile.preamble b/mv/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/mv/PB.project b/mv/PB.project
deleted file mode 100644 (file)
index 626c69c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (pathnames.h); 
-        OTHER_LINKED = (mv.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, mv.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = mv; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index afd7d69051831830459eee4fed8e79697aeedf60..c32e972a27d53aade9aadff7f68ccda455b9ab02 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = pathchk
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = pathchk
+Install_Dir = /usr/bin
 
 CFILES = pathchk.c
+MANPAGES = pathchk.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble pathchk.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/pathchk/Makefile.postamble b/pathchk/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/pathchk/Makefile.preamble b/pathchk/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/pathchk/PB.project b/pathchk/PB.project
deleted file mode 100644 (file)
index 2ba4aa7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (pathchk.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, pathchk.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = pathchk; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 85168dfbbf071ad54492bdb8a8e41659d80cf38d..1176049027397271b8cf555118267aa2f52a264b 100644 (file)
@@ -1,53 +1,16 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = pax
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
-
-HFILES = cache.h cpio.h extern.h ftree.h options.h pat_rep.h pax.h\
-         sel_subs.h tables.h tar.h
+Project = pax
+Install_Dir = /bin
 
 CFILES = ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c\
          ftree.c gen_subs.c getoldopt.c options.c pat_rep.c pax.c\
          sel_subs.c tables.c tar.c tty_subs.c pax_format.c
+MANPAGES = pax.1 cpio.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble pax.1 cpio.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/pax $(DSTROOT)/usr/bin/cpio
diff --git a/pax/Makefile.postamble b/pax/Makefile.postamble
deleted file mode 100644 (file)
index 43c51ec..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(USRBINDIR)/cpio
diff --git a/pax/Makefile.preamble b/pax/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/pax/PB.project b/pax/PB.project
deleted file mode 100644 (file)
index 834db59..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        H_FILES = (
-            cache.h, 
-            cpio.h, 
-            extern.h, 
-            ftree.h, 
-            options.h, 
-            pat_rep.h, 
-            pax.h, 
-            sel_subs.h, 
-            tables.h, 
-            tar.h
-        ); 
-        OTHER_LINKED = (
-            ar_io.c, 
-            ar_subs.c, 
-            buf_subs.c, 
-            cache.c, 
-            cpio.c, 
-            file_subs.c, 
-            ftree.c, 
-            gen_subs.c, 
-            getoldopt.c, 
-            options.c, 
-            pat_rep.c, 
-            pax.c, 
-            sel_subs.c, 
-            tables.c, 
-            tar.c, 
-            tty_subs.c
-        ); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, pax.1, cpio.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = pax; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 02058f6eb76408374515dab53d7664082afbe1ef..c8e4ee568547604b03962a2e3d9fa0745c63d571 100644 (file)
@@ -227,12 +227,12 @@ lnk_creat(ARCHD *arcn)
 
        if (S_ISLNK(sb.st_mode)) {
                int res;
-               char buff[NAME_MAX+1];
+               char buff[PATH_MAX+1];
                /* 
                 * Conformance: cannot make hard link to symlink - just make a 
                 * symlink to the target of the symlink
                 */
-               if ((res = readlink(arcn->ln_name, buff, sizeof(buff))) < 0) {
+               if ((res = readlink(arcn->ln_name, buff, sizeof(buff)-1)) < 0) {
                        syswarn(1,errno,"Unable to symlink to %s from %s", arcn->ln_name,
                                    arcn->name);
                        return(-1);
diff --git a/pax/pax_format.h b/pax/pax_format.h
new file mode 100644 (file)
index 0000000..506ce58
--- /dev/null
@@ -0,0 +1,153 @@
+/*     $OpenBSD: tar.h,v 1.7 2003/06/02 23:32:09 millert Exp $ */
+/*     $NetBSD: tar.h,v 1.3 1995/03/21 09:07:51 cgd Exp $      */
+
+/*-
+ * Copyright (c) 1992 Keith Muller.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Keith Muller of the University of California, San Diego.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)tar.h       8.2 (Berkeley) 4/18/94
+ */
+
+/*
+ * defines and data structures common to all tar formats
+ */
+#define CHK_LEN                8               /* length of checksum field */
+#define TNMSZ          100             /* size of name field */
+#ifdef _PAX_
+#define NULLCNT                2               /* number of null blocks in trailer */
+#define CHK_OFFSET     148             /* start of chksum field */
+#define BLNKSUM                256L            /* sum of checksum field using ' ' */
+#endif /* _PAX_ */
+
+/*
+ * Values used in typeflag field in all tar formats
+ * (only REGTYPE, LNKTYPE and SYMTYPE are used in old bsd tar headers)
+ */
+#define        REGTYPE         '0'             /* Regular File */
+#define        AREGTYPE        '\0'            /* Regular File */
+#define        LNKTYPE         '1'             /* Link */
+#define        SYMTYPE         '2'             /* Symlink */
+#define        CHRTYPE         '3'             /* Character Special File */
+#define        BLKTYPE         '4'             /* Block Special File */
+#define        DIRTYPE         '5'             /* Directory */
+#define        FIFOTYPE        '6'             /* FIFO */
+#define        CONTTYPE        '7'             /* high perf file */
+
+/*
+ * GNU tar compatibility;
+ */
+#define        LONGLINKTYPE    'K'             /* Long Symlink */
+#define        LONGNAMETYPE    'L'             /* Long File */
+
+/*
+ * Mode field encoding of the different file types - values in octal
+ */
+#define TSUID          04000           /* Set UID on execution */
+#define TSGID          02000           /* Set GID on execution */
+#define TSVTX          01000           /* Reserved */
+#define TUREAD         00400           /* Read by owner */
+#define TUWRITE                00200           /* Write by owner */
+#define TUEXEC         00100           /* Execute/Search by owner */
+#define TGREAD         00040           /* Read by group */
+#define TGWRITE                00020           /* Write by group */
+#define TGEXEC         00010           /* Execute/Search by group */
+#define TOREAD         00004           /* Read by other */
+#define TOWRITE                00002           /* Write by other */
+#define TOEXEC         00001           /* Execute/Search by other */
+
+#ifdef _PAX_
+/*
+ * Pad with a bit mask, much faster than doing a mod but only works on powers
+ * of 2. Macro below is for block of 512 bytes.
+ */
+#define TAR_PAD(x)     ((512 - ((x) & 511)) & 511)
+#endif /* _PAX_ */
+
+/*
+ * structure of an old tar header as it appeared in BSD releases
+ */
+typedef struct {
+       char name[TNMSZ];               /* name of entry */
+       char mode[8];                   /* mode */
+       char uid[8];                    /* uid */
+       char gid[8];                    /* gid */
+       char size[12];                  /* size */
+       char mtime[12];                 /* modification time */
+       char chksum[CHK_LEN];           /* checksum */
+       char linkflag;                  /* norm, hard, or sym. */
+       char linkname[TNMSZ];           /* linked to name */
+} HD_TAR;
+
+#ifdef _PAX_
+/*
+ * -o options for BSD tar to not write directories to the archive
+ */
+#define TAR_NODIR      "nodir"
+#define TAR_OPTION     "write_opt"
+
+/*
+ * default device names
+ */
+#define        DEV_0           "/dev/rst0"
+#define        DEV_1           "/dev/rst1"
+#define        DEV_4           "/dev/rst4"
+#define        DEV_5           "/dev/rst5"
+#define        DEV_7           "/dev/rst7"
+#define        DEV_8           "/dev/rst8"
+#endif /* _PAX_ */
+
+/*
+ * Data Interchange Format - Extended tar header format - POSIX 1003.1-1990
+ */
+#define TPFSZ          155
+#define        TMAGIC          "ustar"         /* ustar and a null */
+#define        TMAGLEN         6
+#define        TVERSION        "00"            /* 00 and no null */
+#define        TVERSLEN        2
+
+typedef struct {
+       char name[TNMSZ];               /* name of entry */
+       char mode[8];                   /* mode */
+       char uid[8];                    /* uid */
+       char gid[8];                    /* gid */
+       char size[12];                  /* size */
+       char mtime[12];                 /* modification time */
+       char chksum[CHK_LEN];           /* checksum */
+       char typeflag;                  /* type of file. */
+       char linkname[TNMSZ];           /* linked to name */
+       char magic[TMAGLEN];            /* magic cookie */
+       char version[TVERSLEN];         /* version */
+       char uname[32];                 /* ascii owner name */
+       char gname[32];                 /* ascii group name */
+       char devmajor[8];               /* major device number */
+       char devminor[8];               /* minor device number */
+       char prefix[TPFSZ];             /* linked to name */
+} HD_USTAR;
index f5573473cfc1a424f722efa25e004a4c6ec146e6..d37084b282ce0ad62eaa9359e59a5a2c048362fe 100644 (file)
@@ -1,48 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = rm
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = rm
+Install_Dir = /bin
 
 CFILES = rm.c
+MANPAGES = rm.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rm.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/rm \
+               $(DSTROOT)$(Install_Dir)/unlink
+       $(LN) -f $(DSTROOT)/usr/share/man/man1/rm.1 \
+               $(DSTROOT)/usr/share/man/man1/unlink.1
diff --git a/rm/Makefile.postamble b/rm/Makefile.postamble
deleted file mode 100644 (file)
index bc9f08f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/unlink
-       mkdir -p "$(DSTROOT)/usr/share/man/man1"
-       ln -f "$(DSTROOT)/usr/share/man/man1/rm.1" "$(DSTROOT)/usr/share/man/man1/unlink.1"
diff --git a/rm/Makefile.preamble b/rm/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/rm/PB.project b/rm/PB.project
deleted file mode 100644 (file)
index 9eb1a48..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (rm.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rm.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = rm; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 9eb48aa4f10fe2fab0779ef615f2e5330414a727..3e0b933d44f4d55a0c432c9a35b6196d72046b30 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = rmdir
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = rmdir
+Install_Dir = /bin
 
 CFILES = rmdir.c
+MANPAGES = rmdir.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rmdir.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/rmdir/Makefile.postamble b/rmdir/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/rmdir/Makefile.preamble b/rmdir/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/rmdir/PB.project b/rmdir/PB.project
deleted file mode 100644 (file)
index 8475318..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (rmdir.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rmdir.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = rmdir; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 805eda7ed4687fea1d9afc5dee64b91f939d9f95..f372506158a0214efb89782e7689c12d4e08cddc 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = rmt
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = rmt
+Install_Dir = /usr/sbin
 
 CFILES = rmt.c
+MANPAGES = rmt.8
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble rmt.8
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/sbin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+        -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/rmt/Makefile.postamble b/rmt/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/rmt/Makefile.preamble b/rmt/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/rmt/PB.project b/rmt/PB.project
deleted file mode 100644 (file)
index 08efaea..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (rmt.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, rmt.8); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/sbin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = rmt; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index b7a027df53c23af477ae54a65b9e9f9efc86a49d..ce271068919236501c1c00cc860efcba909989d6 100644 (file)
@@ -1,49 +1,9 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
+Project = shar
+Install_Dir = /usr/bin
 
-NAME = shar
+MANPAGES = shar.1
 
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
-OTHERLINKED = shar.sh
-
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble shar.1
-
-OTHERLINKEDOFILES = shar.o
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
-
--include Makefile.dependencies
+after_install:
+       $(INSTALL_SCRIPT) shar.sh $(DSTROOT)/$(Install_Dir)/shar
diff --git a/shar/Makefile.postamble b/shar/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/shar/Makefile.preamble b/shar/Makefile.preamble
deleted file mode 100644 (file)
index eaa3b46..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SHELLTOOL = shar.sh
-
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/shar/PB.project b/shar/PB.project
deleted file mode 100644 (file)
index ed6df54..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (shar.sh); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, shar.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = shar; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 5bad274801071e1c69303db6a8b801988f2c836a..9afcd22ea54bfb8722e393aae49c592c1d31f400 100644 (file)
@@ -1,50 +1,17 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = stat
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = stat
+Install_Dir = /usr/bin
 
 CFILES = stat.c
+MANPAGES = stat.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble stat.1
-
-OTHER_CFLAGS = -D__FBSDID=__RCSID
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-NEXTSTEP_PB_CFLAGS =
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/$(NAME)/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+        -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.postamble
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
 
--include Makefile.dependencies
+after_install:
+       $(LN) -f $(DSTROOT)$(Install_Dir)/stat \
+                $(DSTROOT)$(Install_Dir)/readlink
+       $(LN) -f $(DSTROOT)/usr/share/man/man1/stat.1 \
+                $(DSTROOT)/usr/share/man/man1/readlink.1
diff --git a/stat/Makefile.postamble b/stat/Makefile.postamble
deleted file mode 100644 (file)
index 9d53ad2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
-
-after_install::
-       $(LINKPRODUCT) $(DSTROOT)$(INSTALLDIR)/readlink
-       mkdir -p "$(DSTROOT)/usr/share/man/man1"
-       ln -f "$(DSTROOT)/usr/share/man/man1/stat.1" "$(DSTROOT)/usr/share/man/man1/readlink.1"
diff --git a/stat/Makefile.preamble b/stat/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/stat/PB.project b/stat/PB.project
deleted file mode 100644 (file)
index 0d40a66..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (stat.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, stat.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = "/tmp/$(NAME)/Build"; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = stat; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}
index 774770c6190d6c6507cf9410d001bcc651df161d..ad77a263cd09ebee147d96d68267e9f86dbab349 100644 (file)
@@ -1,48 +1,11 @@
-#
-# Generated by the NeXT Project Builder.
-#
-# NOTE: Do NOT change this file -- Project Builder maintains it.
-#
-# Put all of your customizations in files called Makefile.preamble
-# and Makefile.postamble (both optional), and Makefile will include them.
-#
-
-NAME = touch
-
-PROJECTVERSION = 2.8
-PROJECT_TYPE = Tool
+Project = touch
+Install_Dir = /usr/bin
 
 CFILES = touch.c
+MANPAGES = touch.1
 
-OTHERSRCS = Makefile Makefile.preamble Makefile.postamble touch.1
-
-
-MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles
-CODE_GEN_STYLE = DYNAMIC
-MAKEFILE = tool.make
-NEXTSTEP_INSTALLDIR = /usr/bin
-LIBS = 
-DEBUG_LIBS = $(LIBS)
-PROF_LIBS = $(LIBS)
-
-
-
-
-NEXTSTEP_BUILD_OUTPUT_DIR = /tmp/developer_cmds/Build
-
-NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
-WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
-PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc
-NEXTSTEP_JAVA_COMPILER = /usr/bin/javac
-WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe
-PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac
-
-include $(MAKEFILEDIR)/platform.make
-
--include Makefile.preamble
-
-include $(MAKEFILEDIR)/$(MAKEFILE)
-
--include Makefile.postamble
+Extra_CC_Flags = -Wall -mdynamic-no-pic \
+       -D__FBSDID=__RCSID 
+Extra_LD_Flags = -dead_strip
 
--include Makefile.dependencies
+include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
diff --git a/touch/Makefile.postamble b/touch/Makefile.postamble
deleted file mode 100644 (file)
index 013b558..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
diff --git a/touch/Makefile.preamble b/touch/Makefile.preamble
deleted file mode 100644 (file)
index 9e10e90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
diff --git a/touch/PB.project b/touch/PB.project
deleted file mode 100644 (file)
index 0f39cfd..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    DYNAMIC_CODE_GEN = YES; 
-    FILESTABLE = {
-        FRAMEWORKS = (); 
-        OTHER_LINKED = (touch.c); 
-        OTHER_SOURCES = (Makefile, Makefile.preamble, Makefile.postamble, touch.1); 
-    }; 
-    LANGUAGE = English; 
-    LOCALIZABLE_FILES = {}; 
-    MAKEFILEDIR = "$(MAKEFILEPATH)/pb_makefiles"; 
-    NEXTSTEP_BUILDDIR = /tmp/developer_cmds/Build; 
-    NEXTSTEP_BUILDTOOL = /bin/gnumake; 
-    NEXTSTEP_INSTALLDIR = /usr/bin; 
-    NEXTSTEP_JAVA_COMPILER = /usr/bin/javac; 
-    NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc; 
-    PDO_UNIX_BUILDTOOL = $NEXT_ROOT/Developer/bin/make; 
-    PDO_UNIX_JAVA_COMPILER = "$(NEXTDEV_BIN)/javac"; 
-    PDO_UNIX_OBJCPLUS_COMPILER = "$(NEXTDEV_BIN)/gcc"; 
-    PROJECTNAME = touch; 
-    PROJECTTYPE = Tool; 
-    PROJECTVERSION = 2.8; 
-    WINDOWS_BUILDTOOL = $NEXT_ROOT/Developer/Executables/make; 
-    WINDOWS_JAVA_COMPILER = "$(JDKBINDIR)/javac.exe"; 
-    WINDOWS_OBJCPLUS_COMPILER = "$(DEVDIR)/gcc"; 
-}