Fix options framework abuse by elvis*.

5 files changed, 66 insertions, 67 deletions

diff --git a/editors/elvis-x11/DESCR b/editors/elvis-x11/DESCR
new file mode 100644
index 00000000000..0b4e28c5678
--- /dev/null
+++ b/editors/elvis-x11/DESCR
@@ -0,0 +1,9 @@
+Elvis is a very powerful vi/ex clone providing a number of bells and
+whistles:
+
+    * Syntax Highlighting
+    * Multiple files in multiple windows
+    * Browse modes for LaTeX, HTML and man pages
+    * Networking support (HTTP and FTP)
+
+This package contains the X11 version.
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile
index a4ae6e88a67..f18dc9a8cb5 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2015/12/29 04:22:50 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2016/12/30 14:25:01 wiz Exp $
 
-PKGNAME=	${PKGNAME_BASE:S/-/-x11-/}
+PKGNAME=	elvis-x11-${VERSION}
 COMMENT=	Clone of vi with regex-search, hex-edit, HTML/LaTeX preview (X11)
 
-#FILESDIR=	${.CURDIR}/../../editors/elvis/files
-PATCHDIR=	${.CURDIR}/../../editors/elvis/patches
-PKGDIR=		${.CURDIR}/../../editors/elvis
+CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-xft
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
+USE_TOOLS+=		pkg-config
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.elvis+=	x11
-
-.include "../../editors/elvis/Makefile"
+BUILDLINK_DEPMETHOD.libXt=	build
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../editors/elvis/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/elvis/Makefile b/editors/elvis/Makefile
index b4d68cfb5db..9776324dbc2 100644
--- a/editors/elvis/Makefile
+++ b/editors/elvis/Makefile
@@ -1,41 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2015/12/29 04:22:50 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2016/12/30 14:25:01 wiz Exp $
 
-# This section contains variables that might be overridden.
-PKGNAME?=	${PKGNAME_BASE}
-COMMENT?=	Clone of vi with regex-search, hex-edit, HTML/LaTeX preview
-
-# Normal package Makefile contents follow.
-DISTNAME=	elvis-2.2_0
-PKGNAME_BASE=	${DISTNAME:S/_/./}
+PKGNAME=	elvis-${VERSION}
+COMMENT=	Clone of vi with regex-search, hex-edit, HTML/LaTeX preview
 PKGREVISION=	11
-CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/
-
-CONFLICTS+=	elvis-[0-9]*
-CONFLICTS+=	elvis-x11-[0-9]*
-
-MAINTAINER=	airhead@users.sourceforge.net
-HOMEPAGE=	http://elvis.vi-editor.org/
-LICENSE=	artistic
-
-.include "options.mk"
-
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--verbose
-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 \
-			${PKG_SYSCONFDIR}/elvis.rc
-
-INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
-INSTALL_MAKE_FLAGS+=	BINDIR=${DESTDIR}${PREFIX}/bin
-INSTALL_MAKE_FLAGS+=	DATADIR=${DESTDIR}${PREFIX}/share/elvis
-INSTALL_MAKE_FLAGS+=	DOCDIR=${DESTDIR}${PREFIX}/share/doc/elvis
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+CONFIGURE_ARGS+=		--without-x
 
-.include "../../mk/termcap.buildlink3.mk"
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/elvis/Makefile.common b/editors/elvis/Makefile.common
new file mode 100644
index 00000000000..c8881f275f9
--- /dev/null
+++ b/editors/elvis/Makefile.common
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.9 2016/12/30 14:25:01 wiz Exp $
+#
+# used by editors/elvis-x11/Makefile
+# used by editors/elvis/Makefile
+
+# Normal package Makefile contents follow.
+DISTNAME=	elvis-2.2_0
+CATEGORIES=	editors
+MASTER_SITES=	ftp://ftp.cs.pdx.edu/pub/elvis/
+
+MAINTAINER=	airhead@users.sourceforge.net
+HOMEPAGE=	http://elvis.vi-editor.org/
+LICENSE=	artistic
+
+VERSION=	2.2.0
+
+PATCHDIR=	${.CURDIR}/../../editors/elvis/patches
+DISTINFO_FILE=	${.CURDIR}/../../editors/elvis/distinfo
+PLIST_SRC=	${.CURDIR}/../../editors/elvis/PLIST
+
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--verbose
+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 \
+			${PKG_SYSCONFDIR}/elvis.rc
+
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=	BINDIR=${DESTDIR}${PREFIX}/bin
+INSTALL_MAKE_FLAGS+=	DATADIR=${DESTDIR}${PREFIX}/share/elvis
+INSTALL_MAKE_FLAGS+=	DOCDIR=${DESTDIR}${PREFIX}/share/doc/elvis
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
+
+.include "../../mk/termcap.buildlink3.mk"
diff --git a/editors/elvis/options.mk b/editors/elvis/options.mk
deleted file mode 100644
index 258ac6767e9..00000000000
--- a/editors/elvis/options.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2015/12/29 04:22:50 dholland Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.elvis
-PKG_SUPPORTED_OPTIONS=		x11
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mx11)
-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}/include
-CONFIGURE_ARGS+=		--x-libraries=${X11BASE}/lib
-USE_TOOLS+=			pkg-config
-.else
-CONFIGURE_ARGS+=		--without-x
-.endif