Make the variable definition syntax more like make(1)'s, and update the

documentation accordingly, fixing some markup bugs in the process.

6 files changed, 28 insertions, 20 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;
diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index 0f96f161c4da..3d9392778785 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/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/ports-mgmt/porteasy/src/porteasy.8 b/ports-mgmt/porteasy/src/porteasy.8
index 9cdcd20a78a8..6fe6edc50162 100644
--- a/ports-mgmt/porteasy/src/porteasy.8
+++ b/ports-mgmt/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/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index 2bca387ccfca..8c4f2430a1ed 100644
--- a/ports-mgmt/porteasy/src/porteasy.pl
+++ b/ports-mgmt/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;