summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorginsbach <ginsbach@pkgsrc.org>2006-09-13 17:33:20 +0000
committerginsbach <ginsbach@pkgsrc.org>2006-09-13 17:33:20 +0000
commit0b2cff830796700f2f2efc14b71c6f12ab30e48f (patch)
tree23547d5b5860ec2043a155d9f8674fbbd9fea00f
parenta19a1eff3bc0203ea82a5fcece59cbcced8df300 (diff)
downloadpkgsrc-0b2cff830796700f2f2efc14b71c6f12ab30e48f.tar.gz
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.
-rw-r--r--pkgtools/port2pkg/Makefile4
-rwxr-xr-xpkgtools/port2pkg/files/port2pkg.pl8
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");
}