211 lines
6.6 KiB
Text
211 lines
6.6 KiB
Text
$NetBSD: patch-ar,v 1.2 2005/05/29 14:38:33 wiz Exp $
|
|
|
|
--- progs/tools/gluinstall.pl.orig 1997-09-12 01:28:03.000000000 +0200
|
|
+++ progs/tools/gluinstall.pl
|
|
@@ -1,6 +1,9 @@
|
|
#!%%PERL_PATH%%
|
|
|
|
-$glunix_base = "%%GLUNIX_DIR%%/release";
|
|
+$install_man = "/usr/bin/install -c -m 644 -o glunix -g glunix ";
|
|
+$install_bin = "/usr/bin/install -c -m 755 -o glunix -g glunix ";
|
|
+$imkdir = "/usr/bin/install -d -m 755 -o glunix -g glunix";
|
|
+$glunix_base = "%%GLUNIX_BASE%%";
|
|
$now_base = "%%INSTALL_DIR%%";
|
|
$http_base = "%%HTTP_BASE%%";
|
|
$util_base = "%%GLUNIX_DIR%%/util";
|
|
@@ -21,13 +24,13 @@ if ($ARGV[0] eq "-test") {
|
|
# Create directories
|
|
#
|
|
|
|
-&my_mkdir("$now_base/bin");
|
|
-&my_mkdir("$now_base/lib");
|
|
-&my_mkdir("$now_base/include");
|
|
-&my_mkdir("$now_base/man");
|
|
-if ($http_base ne "") {
|
|
- &my_mkdir("$http_base/man/html");
|
|
-}
|
|
+#&my_mkdir("$now_base/bin");
|
|
+#&my_mkdir("$now_base/lib");
|
|
+#&my_mkdir("$now_base/include");
|
|
+#&my_mkdir("$now_base/man");
|
|
+#if ($http_base ne "") {
|
|
+# &my_mkdir("$http_base/man/html");
|
|
+#}
|
|
|
|
#######################################################################
|
|
#
|
|
@@ -48,22 +51,43 @@ if ($http_base ne "") {
|
|
# Install include files/directories
|
|
#
|
|
|
|
-@files = <$glunix_base/glunix/include/*>;
|
|
-@files = &strip_garbage(@files);
|
|
+#@files = <$glunix_base/glunix/include/*>;
|
|
+#@files = &strip_garbage(@files);
|
|
#print "Found include files: ", join(" ", @dirs), "\n";
|
|
|
|
-foreach $val (@files) {
|
|
- $install_path = "$now_base/include/" . &path_tail($val);
|
|
- print "Installing $install_path\n";
|
|
- if ($justTesting) {
|
|
- print "Unlinking $install_path\n";
|
|
- print "Linking $install_path to $val\n";
|
|
- } else {
|
|
- unlink($install_path);
|
|
- symlink($val, $install_path);
|
|
- }
|
|
+#foreach $val (@files) {
|
|
+# $install_path = "$now_base/include/" . &path_tail($val);
|
|
+# print "Installing $install_path\n";
|
|
+# if ($justTesting) {
|
|
+# print "Unlinking $install_path\n";
|
|
+# print "Linking $install_path to $val\n";
|
|
+# } else {
|
|
+# unlink($install_path);
|
|
+# system("$install_man $val $install_path");
|
|
+# }
|
|
+#}
|
|
+# create necc dirs.
|
|
+system("$imkdir $now_base/include");
|
|
+system("$imkdir $now_base/lib/$glunix_arch");
|
|
+system("$imkdir $now_base/bin/$glunix_arch");
|
|
+system("$imkdir $now_base/include/glib");
|
|
+system("$imkdir $now_base/lib/perl-lib/Time");
|
|
+system("$imkdir $now_base/man");
|
|
+
|
|
+system("$install_bin $glunix_base/glunix/bin/$glunix_arch/master $now_base/bin/$glunix_arch");
|
|
+system("$install_bin $glunix_base/glunix/bin/$glunix_arch/daemon $now_base/bin/$glunix_arch");
|
|
+system("$install_man $glunix_base/glunix/include/glib/*.h $now_base/include/glib");
|
|
+system("$install_man $glunix_base/glunix/include/*.h $now_base/include");
|
|
+system("$install_man $glunix_base/progs/tools/perl-lib/Time/* $now_base/lib/perl-lib/Time");
|
|
+system("$install_man $glunix_base/progs/tools/perl-lib/*.pl $now_base/lib/perl-lib");
|
|
+system("cp -R -p $glunix_base/glunix/man/* $now_base/man");
|
|
+system("rm $now_base/man/Makefile");
|
|
+@chownme = `find $glunix_base/glunix/man -name \\*`;
|
|
+foreach (@chownme) {
|
|
+ chomp;
|
|
+ $_ =~ s+$glunix_base/glunix/man++;
|
|
+ system("chown glunix:glunix $now_base/man/$_");
|
|
}
|
|
-
|
|
print "\n";
|
|
|
|
#######################################################################
|
|
@@ -72,37 +96,38 @@ print "\n";
|
|
#
|
|
|
|
# Find all of the man pages in the release directory
|
|
-@dirs = <$glunix_base/man/man?>;
|
|
+@dirs = <$glunix_base/glunix/man/man?>;
|
|
push(@dirs, <$glunix_base/glunix/man/man?>);
|
|
|
|
# print "Found man directories: ", join(" ", @dirs), "\n";
|
|
|
|
-foreach $val (@dirs) {
|
|
- @f = <$val/*.*>;
|
|
+#foreach $val (@dirs) {
|
|
+# @f = <$val/*.*>;
|
|
# print "Found man pages: ", join(" ", &man_pagename(@f)), "\n";
|
|
- push(@files, @f);
|
|
-}
|
|
+# push(@files, @f);
|
|
+#}
|
|
|
|
-@files = <$glunix_base/man/man?/*.*>;
|
|
-&install_manpages("$now_base/man/man", @files);
|
|
+#@files = <$glunix_base/man/man?/*.*>;
|
|
+#&install_manpages("$now_base/man/man", @files);
|
|
|
|
-if ($http_base ne "") {
|
|
- @files = <$glunix_base/man/html?/*.*>;
|
|
- &install_manpages("$http_base/man/html", @files);
|
|
-}
|
|
-
|
|
-print "Creating windex file (this may take a while)\n";
|
|
-if (!$justTesting) {
|
|
- system("/usr/bin/catman -M $now_base/man -w");
|
|
- print "Done with catman!\n";
|
|
-}
|
|
+#if ($http_base ne "") {
|
|
+# @files = <$glunix_base/man/html?/*.*>;
|
|
+# &install_manpages("$http_base/man/html", @files);
|
|
+#}
|
|
+
|
|
+# no windex file in bsd.
|
|
+#print "Creating windex file (this may take a while)\n";
|
|
+#if (!$justTesting) {
|
|
+# system("/usr/bin/catman -M $now_base/man -w");
|
|
+# print "Done with catman!\n";
|
|
+#}
|
|
|
|
#######################################################################
|
|
#
|
|
# Install libraries
|
|
#
|
|
|
|
-@files = <$glunix_base/lib/$glunix_arch/*>;
|
|
+@files = <$glunix_base/glunix/lib/$glunix_arch/*>;
|
|
@files = &strip_garbage(@files);
|
|
#print "Found include files: ", join(" ", @dirs), "\n";
|
|
|
|
@@ -113,7 +138,7 @@ foreach $val (@files) {
|
|
# print "Unlinking $install_path\n";
|
|
unlink($install_path);
|
|
# print "Linking $install_path to $val\n";
|
|
- symlink($val, $install_path);
|
|
+ system("$install_man $val $install_path");
|
|
}
|
|
}
|
|
|
|
@@ -129,18 +154,18 @@ undef @f;
|
|
undef @files;
|
|
|
|
foreach $val (@copy_progs) {
|
|
- if (-e "$glunix_base/bin/$glunix_arch/$val") {
|
|
- print "Copying $glunix_base/bin/$glunix_arch/$val to $now_base/bin/$val\n";
|
|
+ if (-e "$glunix_base/glunix/bin/$glunix_arch/$val") {
|
|
+ print "Copying $glunix_base/glunix/bin/$glunix_arch/$val to $now_base/bin/$val\n";
|
|
if (!$justTesting) {
|
|
- system("/bin/cp $glunix_base/bin/$glunix_arch/$val $now_base/bin/$val");
|
|
+ system("$install_bin $glunix_base/glunix/bin/$glunix_arch/$val $now_base/bin/$val");
|
|
}
|
|
} else {
|
|
- print "Cannot find $glunix_base/bin/$glunix_arch/$val to copy\n";
|
|
+ print "Cannot find $glunix_base/glunix/bin/$glunix_arch/$val to copy\n";
|
|
}
|
|
}
|
|
|
|
# Find all of the programs in the release directory
|
|
-@dirs = <$glunix_base/bin/*>;
|
|
+@dirs = <$glunix_base/glunix/bin/*>;
|
|
|
|
#print "Found program directories: ", join(" ", @dirs), "\n";
|
|
|
|
@@ -179,14 +204,16 @@ foreach $val (@files) {
|
|
if (!$justTesting) {
|
|
unlink($install_path);
|
|
# print "symlink(\"GLUnix-bin\", $install_path);\n";
|
|
- symlink("GLUnix-bin", $install_path);
|
|
+ system("$install_bin $val $install_path");
|
|
}
|
|
}
|
|
|
|
foreach $val (@setuid_progs) {
|
|
print "Marking file setuid root: $val\n";
|
|
if (!$justTesting) {
|
|
- chmod 06511, $val;
|
|
+# chmod 06511, $val;
|
|
+ system("chown root:glunix $now_base/bin/$val");
|
|
+ system("chmod 6511 $now_base/bin/$val");
|
|
}
|
|
}
|
|
|
|
@@ -225,7 +252,7 @@ sub install_manpages {
|
|
if (!$justTesting) {
|
|
unlink($install_path);
|
|
# print "symlink($val, $install_path)\n";
|
|
- symlink($val, $install_path);
|
|
+ system("$install_man $val $install_path");
|
|
}
|
|
}
|
|
|