CVS commit: pkgsrc/editors

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 30 14:25:01 UTC 2016

Modified Files:
        pkgsrc/editors/elvis: Makefile
        pkgsrc/editors/elvis-x11: Makefile
Added Files:
        pkgsrc/editors/elvis: Makefile.common
        pkgsrc/editors/elvis-x11: DESCR
Removed Files:
        pkgsrc/editors/elvis: options.mk

Log Message:
Fix options framework abuse by elvis*.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/elvis/Makefile
cvs rdiff -u -r0 -r1.9 pkgsrc/editors/elvis/Makefile.common
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/elvis/options.mk
cvs rdiff -u -r0 -r1.4 pkgsrc/editors/elvis-x11/DESCR
cvs rdiff -u -r1.18 -r1.19 pkgsrc/editors/elvis-x11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/elvis/Makefile
diff -u pkgsrc/editors/elvis/Makefile:1.14 pkgsrc/editors/elvis/Makefile:1.15
--- pkgsrc/editors/elvis/Makefile:1.14  Tue Dec 29 04:22:50 2015
+++ pkgsrc/editors/elvis/Makefile       Fri Dec 30 14:25:01 2016
@@ -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@localhost
-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"

Index: pkgsrc/editors/elvis-x11/Makefile
diff -u pkgsrc/editors/elvis-x11/Makefile:1.18 pkgsrc/editors/elvis-x11/Makefile:1.19
--- pkgsrc/editors/elvis-x11/Makefile:1.18      Tue Dec 29 04:22:50 2015
+++ pkgsrc/editors/elvis-x11/Makefile   Fri Dec 30 14:25:01 2016
@@ -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"

Added files:

Index: pkgsrc/editors/elvis/Makefile.common
diff -u /dev/null pkgsrc/editors/elvis/Makefile.common:1.9
--- /dev/null   Fri Dec 30 14:25:01 2016
+++ pkgsrc/editors/elvis/Makefile.common        Fri Dec 30 14:25:01 2016
@@ -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@localhost
+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"

Index: pkgsrc/editors/elvis-x11/DESCR
diff -u /dev/null pkgsrc/editors/elvis-x11/DESCR:1.4
--- /dev/null   Fri Dec 30 14:25:01 2016
+++ pkgsrc/editors/elvis-x11/DESCR      Fri Dec 30 14:25:01 2016
@@ -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.