diff options
| author | wiz <wiz@pkgsrc.org> | 2001-02-16 13:06:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2001-02-16 13:06:17 +0000 |
| commit | 1b7f0d246f2f256fabb26f4b3db46a119b6f5945 (patch) | |
| tree | d451a3db8b4e988109ec4e1b267be49694da109b /pkgtools/port2pkg | |
| parent | 45e53b4367cab19f9f887bf001681852885d668e (diff) | |
| download | pkgsrc-1b7f0d246f2f256fabb26f4b3db46a119b6f5945.tar.gz | |
Change COMMENT handling:
COMMENTs are now a variable in the Makefile instead of a pkg/COMMENT
file. The COMMENT var should be in the maintainer block after the
homepage.
Modify bsd.pkg.mk, pkglint, url2pkg, and port2pkg (last one untested)
for the new behaviour. Document new state in Packages.txt.
This should save lots of inodes, and lots of time when untarring/updating.
Idea by Alistair Crooks.
For the time being, accept pkg/COMMENT instead of a COMMENT var to avoid
a flag day.
Diffstat (limited to 'pkgtools/port2pkg')
| -rw-r--r-- | pkgtools/port2pkg/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/port2pkg/files/port2pkg.pl | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile index 259d01bb3c4..8ad6e3fbbed 100644 --- a/pkgtools/port2pkg/Makefile +++ b/pkgtools/port2pkg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2001/01/04 20:22:47 sommerfeld Exp $ +# $NetBSD: Makefile,v 1.10 2001/02/16 13:06:20 wiz Exp $ # -DISTNAME= port2pkg-1.7 +DISTNAME= port2pkg-1.8 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl index 549bb57c876..e1914421258 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.7 2001/01/04 20:22:47 sommerfeld Exp $ +# $NetBSD: port2pkg.pl,v 1.8 2001/02/16 13:06:20 wiz Exp $ # require 'getopts.pl'; @@ -239,6 +239,14 @@ sub conv_Makefile { } } close(DESCR); + open(COMMENT, "$pkgdir/pkg/COMMENT") + || die "$pkgdir/pkg/COMMENT: $!\n"; + while (<COMMENT>) { + chomp; + print PKG "COMMENT=\t$1\n"; + } + close(COMMENT); + unlink("$pkgdir/pkg/COMMENT"); } elsif ($noportdocs || /^\.if.*NOPORTDOCS/) { if (/^\.if/) { $noportdocs++; |