Fri Dec 30 14:25:01 2016 UTC ()
Fix options framework abuse by elvis*.


(wiz)
diff -r1.14 -r1.15 pkgsrc/editors/elvis/Makefile
diff -r0 -r1.9 pkgsrc/editors/elvis/Makefile.common
diff -r1.4 -r0 pkgsrc/editors/elvis/options.mk
diff -r0 -r1.4 pkgsrc/editors/elvis-x11/DESCR
diff -r1.18 -r1.19 pkgsrc/editors/elvis-x11/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/editors/elvis/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/elvis/Makefile 2015/12/29 04:22:50 1.14
+++ pkgsrc/editors/elvis/Makefile 2016/12/30 14:25:01 1.15
@@ -1,41 +1,10 @@ @@ -1,41 +1,10 @@
1# $NetBSD: Makefile,v 1.14 2015/12/29 04:22:50 dholland Exp $ 1# $NetBSD: Makefile,v 1.15 2016/12/30 14:25:01 wiz Exp $
2 2
3# This section contains variables that might be overridden. 3PKGNAME= elvis-${VERSION}
4PKGNAME?= ${PKGNAME_BASE} 4COMMENT= Clone of vi with regex-search, hex-edit, HTML/LaTeX preview
5COMMENT?= Clone of vi with regex-search, hex-edit, HTML/LaTeX preview 
6 
7# Normal package Makefile contents follow. 
8DISTNAME= elvis-2.2_0 
9PKGNAME_BASE= ${DISTNAME:S/_/./} 
10PKGREVISION= 11 5PKGREVISION= 11
11CATEGORIES= editors 
12MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/elvis/ 
13 
14CONFLICTS+= elvis-[0-9]* 
15CONFLICTS+= elvis-x11-[0-9]* 
16 
17MAINTAINER= airhead@users.sourceforge.net 
18HOMEPAGE= http://elvis.vi-editor.org/ 
19LICENSE= artistic 
20 
21.include "options.mk" 
22 
23HAS_CONFIGURE= yes 
24CONFIGURE_ARGS+= --verbose 
25CONFIGURE_ARGS+= --prefix=${PREFIX} 
26CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/elvis 
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 
28 
29PKG_SYSCONFSUBDIR?= elvis 
30CONF_FILES= ${PREFIX}/share/elvis/elvis.rc \ 
31 ${PKG_SYSCONFDIR}/elvis.rc 
32 
33INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} 
34INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin 
35INSTALL_MAKE_FLAGS+= DATADIR=${DESTDIR}${PREFIX}/share/elvis 
36INSTALL_MAKE_FLAGS+= DOCDIR=${DESTDIR}${PREFIX}/share/doc/elvis 
37 6
38INSTALLATION_DIRS= ${PKGMANDIR}/man1 7CONFIGURE_ARGS+= --without-x
39 8
40.include "../../mk/termcap.buildlink3.mk" 9.include "Makefile.common"
41.include "../../mk/bsd.pkg.mk" 10.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/editors/elvis/Makefile.common
# $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"
File Deleted: pkgsrc/editors/elvis/Attic/options.mk
File Added: pkgsrc/editors/elvis-x11/DESCR
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.
cvs diff -r1.18 -r1.19 pkgsrc/editors/elvis-x11/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/elvis-x11/Makefile 2015/12/29 04:22:50 1.18
+++ pkgsrc/editors/elvis-x11/Makefile 2016/12/30 14:25:01 1.19
@@ -1,14 +1,18 @@ @@ -1,14 +1,18 @@
1# $NetBSD: Makefile,v 1.18 2015/12/29 04:22:50 dholland Exp $ 1# $NetBSD: Makefile,v 1.19 2016/12/30 14:25:01 wiz Exp $
2 2
3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} 3PKGNAME= elvis-x11-${VERSION}
4COMMENT= Clone of vi with regex-search, hex-edit, HTML/LaTeX preview (X11) 4COMMENT= Clone of vi with regex-search, hex-edit, HTML/LaTeX preview (X11)
5 5
6#FILESDIR= ${.CURDIR}/../../editors/elvis/files 6CONFIGURE_ARGS+= --with-x
7PATCHDIR= ${.CURDIR}/../../editors/elvis/patches 7CONFIGURE_ARGS+= --with-xft
8PKGDIR= ${.CURDIR}/../../editors/elvis 8CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
 9CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
 10USE_TOOLS+= pkg-config
9 11
10.include "../../mk/bsd.prefs.mk" 12BUILDLINK_DEPMETHOD.libXt= build
11 13.include "../../x11/libXft/buildlink3.mk"
12PKG_OPTIONS.elvis+= x11 14.include "../../graphics/freetype2/buildlink3.mk"
13 15.include "../../x11/libXpm/buildlink3.mk"
14.include "../../editors/elvis/Makefile" 16.include "../../x11/libXt/buildlink3.mk"
 17.include "../../editors/elvis/Makefile.common"
 18.include "../../mk/bsd.pkg.mk"