diff options
| -rw-r--r-- | editors/elvis-x11/Makefile | 4 | ||||
| -rw-r--r-- | editors/elvis/Makefile | 8 | ||||
| -rw-r--r-- | editors/elvis/options.mk | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index bb696e3cea0..a4ae6e88a67 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2013/04/06 03:45:12 rodent Exp $ +# $NetBSD: Makefile,v 1.18 2015/12/29 04:22:50 dholland Exp $ PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} COMMENT= Clone of vi with regex-search, hex-edit, HTML/LaTeX preview (X11) -FILESDIR= ${.CURDIR}/../../editors/elvis/files +#FILESDIR= ${.CURDIR}/../../editors/elvis/files PATCHDIR= ${.CURDIR}/../../editors/elvis/patches PKGDIR= ${.CURDIR}/../../editors/elvis diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile index e170de097c1..b4d68cfb5db 100644 --- a/editors/elvis/Makefile +++ b/editors/elvis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/06/06 12:54:15 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2015/12/29 04:22:50 dholland Exp $ # This section contains variables that might be overridden. PKGNAME?= ${PKGNAME_BASE} @@ -22,9 +22,9 @@ LICENSE= artistic HAS_CONFIGURE= yes CONFIGURE_ARGS+= --verbose -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --docdir=${PREFIX:Q}/share/doc/elvis -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/elvis +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PKG_SYSCONFSUBDIR?= elvis CONF_FILES= ${PREFIX}/share/elvis/elvis.rc \ diff --git a/editors/elvis/options.mk b/editors/elvis/options.mk index d9969cd7015..258ac6767e9 100644 --- a/editors/elvis/options.mk +++ b/editors/elvis/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2011/12/19 15:27:47 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2015/12/29 04:22:50 dholland Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.elvis PKG_SUPPORTED_OPTIONS= x11 @@ -6,15 +6,15 @@ PKG_SUPPORTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mx11) -BUILDLINK_DEPMETHOD.libXt?= build +BUILDLINK_DEPMETHOD.libXt= build . include "../../x11/libXft/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" . include "../../x11/libXpm/buildlink3.mk" . include "../../x11/libXt/buildlink3.mk" CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-xft -CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include -CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib USE_TOOLS+= pkg-config .else CONFIGURE_ARGS+= --without-x |