summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2007-12-05 14:20:32 +0000
committerobrien <obrien@FreeBSD.org>2007-12-05 14:20:32 +0000
commitc906fa6ae15f8d6fbece583bacd2692ade4abee5 (patch)
tree1396a979d38a34e4e4cb3ccdb882a1b8b73c1ae9 /contrib
parentee5d1c23afb70f7590e56bfad52645822f60d673 (diff)
downloadFreeBSD-src-c906fa6ae15f8d6fbece583bacd2692ade4abee5.zip
FreeBSD-src-c906fa6ae15f8d6fbece583bacd2692ade4abee5.tar.gz
This commit was generated by cvs2svn to compensate for changes in r174289,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/amd/m4/GNUmakefile155
-rwxr-xr-xcontrib/amd/m4/amdgrep7
-rwxr-xr-xcontrib/amd/m4/amindent328
-rwxr-xr-xcontrib/amd/m4/autopat36
-rwxr-xr-xcontrib/amd/m4/chop-aclocal.pl19
-rwxr-xr-xcontrib/amd/m4/copy-if-newbig29
-rw-r--r--contrib/amd/m4/macros/HEADER13
-rw-r--r--contrib/amd/m4/macros/TRAILER2
-rwxr-xr-xcontrib/amd/m4/mk-aclocal18
-rwxr-xr-xcontrib/amd/m4/mkconf20
-rwxr-xr-xcontrib/amd/m4/rmtspc6
-rwxr-xr-xcontrib/amd/m4/update_build_version22
12 files changed, 0 insertions, 655 deletions
diff --git a/contrib/amd/m4/GNUmakefile b/contrib/amd/m4/GNUmakefile
deleted file mode 100644
index f35fef5..0000000
--- a/contrib/amd/m4/GNUmakefile
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# THIS MAKEFILE IS FOR am-utils maintainers only!
-#
-# GNUmakefile for remaking configuration files.
-#
-# Erez Zadok <ezk@cs.columbia.edu>
-#
-
-AUTOCONF=autoconf --localdir=./m4 ./m4/configure.in
-AUTOHEADER=autoheader --localdir=./m4 ./m4/configure.in
-#AUTOMAKE=./m4/automake --include-deps --amdir=./m4/amdir
-#AUTOMAKE=automake --include-deps --no-intermediates --localdir=./m4
-#AUTOMAKE=automake --include-deps --localdir=./m4
-AUTOMAKE=automake --include-deps --altdir=./m4
-ACLOCAL=aclocal --altdir=./m4
-MK_ACLOCAL=./mk-aclocal
-
-CUTWARNMSG="warning: AC_TRY_RUN called without default to allow cross compilin"
-CUTWARNMSG2="AC_OUTPUT_COMMANDS|autoupdate"
-AMFILES=../Makefile.am $(wildcard ../*/Makefile.am)
-INAMFILES=$(AMFILES:.am=.in)
-ACFILES=$(wildcard macros/*.m4 macros/HEADER macros/TRAILER m4/aclocal.m4)
-
-LOG=/tmp/amu-${USER}.log
-
-TOPDIR=..
-VPATH=
-
-all: testdir ${TOPDIR}/configure config.h.in ${TOPDIR}/Makefile.in \
- GNUmakefile stamp-h.in
-
-config: all $(TOPDIR)/buildall aux_conf.h.in
- (cd ${TOPDIR} && ./buildall -c)
-
-dconfig: all $(TOPDIR)/buildall aux_conf.h.in
- (cd ${TOPDIR} && ./buildall -C)
-
-qconfig: all $(TOPDIR)/buildall aux_conf.h.in
- (cd ${TOPDIR} && ./buildall -q)
-
-build: all $(TOPDIR)/buildall aux_conf.h.in
- (cd ${TOPDIR} && ./buildall -b)
-
-world: all $(TOPDIR)/buildall aux_conf.h.in
- (cd ${TOPDIR} && ./buildall)
-
-testdir: ${TOPDIR}/amd/amd.c
-
-${TOPDIR}/configure: configure.in aclocal.m4
- -(cd ${TOPDIR} && ${AUTOCONF} > configure.new 2> ${LOG})
- -@egrep -v ${CUTWARNMSG} ${LOG} > ${LOG}.new ; mv ${LOG}.new ${LOG}
- @echo '############################################################'
- @echo 'Checking for "AC_OUTPUT_COMMANDS" warnings:'
- @echo ' (If you see any output, fix this when autoconf/automake are'
- @echo ' back in sync in their CVS trees. -ezk, 2/10/00)'
- -@egrep ${CUTWARNMSG2} ${LOG}
- -@egrep -v ${CUTWARNMSG2} ${LOG} > ${LOG}.new ; mv ${LOG}.new ${LOG}
- @echo '############################################################'
- @if test -s ${LOG}; then cat ${LOG}; exit 2; fi
- -mv ../configure ../configure.old
- mv ../configure.new ../configure
- rm -f ../configure.old
- chmod a+rx $@
-
-config.h.in: configure.in acconfig.h
- -(cd ${TOPDIR} && ${AUTOHEADER} > ./m4/config.h.in 2> ${LOG})
- -@egrep -v ${CUTWARNMSG} ${LOG} > ${LOG}.new ; mv ${LOG}.new ${LOG}
- @echo '############################################################'
- @echo 'Checking for "AC_OUTPUT_COMMANDS" warnings:'
- @echo ' (If you see any output, fix this when autoconf/automake are'
- @echo ' back in sync in their CVS trees. -ezk, 2/10/00)'
- -@egrep ${CUTWARNMSG2} ${LOG}
- -@egrep -v ${CUTWARNMSG2} ${LOG} > ${LOG}.new ; mv ${LOG}.new ${LOG}
- @echo '############################################################'
- @if test -s ${LOG}; then cat ${LOG}; exit 2; fi
-
-${TOPDIR}/Makefile.in: ${AMFILES} configure.in aclocal.m4
- (cd ${TOPDIR} && ${AUTOMAKE})
- @rm -f ${LOG}
-
-aclocal.m4: ${ACFILES} configure.in
- rm -f $@
- ${MK_ACLOCAL} > acinclude.m4
- (cd ${TOPDIR} && ${ACLOCAL})
-
-stamp-h.in: ${AMFILES} config.h.in aclocal.m4 aux_conf.h.in
- echo timestamp > $@
-
-clean:
- rm -f ${TOPDIR}/configure config.h.in $(INAMFILES) aclocal.m4 stamp.h.in
-
-##############################################################################
-# maintainer rules to update autoconf/automake/libtool files distributed with
-# am-utils. -Erez.
-
-P1s=/usr/local/gnu/share/automake
-P2s=/usr/local/gnu/share/libtool
-P1=/usr/local/gnu/lib/automake
-P2=/usr/local/gnu/lib/libtool
-P3=/misc/mirror/gnu/prep/config
-P4=/misc/mirror/gnu/prep
-ICMD=./m4/copy-if-newbig
-CPCMD=cp -p
-
-update: \
- config.guess \
- config.sub \
- doc/texinfo.tex
-# depcomp \
-# install-sh \
-# ltconfig \
-# ltmain.sh \
-# mdate-sh \
-# missing \
-# mkinstalldirs \
-
-config.guess:: $(P1s)/config.guess
- $(ICMD) $? $@
-config.guess:: $(P2s)/config.guess
- $(ICMD) $? $@
-config.guess:: $(P3)/config.guess
- $(ICMD) $? $@
-
-config.sub:: $(P1s)/config.sub
- $(ICMD) $? $@
-config.sub:: $(P2s)/config.sub
- $(ICMD) $? $@
-config.sub:: $(P3)/config.sub
- $(ICMD) $? $@
-
-depcomp:: $(P1)/depcomp
- $(CPCMD) $? $@
-
-install-sh: $(P1)/install-sh
- $(CPCMD) $? $@
-
-ltconfig: $(P2)/ltconfig
- $(CPCMD) $? $@
-
-ltmain.sh: $(P2)/ltmain.sh
- $(CPCMD) $? $@
-
-mdate-sh: $(P1)/mdate-sh
- $(CPCMD) $? $@
-
-missing: $(P1)/missing
- $(CPCMD) $? $@
-
-mkinstalldirs: $(P1)/mkinstalldirs
- $(CPCMD) $? $@
-
-doc/texinfo.tex: $(P4)/texinfo.tex
- $(CPCMD) $? $@
-
-##############################################################################
diff --git a/contrib/amd/m4/amdgrep b/contrib/amd/m4/amdgrep
deleted file mode 100755
index 86dffbf..0000000
--- a/contrib/amd/m4/amdgrep
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec egrep -n "$*" \
- [a-z]*/*.[hcyl] \
- conf/*/*.[hc] \
- Makefile.am \
- [a-z]*/Makefile.am \
- m4/macros/*.m4
diff --git a/contrib/amd/m4/amindent b/contrib/amd/m4/amindent
deleted file mode 100755
index 8c4f7fc..0000000
--- a/contrib/amd/m4/amindent
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/bin/sh
-# indent all am-utils files
-if [ ! -f amd/amd.c ]; then
- # maybe we are in a subdir
- echo cd ..
- cd ..
-fi
-if [ ! -f amd/amd.c ]; then
- echo "please run $0 from the top level of the am-utils source tree"
- exit 2
-fi
-
-# files="
-# */*.[hc]
-# */*.h.in
-# conf/*/*.[hc]
-# OLD/*/*.[hc]
-# "
-#files="conf/*/*.[hc]"
-files="specify_the_file.c"
-
-sunopts="
--npro
--nbad
--bap
--bbb
--nbc
--br
--ncdb
--d0
--di0
--nei
--eei
--nfc1
--i2
--lp
--nsc
--TIntFuncPtr
--Tadd_fn
--Taddrlist
--Tam_node
--Tam_ops
--Tam_opts
--Tam_stats
--Tamq_mount_info
--Tamq_mount_info_list
--Tamq_mount_stats
--Tamq_mount_tree
--Tamq_mount_tree_list
--Tamq_mount_tree_p
--Tamq_opt
--Tamq_setopt
--Tamq_string
--Tattrstat
--Tauto_tree
--Tautomount
--Tcallout
--Tcreateargs
--Tdict
--Tdict_data
--Tdict_ent
--Tdirlist
--Tdiropargs
--Tdiropokres
--Tdiropres
--Tdirpath
--Tdisk_fs
--Tentry
--Tether_if
--Texportnode
--Texports
--Tfattr
--Tfh_cache
--Tfhandle
--Tfhandle_t
--Tfhstatus
--Tfilename
--Tfserver
--Tfsmount
--Tftype
--Tfwd_fun
--Tgid_t
--Tgroupnode
--Tgroups
--Thost
--Tioloc
--Tkv
--Tlinkargs
--Tmap_type
--Tmnt_map
--Tmntfs
--Tmntlist
--Tmount
--Tmountbody
--Tmountlist
--Tname
--Tnfs_fh
--Tnfs_private
--Tnfscookie
--Tnfspath
--Tnfsstat
--Tnfstime
--Tnfsx_mnt
--Tnsw_lookup
--Tnsw_switchconfig
--Topt_apply
--Tpid_t
--Tpjob
--Tqelem
--Treadargs
--Treaddirargs
--Treaddirres
--Treadlinkres
--Treadokres
--Treadres
--Trenameargs
--Trpc_forward
--Tsattr
--Tsattrargs
--Tserv_state
--Tstatfsokres
--Tstatfsres
--Tsymlinkargs
--Ttask_fun
--Ttime_t
--Ttime_type
--Tuid2home_t
--Tuid_t
--Tusername2uid_t
--Tvffserver
--Tvfmount_fs
--Tvfs_init
--Tvfs_match
--Tvfumount_fs
--Tvmount_fs
--Tvmounted
--Tvoidp
--Tvumount_fs
--Tvumounted
--Twriteargs
-"
-
-gnuopts="
--npro
--nbad
--bap
--sob
--fca
--nfc1
--ncdb
--br
--ce
--ss
--npcs
--cs
--nbc
--psl
--lp
--sc
--T IntFuncPtr
--T add_fn
--T addrlist
--T am_node
--T am_ops
--T am_opts
--T am_stats
--T amq_mount_info
--T amq_mount_info_list
--T amq_mount_stats
--T amq_mount_tree
--T amq_mount_tree_list
--T amq_mount_tree_p
--T amq_opt
--T amq_setopt
--T amq_string
--T attrstat
--T auto_tree
--T automount
--T callout
--T createargs
--T dict
--T dict_data
--T dict_ent
--T dirlist
--T diropargs
--T diropokres
--T diropres
--T dirpath
--T disk_fs
--T entry
--T ether_if
--T exportnode
--T exports
--T fattr
--T fh_cache
--T fhandle
--T fhandle_t
--T fhstatus
--T filename
--T fserver
--T fsmount
--T ftype
--T fwd_fun
--T gid_t
--T groupnode
--T groups
--T host
--T ioloc
--T kv
--T linkargs
--T map_type
--T mnt_map
--T mntfs
--T mntlist
--T mount
--T mountbody
--T mountlist
--T name
--T nfs_fh
--T nfs_private
--T nfscookie
--T nfspath
--T nfsstat
--T nfstime
--T nfsx_mnt
--T nsw_lookup
--T nsw_switchconfig
--T opt_apply
--T pid_t
--T pjob
--T qelem
--T readargs
--T readdirargs
--T readdirres
--T readlinkres
--T readokres
--T readres
--T renameargs
--T rpc_forward
--T sattr
--T sattrargs
--T serv_state
--T statfsokres
--T statfsres
--T symlinkargs
--T task_fun
--T time_t
--T time_type
--T uid2home_t
--T uid_t
--T username2uid_t
--T vffserver
--T vfmount_fs
--T vfs_init
--T vfs_match
--T vfumount_fs
--T vmount_fs
--T vmounted
--T voidp
--T vumount_fs
--T vumounted
--T writeargs
-"
-
-
-#prefix=".C"
-
-# check args
-if [ $# -lt 1 ]; then
- echo "Usage: $0 <-g|-s> [files...]"
- exit 1
-fi
-if [ $1 = "-g" -o "$1" = "-s" ]; then
- OPT=$1
- shift
-else
- echo "Usage: $0 <-g|-s> [files...]"
- exit 1
-fi
-# check if specified files to process
-if [ $# -gt 0 ]; then
- files="$*"
-fi
-
-for i in ${files}; do
- if [ ! -f $i ]; then
- echo "No such file: $i"
- continue
- fi
-
- case $OPT in
-
- -g )
- icmd="/usr/local/gnu/bin/indent"
- cmd="${icmd} $i -o $i$prefix $gnuopts"
- showcmd="${icmd} $i -o $i$prefix"
-
- ;;
-
- -s )
- icmd="/opt/SUNWspro/bin/indent"
- cmd="${icmd} $i $i$prefix $sunopts"
- showcmd="${icmd} $i $i$prefix"
- ;;
-
- * )
- echo "Usage: $0 <-g|-s>"
- exit 1
- ;;
- esac
-
- echo ${showcmd}
- ${cmd}
- if [ $? != 0 ]; then
- echo Failed!
- exit $?
- fi
-
- # remove trailing spaces
- cmd="./m4/rmtspc $i"
- echo ${cmd}
- ${cmd}
- if [ $? != 0 ]; then
- echo Failed!
- exit $?
- fi
-
-done
diff --git a/contrib/amd/m4/autopat b/contrib/amd/m4/autopat
deleted file mode 100755
index 1b1ed77..0000000
--- a/contrib/amd/m4/autopat
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash -norc
-# find patterns of cache entries to automatically remove from config.cache
-# Used by am-utils developers.
-# Erez Zadok <ezk@cs.columbia.edu>
-#set -x
-
-macdir="../m4/macros"
-
-# find the right directory
-if [ ! -d $macdir ]; then
- echo "Could not find $macdir directory."
- exit 2
-fi
-
-# skip if no config.cache file
-if [ ! -f config.cache ]; then
- echo "Not in the A.cpu-company-system."
- exit 2
-fi
-
-# look for files that changed vs. config.cache
-pat=""
-for i in ${macdir}/*.m4; do
- if test $i -nt config.cache; then
- n=`egrep '^ac_cv_' $i |sed 's/[^a-zA-Z0-9_].*//g'|sort|uniq`
- if test -z "$n"; then
- continue;
- fi
- if test -z "$pat"; then
- pat="$n"
- else
- pat="$pat|$n"
- fi
- fi
-done
-echo "$pat"
diff --git a/contrib/amd/m4/chop-aclocal.pl b/contrib/amd/m4/chop-aclocal.pl
deleted file mode 100755
index 2bf6b75..0000000
--- a/contrib/amd/m4/chop-aclocal.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/perl -w
-
-$seq = 1;
-$file = "";
-$file = sprintf("tmp/%02d.m4", $seq);
-open(FILE, ">$file") || die "cannot open \"$file\": $!";
-printf(STDOUT "FILE: $file\n");
-while (<>) {
- if (/^$/) {
- close(FILE);
- $seq++;
- $file = sprintf("tmp/%02d.m4", $seq);
- open(FILE, ">$file") || die "cannot open \"$file\": $!";
- printf(STDOUT "FILE: $file\n");
- next;
- }
- printf FILE;
-}
-close(FILE);
diff --git a/contrib/amd/m4/copy-if-newbig b/contrib/amd/m4/copy-if-newbig
deleted file mode 100755
index 3438c52..0000000
--- a/contrib/amd/m4/copy-if-newbig
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl -w
-# copy a file if it is both newer and bigger in size
-# if copying, first rename older file to .orig
-
-$src = $ARGV[0];
-$dst = $ARGV[1];
-# dev,ino,mode,nlink,uid,gid,rdev,size,atime,mtime,ctime,blksize,blocks
-@srcstat = stat($src);
-@dststat = stat($dst);
-
-$srcsize = $srcstat[7];
-$srcmtime = $srcstat[9];
-$dstsize = $dststat[7];
-$dstmtime = $dststat[9];
-
-# copy if src file is bigger and newer
-if ($srcsize > $dstsize && $srcmtime > $dstmtime) {
- print "mv -f $dst $dst.orig\n";
- system("mv -f $dst $dst.orig");
- print "cp -p $src $dst\n";
- system("cp -p $src $dst");
- die "cp command failed" if ($? != 0);
-}
-# make sure dst file has newer timestamp
-if ($srcmtime > $dstmtime) {
- print "touch $dst\n";
- system("touch $dst");
-}
-exit(0);
diff --git a/contrib/amd/m4/macros/HEADER b/contrib/amd/m4/macros/HEADER
deleted file mode 100644
index 928095f..0000000
--- a/contrib/amd/m4/macros/HEADER
+++ /dev/null
@@ -1,13 +0,0 @@
-dnl aclocal.m4 file for am-utils-6.x
-dnl Contains definitions for specialized GNU-autoconf macros.
-dnl Author: Erez Zadok <ezk@cs.columbia.edu>
-dnl
-dnl DO NOT EDIT DIRECTLY! Generated automatically by maintainers from
-dnl m4/GNUmakefile!
-dnl
-dnl ######################################################################
-dnl UNCOMMENT THE NEXT FEW LINES FOR DEBUGGING CONFIGURE
-dnl define([AC_CACHE_LOAD], )dnl
-dnl define([AC_CACHE_SAVE], )dnl
-dnl ======================================================================
-
diff --git a/contrib/amd/m4/macros/TRAILER b/contrib/amd/m4/macros/TRAILER
deleted file mode 100644
index 0e77c354..0000000
--- a/contrib/amd/m4/macros/TRAILER
+++ /dev/null
@@ -1,2 +0,0 @@
-dnl ######################################################################
-dnl end of aclocal.m4 for am-utils-6.x
diff --git a/contrib/amd/m4/mk-aclocal b/contrib/amd/m4/mk-aclocal
deleted file mode 100755
index 4f9f020..0000000
--- a/contrib/amd/m4/mk-aclocal
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Make am-utils' aclocal.m4 file (concatendated from others).
-# For maintainers only.
-# Erez Zadok <ezk@cs.columbia.edu>
-
-if [ ! -d macros ]; then
- echo no macros directory found!
- exit 2
-fi
-cd macros
-for i in HEADER *.m4; do
- cat $i
- echo
- echo
-done
-cat TRAILER
-exit 0
diff --git a/contrib/amd/m4/mkconf b/contrib/amd/m4/mkconf
deleted file mode 100755
index 04fc92d..0000000
--- a/contrib/amd/m4/mkconf
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -norc
-# (re)make the autoconf configuration files.
-# Used by am-utils maintainers only!
-#
-# Erez Zadok <ezk@cs.columbia.edu>
-#
-#set -x
-
-if [ ! -f amd/amd.c ]; then
- cd ..
-fi
-if [ ! -f amd/amd.c ]; then
- cd ..
-fi
-if [ ! -f amd/amd.c ]; then
- echo "wrong directory!"
- exit 1
-fi
-
-cd m4 && make $*
diff --git a/contrib/amd/m4/rmtspc b/contrib/amd/m4/rmtspc
deleted file mode 100755
index 431691d..0000000
--- a/contrib/amd/m4/rmtspc
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# remove trailing spaces from C code
-#set -x
-for i in $*; do
- sed 's/[ ]*$//g' < $i > $i.tmp_$$ && mv $i.tmp_$$ $i
-done
diff --git a/contrib/amd/m4/update_build_version b/contrib/amd/m4/update_build_version
deleted file mode 100755
index e221abd..0000000
--- a/contrib/amd/m4/update_build_version
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Update the build version file for am-utils
-# Erez Zadok <ezk@cs.columbia.edu>
-#set -x
-
-file="build_version.h"
-vers=1
-
-if test -f $file
-then
- egrep AMU_BUILD_VERSION $file | while read a b vers
- do
- vers=`expr $vers + 1`
- echo '/* do not edit this file by hand */' > $file
- echo '/* auto-generated by update_build_version script */' >> $file
- echo '#define AMU_BUILD_VERSION '$vers >> $file
- done
-else
- echo '/* do not edit this file by hand */' > $file
- echo '/* auto-generated by update_build_version script */' >> $file
- echo '#define AMU_BUILD_VERSION '$vers >> $file
-fi
OpenPOWER on IntegriCloud