3 files changed, 5 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 9c200de0990..b83c0d541d2 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -1,13 +1,13 @@
 # $Id$
 # TeXLive::TLPSRC.pm - module for handling tlpsrc files
-# Copyright 2007-2013 Norbert Preining
+# Copyright 2007-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLPSRC;
 
 use FileHandle;
-use TeXLive::TLConfig qw($CategoriesRegexp);
+use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory);
 use TeXLive::TLUtils;
 use TeXLive::TLPOBJ;
 use TeXLive::TLTREE;
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index e206b7de681..d2d05294405 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -1,6 +1,6 @@
 # $Id$
 # TeXLive::TLPaper.pm - query/modify paper sizes for our various programs
-# Copyright 2008-2012 Norbert Preining
+# Copyright 2008-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -737,7 +737,7 @@ sub paper_do_simple {
           return;
         }
         for (@newlines) { print TMP; }
-        close(TMP) || warn "$0: close(>$outfile) failed: $!";
+        close(TMP) || warn "$0: close(>$outp) failed: $!";
         TeXLive::TLUtils::announce_execute_actions("regenerate-formats")
           if ($prog eq "context");
       } else {
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index a922fca9c16..ccf82542717 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -336,11 +336,7 @@ from C<%ENV>.
 
 =cut
 
-if ($is_win) {
-  $global_tmp = expand_string(get_system_env()->{'TEMP'}) if $is_win;
-}
-
-my $global_tmp = "/tmp";
+my $global_tmp = $is_win ? expand_string(get_system_env()->{'TEMP'}) : "/tmp";
 
 sub global_tmpdir { return $global_tmp; }