mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Add an option to the addport script: -b requests that any files in

Browse Source 
${FILESDIR} which look like patches be treated as binary files. This
prevents RCS tags in patch fragments causing a problem for CVS.

Approved by:	garga (maintainer),
		ahze (mentor, implicit)
This commit is contained in:
Shaun Amott 2006-07-14 01:49:35 +00:00
parent f61159e23d
commit 068a568fca
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=167733
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tools/scripts/addport
View File

@ -57,12 +57,13 @@ sub addmodule($);
my %opts;
getopts('ac:d:fgh:il:L:M:mns:tu:', \%opts);
getopts('abc:d:fgh:il:L:M:mns:tu:', \%opts);
my $autofill_l = $opts{'l'};
my $autofill_L = $opts{'L'};
my $autofill = ($autofill_l ? $autofill_l : $autofill_L);
my $c = $opts{'c'} if ($opts{'c'} ne "");
my $binfiles = $opts{'b'};
my $nomodules = $opts{'g'};
my $distdir = $opts{'s'} if ($opts{'s'} ne "");
my $dir = $opts{'d'};
@ -321,7 +322,23 @@ foreach my $thisdir (@dirs) {
chdir $category or err(1,"$category");
system("$cp -PRp $thisdir .");
system("$cvs $n add `find $portname -type d | grep -v CVS`") && errx(1, "cvs add for dirs failed, aborting.");
system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting.");
my $gotfiles = 0;
if ($binfiles) {
if (-d "$portname/files") {
my (@pf, $fd);
opendir($fd, "$portname/files") and
@pf = grep { /^.*patch-.*$/ } readdir($fd);
$gotfiles = ++$#pf;
}
}
if ($binfiles && $gotfiles > 0) {
system("$cvs $n add `find $portname -type f | grep -v CVS | grep -v '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting.");
system("$cvs $n add -ko `find $portname -type f | grep -v CVS | grep '^$portname/files/.*patch-.*'`") && errx(1, "cvs add for files failed, aborting.");
} else {
system("$cvs $n add `find $portname -type f | grep -v CVS`") && errx(1, "cvs add for files failed, aborting.");
}
# figure out where the port name belongs in category Makefile
my @ports = &lsports;
@ -417,7 +434,7 @@ authors: <will\@FreeBSD.org>, <mharo\@FreeBSD.org>
SYNOPSIS
$0 [-c commitfile] [-h host] [-l PR number] [-s distdir] [-u user]
[-afgimnt] -d directory
[-abfgimnt] -d directory
Where "directory" contains the comma-delimited list
of root directories of new ports that you wish to
@ -427,6 +444,8 @@ SYNOPSIS
OPTIONS
-a Perform checks on the port to make sure
there are no problems. Recommended.
-b Add all patch-* files in \${FILESDIR} as binary
files (i.e. don't expand CVS tags)
-c file Use file in place of normal log message.
-f Do not fetch the distfile.
-g Do not commit to CVSROOT/modules.