Date: Sun, 29 Oct 2000 15:49:04 +0100 (CET) From: ue@nathan.ruhr.de To: FreeBSD-gnats-submit@freebsd.org Cc: wosch@freebsd.org Subject: ports/22396: portcheckout fails with new port layout Message-ID: <200010291449.e9TEn4b28623@nathan.ruhr.de>
next in thread | raw e-mail | index | archive | help
>Number: 22396
>Category: ports
>Synopsis: portcheckout fails with new port layout
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 29 07:00:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Udo Erdelhoff
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
Portcheckout Version 2.0
ports tree as of right now (29-OCT-2000, 12:52 CET)
>Description:
portcheckout uses cvs checkout to extract the port directories. The last
change of the port layout removed the pkg directory. cvs checkout creates
an empty pkg directory. The result:
bash# portcheckout portcheckout | sh
[...]
Error: your port uses an old layout. Please update it to match this bsd.port.mk.
>How-To-Repeat:
Use portcheckout to check out a port with the new structure and run make.
>Fix:
portcheckout should use "cvs checkout -P" to force cvs to prune the empty
directory. I've included a patch for portcheckout below. The patch adds -P
to all invocations of cvs checkout (including those in the manual page). It
can be used as a patch for portcheckout (the author has been CCed) or as
FreeBSD-specific patch.
--- portcheckout.orig Sun Oct 29 12:29:55 2000
+++ portcheckout.pl Sun Oct 29 12:31:40 2000
@@ -94,14 +94,14 @@
PORTSDIR="/tmp/ports"; export PORTSDIR
# checkout FreeBSD ports system Makefiles
- cvs checkout ports/Mk
+ cvs checkout -P ports/Mk
##################################################
# checkout port: de-dict-1.1
- cvs checkout ports/german/dict
+ cvs checkout -P ports/german/dict
# de-dict-1.1 depend on port: agrep-2.04
- cvs checkout ports/textproc/agrep
+ cvs checkout -P ports/textproc/agrep
##################################################
# Compile and install de-dict-1.1
@@ -328,7 +328,7 @@
#print qq{DISTDIR="/usr/ports/distfiles"; export DISTDIR\n};
print "\n# checkout FreeBSD ports system Makefiles\n";
-print "cvs checkout $release ports/Mk\n\n";
+print "cvs checkout -P $release ports/Mk\n\n";
# list of dependings ports
@@ -338,7 +338,7 @@
print "#" x 50, "\n";
print "# checkout port: $distributionname\n";
- print "cvs checkout $release ", $obj->{$distributionname}{portpath}, "\n\n";
+ print "cvs checkout -P $release ", $obj->{$distributionname}{portpath}, "\n\n";
$ports_depends{$distributionname} = 1;
foreach my $depends (
@@ -355,7 +355,7 @@
$ports_depends{$depends} = 1;
print "# $distributionname depend on port: $depends\n";
- print "cvs checkout $release ", $obj->{$depends}{portpath}, "\n\n";
+ print "cvs checkout -P $release ", $obj->{$depends}{portpath}, "\n\n";
}
}
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200010291449.e9TEn4b28623>