Commit files which were inadvertently omitted from the previous commit.

3 files changed, 9 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index b6e5f2ec..8e2de783 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ solpkg:
         $(MAKE) all
         $(MAKE) DESTDIR=$$PWD/$(BUILDDIR) install
         $(INSTALL) pkg/solaris/pkginfo $(BUILDDIR)
+        $(INSTALL) pkg/solaris/preinstall $(BUILDDIR)
         cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
 THANKS: THANKS.in
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index c9dcced0..3bed3464 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,4 +1,4 @@
-PKG="NAGplugin"
+PKG="NGOSplugin"
 NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
 ARCH="@PKG_ARCH@"
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg
index 41d8e177..6307bcd7 100755
--- a/pkg/solaris/solpkg
+++ b/pkg/solaris/solpkg
@@ -8,6 +8,7 @@ $pkgmk = "/usr/bin/pkgmk";
 $pkgtrans = "/usr/bin/pkgtrans";
 $prototype = "prototype";
 $pkginfo = "pkginfo";
+$preinstall = "preinstall";
 $egrep = "/usr/bin/egrep";
 
 # Sanity check
@@ -24,17 +25,19 @@ open (PREPROTO,"$find . -print |$egrep -v \"^\.(/usr(/local)?|/opt)?\$\" | $pkgp
 open (PROTO,">$prototype") ||
         die "Unable to write file prototype ($!)\n";
 print PROTO "i pkginfo=./$pkginfo\n";
+print PROTO "i preinstall=./$preinstall\n";
 while (<PREPROTO>) {
         # Read in the prototype information
         chomp;
         $thisline = $_;
         if ($thisline =~ " prototype "
-          or $thisline =~ " pkginfo ") {
+          or $thisline =~ " pkginfo "
+          or $thisline =~ " preinstall ") {
             # Don't do anything as they aren't important
         } elsif ($thisline =~ "^[fd] ") {
           # Change the ownership of files and directories
           ($dir, $none, $file, $mode, $user, $group) = split / /,$thisline;
-          print PROTO "$dir $none $file $mode bin bin\n";
+          print PROTO "$dir $none $file $mode $user bin\n";
         } else {
           # Symlinks and other stuff should be printed also
           print PROTO "$thisline\n";
@@ -58,6 +61,7 @@ while (<PKGINFO>) {
         $thisline = $_;
         ($var,$value) = split /=/,$thisline;
         if ("$var" eq "NAME" 
+          or "$var" eq "PKG"
           or "$var" eq "VERSION"
           or "$var" eq "ARCH") {
                 $tmp = lc($var);
@@ -77,5 +81,5 @@ $packagename = "$name-$version-$os-$arch-local";
 
 print "Building package\n";
 system ("$pkgmk -o -r `pwd` -d $pkgdevice");
-system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename)");
+system ("(cd $pkgdevice && $pkgtrans -s `pwd` ../$packagename $pkg)");
 print "Done. ($packagename)\n";