Tidy up some of the configs; s/gcc/cc/ to make the choice of C compiler

more generic. Fix paths for things like scripts (fix perldoc). Tweak
externally passed macros.

4 files changed, 41 insertions, 41 deletions

diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index 0558e44..8d229ad 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -61,7 +61,7 @@ cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
 ccflags='-fno-strict-aliasing -DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
 ccflags_uselargefiles=''
-ccname='gcc'
+ccname='cc'
 ccsymbols='__FreeBSD_cc_version=500002 __GNUC_MINOR__=95 __alpha=1 __alpha__=1 __unix=1 __unix__=1 cpu=alpha machine=alpha system=FreeBSD system=unix'
 ccversion=''
 cf_by='markm'
@@ -633,7 +633,7 @@ nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 old_pthread_create_joinable=''
-optimize=${CFLAGS:-''}
+optimize="${CFLAGS}"
 orderlib='false'
 osname='freebsd'
 osvers='5.0-current'
@@ -655,8 +655,8 @@ plibpth=''
 pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr/local'
-prefixexp='/usr/local'
+prefix='/usr'
+prefixexp='/usr'
 privlib='/usr/libdata/perl/5.6.1'
 privlibexp='/usr/libdata/perl/5.6.1'
 prototype='define'
@@ -686,8 +686,8 @@ sPRIu64='"lu"'
 sPRIx64='"lx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
-scriptdir='/usr/local/bin'
-scriptdirexp='/usr/local/bin'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
 sed='sed'
 seedfunc='srand48'
 selectminbits='64'
@@ -817,18 +817,18 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
 config_argc=16
-config_arg1='-Dprefix=/usr/local'
+config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.6.1/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.6.1'
 config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
 config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
-config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg8='-Dinstallbin=/usr/bin'
 config_arg9='-Dinstallsitebin=/usr/local/bin'
-config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/bin'
 config_arg11='-Dman1dir=/usr/local/man/man1'
 config_arg12='-Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3'
 config_arg13='-Duseshrplib=true'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
index 0a299cd..3033c6e 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -61,7 +61,7 @@ cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
 ccflags='-fno-strict-aliasing -DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
 ccflags_uselargefiles=''
-ccname='gcc'
+ccname='cc'
 ccsymbols='__FreeBSD_cc_version=500002 __GNUC_MINOR__=95 __i386=1 __i386__=1 __unix=1 __unix__=1 cpu=i386 machine=i386 system=FreeBSD system=unix'
 ccversion=''
 cf_by='markm'
@@ -633,7 +633,7 @@ nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 old_pthread_create_joinable=''
-optimize=${CFLAGS:-''}
+optimize="${CFLAGS}"
 orderlib='false'
 osname='freebsd'
 osvers='5.0-current'
@@ -655,8 +655,8 @@ plibpth=''
 pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr/local'
-prefixexp='/usr/local'
+prefix='/usr'
+prefixexp='/usr'
 privlib='/usr/libdata/perl/5.6.1'
 privlibexp='/usr/libdata/perl/5.6.1'
 prototype='define'
@@ -686,8 +686,8 @@ sPRIu64='"llu"'
 sPRIx64='"llx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
-scriptdir='/usr/local/bin'
-scriptdirexp='/usr/local/bin'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
 sed='sed'
 seedfunc='srand48'
 selectminbits='32'
@@ -817,18 +817,18 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
 config_argc=16
-config_arg1='-Dprefix=/usr/local'
+config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.6.1/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.6.1'
 config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
 config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
-config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg8='-Dinstallbin=/usr/bin'
 config_arg9='-Dinstallsitebin=/usr/local/bin'
-config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/bin'
 config_arg11='-Dman1dir=/usr/local/man/man1'
 config_arg12='-Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3'
 config_arg13='-Duseshrplib=true'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.ia64 b/gnu/usr.bin/perl/libperl/config.SH-elf.ia64
index 0b017a1..930d9f1 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.ia64
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.ia64
@@ -61,7 +61,7 @@ cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
 ccflags='-fno-strict-aliasing -DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
 ccflags_uselargefiles=''
-ccname='gcc'
+ccname='cc'
 ccsymbols='__FreeBSD__=5 __FreeBSD_cc_version=500001 __GNUC_MINOR__=95 __ia64=1 __ia64__=1 __unix=1 __unix__=1 cpu=ia64 machine=ia64 system=FreeBSD system=unix'
 ccversion=''
 cf_by='markm'
@@ -633,7 +633,7 @@ nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 old_pthread_create_joinable=''
-optimize=${CFLAGS:-''}
+optimize="${CFLAGS}"
 orderlib='false'
 osname='freebsd'
 osvers='5.0-current'
