[pkgsrc/trunk]: pkgsrc/textproc Simplify PKG_SYSCONFDIR handling by assuming ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbda423b4f23
branches:  trunk
changeset: 528265:dbda423b4f23
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Fri Apr 27 04:08:19 2007 +0000

description:
Simplify PKG_SYSCONFDIR handling by assuming all packages have a consistent
PKG_SYSCONFDIR.

diffstat:

 textproc/eb/buildlink3.mk |  23 ++++-------------------
 textproc/eblook/Makefile  |   4 ++--
 textproc/ndtpd/Makefile   |   4 ++--
 3 files changed, 8 insertions(+), 23 deletions(-)

diffs (74 lines):

diff -r 20bb8b993a88 -r dbda423b4f23 textproc/eb/buildlink3.mk
--- a/textproc/eb/buildlink3.mk Fri Apr 27 03:54:30 2007 +0000
+++ b/textproc/eb/buildlink3.mk Fri Apr 27 04:08:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/04/27 04:08:19 uebayasi Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 EB_BUILDLINK3_MK:=     ${EB_BUILDLINK3_MK}+
@@ -11,25 +11,10 @@
 BUILDLINK_PACKAGES+=   eb
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eb
 
-_EB_REQD=              3.3.2nb1
-
-# This variable should be directly passed to shell commands.  (E.g., a
-# configure argument.)
-#
-# XXX We need something generic.
-.include "../../mk/bsd.fast.prefs.mk"
-PKG_SYSCONFDIR.eb=$$(                                          \
-       if ${PKG_ADMIN} pmatch 'eb>=${_EB_REQD}'                \
-           $$( ${PKG_INFO} -e eb ) 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_API_DEPENDS.eb+=             eb>=${_EB_REQD}
-BUILDLINK_ABI_DEPENDS.eb+=     eb>=4.1.3nb1
-BUILDLINK_PKGSRCDIR.eb?=       ../../textproc/eb
+BUILDLINK_API_DEPENDS.eb+=             eb>=3.3.2nb1
+BUILDLINK_ABI_DEPENDS.eb+=             eb>=4.1.3nb1
+BUILDLINK_PKGSRCDIR.eb?=               ../../textproc/eb
 .endif # EB_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 20bb8b993a88 -r dbda423b4f23 textproc/eblook/Makefile
--- a/textproc/eblook/Makefile  Fri Apr 27 03:54:30 2007 +0000
+++ b/textproc/eblook/Makefile  Fri Apr 27 04:08:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/07 19:54:17 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/04/27 04:08:19 uebayasi Exp $
 #
 
 DISTNAME=      eblook-1.6.1
@@ -14,7 +14,7 @@
 
 GNU_CONFIGURE= YES
 INFO_FILES=    # PLIST
-CONFIGURE_ARGS+=--with-eb-conf=${PKG_SYSCONFDIR.eb}/eb.conf
+CONFIGURE_ARGS+=--with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
 LIBS+=         ${BUILDLINK_LDADD.iconv}
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 20bb8b993a88 -r dbda423b4f23 textproc/ndtpd/Makefile
--- a/textproc/ndtpd/Makefile   Fri Apr 27 03:54:30 2007 +0000
+++ b/textproc/ndtpd/Makefile   Fri Apr 27 04:08:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/12/06 16:57:51 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2007/04/27 04:08:19 uebayasi Exp $
 #
 
 DISTNAME=      ndtpd-3.1.5
@@ -23,7 +23,7 @@
 CONFIGURE_ARGS+=       --with-logdir=${NDTPD_LOGDIR:Q}
 CONFIGURE_ARGS+=       --with-eb
 CONFIGURE_ARGS+=       --with-zlib
-CONFIGURE_ARGS+=       --with-eb-conf=${PKG_SYSCONFDIR.eb}/eb.conf
+CONFIGURE_ARGS+=       --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
 
 CONFIGURE_ENV+=                ac_cv_path_BZIP2=bzip2
 CONFIGURE_ENV+=                ac_cv_path_COMPRESS=compress