diff options
| author | uebayasi <uebayasi@pkgsrc.org> | 2004-12-06 09:09:48 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@pkgsrc.org> | 2004-12-06 09:09:48 +0000 |
| commit | 3e64ed8a329d759c3645429c250fa25f04a0d8d2 (patch) | |
| tree | a4cca5239abc2bea4de9ef3306070d64ddeb77e8 /textproc/eb | |
| parent | 481cbac84ae12d5c37a2aa1f80732fda319e762d (diff) | |
| download | pkgsrc-3e64ed8a329d759c3645429c250fa25f04a0d8d2.tar.gz | |
* Run commands carefully in make(1)'s ``VAR!= cmd'' syntax. Problem
reported by Krister Walfridsson.
* Set INSTALLATION_DIRS so that pkgviews installation succeeds.
Diffstat (limited to 'textproc/eb')
| -rw-r--r-- | textproc/eb/Makefile | 4 | ||||
| -rw-r--r-- | textproc/eb/buildlink3.mk | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 22b5093126f..35cb8607a83 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -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_STAGE.runpath= post-patch 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 --git a/textproc/eb/buildlink3.mk b/textproc/eb/buildlink3.mk index f24a8a1c31a..8515ce13d70 100644 --- a/textproc/eb/buildlink3.mk +++ b/textproc/eb/buildlink3.mk @@ -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_DEPENDS+= eb 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 |