[pkgsrc/trunk]: pkgsrc/pkgtools/port2pkg Don't try to rename pkg-comment if i...

[ginsbach <ginsbach%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2dd8b62ae581
branches:  trunk
changeset: 518575:2dd8b62ae581
user:      ginsbach <ginsbach%pkgsrc.org@localhost>
date:      Wed Sep 13 17:33:20 2006 +0000

description:
Don't try to rename pkg-comment if it does not exist.  Ports no longer
use pkg-comment but have a COMMENT= in the Makefile.

diffstat:

 pkgtools/port2pkg/Makefile          |  4 ++--
 pkgtools/port2pkg/files/port2pkg.pl |  8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 4b0fe72046fe -r 2dd8b62ae581 pkgtools/port2pkg/Makefile
--- a/pkgtools/port2pkg/Makefile        Wed Sep 13 17:22:55 2006 +0000
+++ b/pkgtools/port2pkg/Makefile        Wed Sep 13 17:33:20 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/09/13 17:05:09 ginsbach Exp $
+# $NetBSD: Makefile,v 1.30 2006/09/13 17:33:20 ginsbach Exp $
 #
 
 DISTNAME=      port2pkg-1.11
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 4b0fe72046fe -r 2dd8b62ae581 pkgtools/port2pkg/files/port2pkg.pl
--- a/pkgtools/port2pkg/files/port2pkg.pl       Wed Sep 13 17:22:55 2006 +0000
+++ b/pkgtools/port2pkg/files/port2pkg.pl       Wed Sep 13 17:33:20 2006 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: port2pkg.pl,v 1.15 2006/09/13 17:05:09 ginsbach Exp $
+# $NetBSD: port2pkg.pl,v 1.16 2006/09/13 17:33:20 ginsbach Exp $
 #
 
 require 'getopts.pl';
@@ -48,11 +48,13 @@
 sub fix_new_ports {
        my (@allfiles);
        my ($fn, $dn);
-       rename("$pkgdir/pkg-comment", "$pkgdir/COMMENT") ||
+       if (-f "$pkgdr/pkg-comment") {
+           rename("$pkgdir/pkg-comment", "$pkgdir/COMMENT") ||
            warn("can't copy $pkgdir/pkg-comment to $pkgdir/COMMENT");
+       }
        rename("$pkgdir/pkg-descr", "$pkgdir/DESCR") ||
            warn("can't copy $pkgdir/pkg-descr to $pkgdir/DESCR");
-       if ( -f "$pkgdir/pkg-message") {
+       if (-f "$pkgdir/pkg-message") {
            rename("$pkgdir/pkg-message", "$pkgdir/MESSAGE") ||
            warn("can't copy $pkgdir/pkg-message to $pkgdir/MESSAGE");
        }