head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.50
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.48
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.46
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.44
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.42
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.40
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.38
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.36
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.34
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.32
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.30
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.28
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.26
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.24
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.22
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.20
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.18
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.16
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.14
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.12
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.10
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.8
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.6
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.4
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.2
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.1.0.6
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.4
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.2
	netbsd-1-6-1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.05.03.20.56.37;	author mrauch;	state dead;
branches;
next	1.1;

1.1
date	2002.12.25.16.30.00;	author jdolecek;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to version 1.1.1.
New features include:
* PDF, DocBook/XML, XHTML and Macromedia Flash (SWF) export
* Accessibility
* Support for Complex Text Layout (CTL)
* User installation automated
@
text
@$NetBSD: patch-ep,v 1.1 2002/12/25 16:30:00 jdolecek Exp $

--- ../solenv/bin/deliver.pl.orig	Tue Dec 24 16:45:57 2002
+++ ../solenv/bin/deliver.pl	Tue Dec 24 17:20:07 2002
@@@@ -102,7 +102,7 @@@@
 $module             = 0;            # module name
 $base_dir           = 0;            # path to module base directory
 $dlst_file          = 0;            # path to d.lst
-$umask              = 22;           # default file/directory creation mask 
+$umask              = 022;          # default file/directory creation mask 
 $dest               = 0;            # optional destination path
 
 @@action_data        = ();           # LoL with all action data
@@@@ -245,7 +245,7 @@@@
         print "MKDIR: $path\n";
     }
     else {
-        mkpath($path, 0, 0777-$umask); 
+        mkpath($path, 0, 0777 & ~$umask); 
     }
 }
 
@@@@ -285,7 +285,7 @@@@
 
     $umask = umask();
     if ( !defined($umask) ) {
-        $umask = 22;
+        $umask = 022;
     }
 
     $common_outdir  = $ENV{COMMON_OUTDIR};
@@@@ -535,11 +535,11 @@@@
     my $mode = shift;
     my $file = shift;
     
-    if ( $mode%2 == 1 ) {
-        $mode = 0777 - $umask;
+    if ( ($mode & 0111) != 0 ) { # any execute bits?
+        $mode = 0777 & ~$umask;
     }
     else {
-        $mode = 0666 - $umask;
+        $mode = 0666 & ~$umask;
     }
     chmod($mode, $file);
 }
@


1.1
log
@fix umask handling in solenv/bin/deliver.pl
this fixes PR pkg/17967 by Alan Barrett
@
text
@d1 1
a1 1
$NetBSD$
@