From 9e8141f76355ac6086df0a87ef09c230f4ec0e75 Mon Sep 17 00:00:00 2001
From: ginsbach <ginsbach>
Date: Wed, 13 Sep 2006 17:33:20 +0000
Subject: 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.

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

diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index e3c7aee171d..f253e067b8b 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -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 --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl
index 8a172b5c9d7..54e30b46491 100755
--- a/pkgtools/port2pkg/files/port2pkg.pl
+++ b/pkgtools/port2pkg/files/port2pkg.pl
@@ -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 usage_and_exit {
 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");
 	}
-- 
cgit v1.2.3