aboutsummaryrefslogtreecommitdiffstats
path: root/misc/porteasy
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2004-03-03 01:00:45 +0800
committerdes <des@FreeBSD.org>2004-03-03 01:00:45 +0800
commitf685d73dd3491617526df1ad30fde00d67c03f37 (patch)
tree11104a15334b0495656d5bf69e990ef7a38a2efd /misc/porteasy
parent088cf915a3f68f41e1c55f20a382a62d381efce0 (diff)
downloadfreebsd-ports-gnome-f685d73dd3491617526df1ad30fde00d67c03f37.tar.gz
freebsd-ports-gnome-f685d73dd3491617526df1ad30fde00d67c03f37.tar.zst
freebsd-ports-gnome-f685d73dd3491617526df1ad30fde00d67c03f37.zip
Make the variable definition syntax more like make(1)'s, and update the
documentation accordingly, fixing some markup bugs in the process.
Diffstat (limited to 'misc/porteasy')
-rw-r--r--misc/porteasy/Makefile3
-rw-r--r--misc/porteasy/src/porteasy.811
-rw-r--r--misc/porteasy/src/porteasy.pl10
3 files changed, 14 insertions, 10 deletions
diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index 0f96f161c4da..3d9392778785 100644
--- a/misc/porteasy/Makefile
+++ b/misc/porteasy/Makefile
@@ -8,8 +8,7 @@
#
PORTNAME= porteasy
-PORTVERSION= 2.7.10
-PORTREVISION= 1
+PORTVERSION= 2.7.11
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none
diff --git a/misc/porteasy/src/porteasy.8 b/misc/porteasy/src/porteasy.8
index 9cdcd20a78a8..6fe6edc50162 100644
--- a/misc/porteasy/src/porteasy.8
+++ b/misc/porteasy/src/porteasy.8
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 1, 2003
+.Dd March 2, 2004
.Dt PORTEASY 8
.Os
.Sh NAME
@@ -41,7 +41,7 @@
.Op Fl p Ar dir
.Op Fl r Ar dir
.Op Fl t Ar tag
-.Op Ar port | VAR=VAL ...
+.Op Ar port | Fl D Ns Ar VAR | Fl D Ns Ar VAR Ns = Ns Ar VAL ...
.Sh DESCRIPTION
.Nm
maintains an updated ports tree, and fetches and builds ports
@@ -109,7 +109,10 @@ description.
.El
.Ss Environment settings
Any command line argument of the form
-.Ar VAR=VAL
+.Fl D Ns Ar VAR ,
+.Fl D Ns Ar VAR Ns = Ns Ar VAL
+or
+.Ar VAR Ns = Ns Ar VAL
is interpreted as a variable assignment which will be exported into
subprocesses' environments.
Thus compile-time configuration options can be specified on the
diff --git a/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl
index 2bca387ccfca..8c4f2430a1ed 100644
--- a/misc/porteasy/src/porteasy.pl
+++ b/misc/porteasy/src/porteasy.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#-
-# Copyright (c) 2000-2003 Dag-Erling Coïdan Smørgrav
+# Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@ use strict;
use Fcntl;
use Getopt::Long;
-my $VERSION = "2.7.10";
-my $COPYRIGHT = "Copyright (c) 2000-2003 Dag-Erling Smørgrav. " .
+my $VERSION = "2.7.11";
+my $COPYRIGHT = "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
"All rights reserved.";
# Constants
@@ -1138,8 +1138,10 @@ MAIN:{
# Step 2: build list of explicitly required ports
foreach my $arg (@ARGV) {
- if ($arg =~ m/^([A-Z0-9_]+)=(.*)$/) {
+ if ($arg =~ m/^(?:-D)?([A-Z0-9_]+)=(.*)$/) {
$ENV{$1} = $2;
+ } elsif ($arg =~ m/^-D([A-Z0-9_]+)$/) {
+ $ENV{$1} = '';
} else {
$err += add_port($arg, &REQ_EXPLICIT);
++$requested;