diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2007-04-27 04:08:19 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2007-04-27 04:08:19 +0000 |
| commit | 1dc01a9ac8c6ae56e862ea199710e16c827d5203 (patch) | |
| tree | 742190bf59a3e7007c378b134b1bbfb5588274a9 | |
| parent | 15cbcf1bf1793716cae64113ad06a5809b9f19fa (diff) | |
| download | pkgsrc-1dc01a9ac8c6ae56e862ea199710e16c827d5203.tar.gz | |
Simplify PKG_SYSCONFDIR handling by assuming all packages have a consistent
PKG_SYSCONFDIR.
| -rw-r--r-- | textproc/eb/buildlink3.mk | 23 | ||||
| -rw-r--r-- | textproc/eblook/Makefile | 4 | ||||
| -rw-r--r-- | textproc/ndtpd/Makefile | 4 |
3 files changed, 8 insertions, 23 deletions
diff --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk index cae7d1ae09c..52605be5407 100644 --- a/textproc/eb/buildlink3.mk +++ b/textproc/eb/buildlink3.mk @@ -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:= ${BUILDLINK_PACKAGES:Neb} 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 --git a/textproc/eblook/Makefile b/textproc/eblook/Makefile index 55a64114f38..1531ee5ff24 100644 --- a/textproc/eblook/Makefile +++ b/textproc/eblook/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews 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 --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index 1bc0f8af88f..184d30c67f7 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -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+= --localstatedir=${NDTPD_RUNDIR:Q} 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 |