CVS commit: pkgsrc/pkgtools/R2pkg/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Oct 19 18:47:59 UTC 2019

Modified Files:
        pkgsrc/pkgtools/R2pkg/files: R2pkg.sh

Log Message:
pkgtools/R2pkg: create fewer temporary files


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.sh
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.12 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.13
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.12   Sat Oct 19 18:43:51 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.sh        Sat Oct 19 18:47:59 2019
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: R2pkg.sh,v 1.12 2019/10/19 18:43:51 rillig Exp $
+# $NetBSD: R2pkg.sh,v 1.13 2019/10/19 18:47:59 rillig Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -145,13 +145,6 @@ check_for_no_recursion ()
 
 preserve_original_content ()
 {
-    [ -f Makefile ] && grep -e "CATEGORIES=" Makefile > CATEGORIES
-    [ -f Makefile ] && grep -e "COMMENT=" Makefile > COMMENT
-    [ -f Makefile ] && grep -e "USE_LANGUAGES" Makefile > USE_LANGUAGES
-    [ -f Makefile ] && grep -e "USE_TOOLS" Makefile > USE_TOOLS
-    [ -f Makefile ] && grep -e "DEPENDS" Makefile > DEPENDS
-    [ -f Makefile ] && grep -e "buildlink3.mk" Makefile > BUILDLINK3.MK
-
     [ -f DESCR ]    && mv DESCR DESCR.orig
     [ -f Makefile ] && mv Makefile Makefile.orig
     [ -f buildlink3.mk ] && mv buildlink3.mk buildlink3.mk.orig
@@ -293,12 +286,6 @@ cleanup_distinfo ()
 cleanup_misc_files ()
 {
     [ "$keep_description" = "yes" ] || rm -f DESCRIPTION
-    rm -f CATEGORIES
-    rm -f COMMENT
-    rm -f USE_LANGUAGES
-    rm -f USE_TOOLS
-    rm -f DEPENDS
-    rm -f BUILDLINK3.MK
     [ $level -eq 0 ] && rm -f "$packages_list"
     [ $level -eq 0 ] && rm -f "$dependency_list"
 }