[pkgsrc/trunk]: pkgsrc/textproc/eb * Run commands carefully in make(1)'s ``VA...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d31f4b9ba4ef
branches:  trunk
changeset: 485328:d31f4b9ba4ef
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Dec 06 09:09:48 2004 +0000

description:
* Run commands carefully in make(1)'s ``VAR!= cmd'' syntax.  Problem
  reported by Krister Walfridsson.
* Set INSTALLATION_DIRS so that pkgviews installation succeeds.

diffstat:

 textproc/eb/Makefile      |   4 +++-
 textproc/eb/buildlink3.mk |  16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 80c6adfe10df -r d31f4b9ba4ef textproc/eb/Makefile
--- a/textproc/eb/Makefile      Mon Dec 06 08:58:59 2004 +0000
+++ b/textproc/eb/Makefile      Mon Dec 06 09:09:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/11/29 13:02:42 uebayasi Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/06 09:09:48 uebayasi Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 #
 
@@ -76,6 +76,8 @@
 SUBST_FILES.runpath=   configure configure.ac
 SUBST_SED.runpath=     -e 's|^\(.*LIBS=['\''"]\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\(.*\)$$|\1-Wl,-R\2 -L\2\3|'
 
+INSTALLATION_DIRS=     share/eb/appendix
+
 post-extract:
        ${RM} -rf ${WRKSRC}/zlib
 
diff -r 80c6adfe10df -r d31f4b9ba4ef textproc/eb/buildlink3.mk
--- a/textproc/eb/buildlink3.mk Mon Dec 06 08:58:59 2004 +0000
+++ b/textproc/eb/buildlink3.mk Mon Dec 06 09:09:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/20 16:00:35 uebayasi Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/12/06 09:09:48 uebayasi Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=     ${EB_BUILDLINK3_MK}+
@@ -10,13 +10,21 @@
 BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Neb}
 BUILDLINK_PACKAGES+=   eb
 
+_EB_REQD=              3.3.2nb1
+
 # XXX We need something generic.
 .include "../../mk/bsd.prefs.mk"
-PKG_SYSCONFDIR.eb!=    ${PKG_INFO} -B eb | \
-                       sed -ne '/^PKG_SYSCONFDIR/ { s/^PKG_SYSCONFDIR=//; p; }'
+PKG_SYSCONFDIR.eb!=                                            \
+       if ${PKG_ADMIN} pmatch 'eb>=${_EB_REQD}' 2>/dev/null; then \
+               ${PKG_INFO} -B eb 2>/dev/null |                 \
+                   ${SED} -ne '/^PKG_SYSCONFDIR/ {             \
+                       s/^PKG_SYSCONFDIR=//; p; }';            \
+       else                                                    \
+               ${ECHO};                                        \
+       fi
 
 .if !empty(EB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.eb+=         eb>=3.3.2nb1
+BUILDLINK_DEPENDS.eb+=         eb>=${_EB_REQD}
 BUILDLINK_RECOMMENDED.eb+=     eb>=3.3.4nb1
 BUILDLINK_PKGSRCDIR.eb?=       ../../textproc/eb
 .endif # EB_BUILDLINK3_MK