@@ -655,8 +655,8 @@ plibpth=''
 pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr/local'
-prefixexp='/usr/local'
+prefix='/usr'
+prefixexp='/usr'
 privlib='/usr/libdata/perl/5.6.1'
 privlibexp='/usr/libdata/perl/5.6.1'
 prototype='define'
@@ -686,8 +686,8 @@ sPRIu64='"lu"'
 sPRIx64='"lx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
-scriptdir='/usr/local/bin'
-scriptdirexp='/usr/local/bin'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
 sed='sed'
 seedfunc='srand48'
 selectminbits='64'
@@ -817,18 +817,18 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
 config_argc=16
-config_arg1='-Dprefix=/usr/local'
+config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.6.1/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.6.1'
 config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
 config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
-config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg8='-Dinstallbin=/usr/bin'
 config_arg9='-Dinstallsitebin=/usr/local/bin'
-config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/bin'
 config_arg11='-Dman1dir=/usr/local/man/man1'
 config_arg12='-Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3'
 config_arg13='-Duseshrplib=true'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64 b/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64
index 8ea287e..699d301 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64
@@ -57,11 +57,11 @@ c=''
 castflags='0'
 cat='cat'
 cc='cc'
-cccdlflags='-DPIC -fPIC'
+cccdlflags='-DPIC -fpic'
 ccdlflags=' -Wl,-R/usr/lib'
 ccflags='-fno-strict-aliasing -DAPPLLIB_EXP="/usr/libdata/perl/BSDPAN"'
 ccflags_uselargefiles=''
-ccname='gcc'
+ccname='cc'
 ccsymbols='__FreeBSD_cc_version=500002 __GNUC_MINOR__=95 __sparc64=1 __sparc64__=1 __unix=1 __unix__=1 cpu=sparc64 machine=sparc64 system=FreeBSD system=unix'
 ccversion=''
 cf_by='markm'
@@ -633,7 +633,7 @@ nvtype='double'
 o_nonblock='O_NONBLOCK'
 obj_ext='.o'
 old_pthread_create_joinable=''
-optimize=${CFLAGS:-''}
+optimize="${CFLAGS}"
 orderlib='false'
 osname='freebsd'
 osvers='5.0-current'
@@ -655,8 +655,8 @@ plibpth=''
 pm_apiversion='5.005'
 pmake=''
 pr=''
-prefix='/usr/local'
-prefixexp='/usr/local'
+prefix='/usr'
+prefixexp='/usr'
 privlib='/usr/libdata/perl/5.6.1'
 privlibexp='/usr/libdata/perl/5.6.1'
 prototype='define'
@@ -686,8 +686,8 @@ sPRIu64='"lu"'
 sPRIx64='"lx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
-scriptdir='/usr/local/bin'
-scriptdirexp='/usr/local/bin'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
 sed='sed'
 seedfunc='srand48'
 selectminbits='64'
@@ -817,18 +817,18 @@ zcat=''
 zip='zip'
 # Configure command line arguments.
 config_arg0='Configure'
-config_args='-Dprefix=/usr/local -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/local/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/local/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
+config_args='-Dprefix=/usr -Darchlib=/usr/libdata/perl/5.6.1/mach -Dprivlib=/usr/libdata/perl/5.6.1 -Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach -Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1 -Dinstallbin=/usr/bin -Dinstallsitebin=/usr/local/bin -Dinstallscript=/usr/bin -Dman1dir=/usr/local/man/man1 -Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3 -Duseshrplib=true -Ulocincpth= -Uloclibpth= -Dpager=/usr/bin/more'
 config_argc=16
-config_arg1='-Dprefix=/usr/local'
+config_arg1='-Dprefix=/usr'
 config_arg2='-Darchlib=/usr/libdata/perl/5.6.1/mach'
 config_arg3='-Dprivlib=/usr/libdata/perl/5.6.1'
 config_arg4='-Dsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg5='-Dsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
 config_arg6='-Dinstallsitearch=/usr/local/lib/perl5/site_perl/5.6.1/mach'
 config_arg7='-Dinstallsitelib=/usr/local/lib/perl5/site_perl/5.6.1'
-config_arg8='-Dinstallbin=/usr/local/bin'
+config_arg8='-Dinstallbin=/usr/bin'
 config_arg9='-Dinstallsitebin=/usr/local/bin'
-config_arg10='-Dinstallscript=/usr/local/bin'
+config_arg10='-Dinstallscript=/usr/bin'
 config_arg11='-Dman1dir=/usr/local/man/man1'
 config_arg12='-Dman3dir=/usr/local/lib/perl5/5.6.1/man/man3'
 config_arg13='-Duseshrplib=true'