[pkgsrc/trunk]: pkgsrc/x11/xscreensaver Use :sh instead of != to defer execut...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf01aa3af84c
branches:  trunk
changeset: 493189:cf01aa3af84c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 28 23:42:48 2005 +0000

description:
Use :sh instead of != to defer execution of ${PERL} until the configure
phase.  This avoids needing ${PERL} in the top-level make.

diffstat:

 x11/xscreensaver/Makefile.common |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r 8e819f5b5f2d -r cf01aa3af84c x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Thu Apr 28 23:39:35 2005 +0000
+++ b/x11/xscreensaver/Makefile.common  Thu Apr 28 23:42:48 2005 +0000
@@ -29,7 +29,7 @@
 
 CONFIGURE_ENV+=                X_PRE_LIBS=-lXt
 CONFIGURE_ENV+=                ac_cv_x_app_defaults="${PREFIX}/lib/X11/app-defaults"
-CONFIGURE_ENV+=                PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION}"
+CONFIGURE_ENV+=                PERL="${PERL5}" ac_cv_perl_version="${PERL_VERSION_cmd:sh}"
 CONFIGURE_ENV+=                INTLTOOL_PERL="${PERL5}"
 .if defined(PKGREVISION)
 CONFIGURE_ENV+=                X_CFLAGS="-DPKGREVISION=${PKGREVISION}"
@@ -42,10 +42,11 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.ifndef (PERL_VERSION)
-PERL_VERSION!=         if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi
-MAKEFLAGS+=            PERL_VERSION=${PERL_VERSION}
-.endif
+PERL_VERSION_cmd=      if ${TEST} -x ${PERL5}; then                    \
+                               ${PERL5} -e 'print $$]';                \
+                       else                                            \
+                               ${ECHO} "5.006";                        \
+                       fi
 
 .if (${OPSYS} == "NetBSD")
 .  if defined(KERBEROS)