Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.538
diff -u -r1.538 bsd.port.mk
--- bsd.port.mk	18 Jul 2006 04:12:51 -0000	1.538
+++ bsd.port.mk	25 Jul 2006 23:44:29 -0000
@@ -1496,9 +1496,8 @@
 BUILD_WRKSRC?=	${WRKSRC}
 INSTALL_WRKSRC?=${WRKSRC}
 
-PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}	\
-			DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
+PLIST_SUB+=	OSREL PREFIX=%D LOCALBASE X11BASE
+SUB_LIST+=	PREFIX LOCALBASE X11BASE DATADIR DOCSDIR EXAMPLESDIR
 
 PLIST_REINPLACE+=	dirrmtry
 PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
@@ -1520,10 +1519,10 @@
 CONFIGURE_SHELL?=	${SH}
 MAKE_SHELL?=	${SH}
 
-CONFIGURE_ENV+=	SHELL=${SH} CONFIG_SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT}
-SCRIPTS_ENV+=	PORTOBJFORMAT=${PORTOBJFORMAT}
-MAKE_ENV+=		SHELL=${SH} PORTOBJFORMAT=${PORTOBJFORMAT} NO_LINT=YES
-PLIST_SUB+=		PORTOBJFORMAT=${PORTOBJFORMAT}
+CONFIGURE_ENV+=	SHELL=${SH} CONFIG_SHELL=${SH} PORTOBJFORMAT
+SCRIPTS_ENV+=	PORTOBJFORMAT
+MAKE_ENV+=		SHELL=${SH} PORTOBJFORMAT NO_LINT=YES
+PLIST_SUB+=		PORTOBJFORMAT
 
 .if defined(MANCOMPRESSED)
 .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
@@ -1625,7 +1624,7 @@
 LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -lgnugetopt
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS LDFLAGS
 .endif
 .endif
 
@@ -1636,7 +1635,7 @@
 .else
 RC_SUBR=	/etc/rc.subr
 .endif
-SUB_LIST+=	RC_SUBR=${RC_SUBR}
+SUB_LIST+=	RC_SUBR
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 SUB_FILES+=	${USE_RC_SUBR}
 .endif
@@ -1817,16 +1816,13 @@
 
 .endif
 
-PLIST_SUB+=			XAWVER=${XAWVER}
+PLIST_SUB+=			XAWVER
 
 .if defined(USE_BISON)
 BUILD_DEPENDS+=	bison:${PORTSDIR}/devel/bison
 .endif
 
-PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
-				PERL_VER=${PERL_VER} \
-				PERL_ARCH=${PERL_ARCH} \
-				SITE_PERL=${SITE_PERL_REL}
+PLIST_SUB+=		PERL_VERSION PERL_VER PERL_ARCH SITE_PERL
 
 .if defined(PERL_MODBUILD)
 PERL_CONFIGURE=		yes
@@ -2007,7 +2003,7 @@
 
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
-MAKE_ENV+=		PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
+MAKE_ENV+=		PREFIX LOCALBASE X11BASE MOTIFLIB LIBDIR CFLAGS CXXFLAGS MANPREFIX
 
 .if ${OSVERSION} < 500016
 PTHREAD_CFLAGS?=	-D_THREAD_SAFE
@@ -2739,11 +2735,8 @@
 .endif
 
 # Passed to most of script invocations
-SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
-		  WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
-		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
-		  PORTSDIR=${PORTSDIR} DEPENDS="${DEPENDS}" \
-		  PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR WRKDIR WRKSRC PATCHDIR SCRIPTDIR \
+				FILESDIR PORTSDIR DEPENDS PREFIX LOCALBASE X11BASE
 
 .if defined(BATCH)
 SCRIPTS_ENV+=	BATCH=yes
@@ -2863,6 +2856,18 @@
 _DESKTOPDIR_REL=
 .endif
 
+# Pair-vars expansion
+
+PAIR_VARS=	PLIST_SUB SUB_LIST CONFIGURE_ENV SCRIPTS_ENV MAKE_ENV FETCH_ENV
+
+.for _pair_var_ in ${PAIR_VARS}
+${_pair_var_}_EXP_=${${_pair_var_}:M*=*}
+.for _pair_ in ${${_pair_var_}:N*[=\"]*}
+${_pair_var_}_EXP_+=${_pair_}="${${_pair_}}"
+.endfor
+${_pair_var_}:=${${_pair_var_}_EXP_}
+.endfor
+
 # Put this as far down as possible so it will catch all PLIST_SUB definitions.
 
 .if defined(INSTALLS_SHLIB)