diff options
author | jlam <jlam> | 2008-04-22 16:23:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-04-22 16:23:57 +0000 |
commit | 323793587195ebed1bc2a7228ce8d2af9a7aee7e (patch) | |
tree | 69219d41c20a99bd621ba995cedc85cd021cbb2f /editors/elvis-x11 | |
parent | 8d802ad5f0f77a3cf4689bc37642b5682de8628c (diff) | |
download | pkgsrc-323793587195ebed1bc2a7228ce8d2af9a7aee7e.tar.gz |
Restructure the following packages:
editors/elvis
editors/elvis-x11
The latter is now just editors/elvis built with a specific set of
options. Changes include:
+ Add options.mk that supports a new "x11" option.
+ Remove Makefile.common and move all logic into elvis/Makefile and
elvis/options.mk.
+ Rename PLIST.common to PLIST as there are no PLIST differences
between elvis and elvis-x11.
+ Modify patch-ab to add a --sysconfdir option to the configure script
and fix the parsing of --with-x* options so that --with-xft isn't
ignored.
+ Modify patch-ac to handle SYSCONFDIR in Makefile.in passed in from the
configure script.
+ Remove the unnecessary substitution for PKG_SYSCONFDIR now that the
configure script and Makefile.in directly support --sysconfdir.
+ Include termcap.buildlink3.mk to properly deal with termcap/curses
issues (elvis needs termcap).
+ Add full DESTDIR support.
+ Set HOMEPAGE to the correct URL.
+ Bump the PKGREVISION for elvis and elvis-x11 to 6. Both packages
now track and use the same PKGREVISION number.
Diffstat (limited to 'editors/elvis-x11')
-rw-r--r-- | editors/elvis-x11/DESCR | 10 | ||||
-rw-r--r-- | editors/elvis-x11/Makefile | 23 |
2 files changed, 8 insertions, 25 deletions
diff --git a/editors/elvis-x11/DESCR b/editors/elvis-x11/DESCR deleted file mode 100644 index 1985b9faa03..00000000000 --- a/editors/elvis-x11/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -This is the X11 GUI version of Elvis. It includes the console version, as well. - -Elvis - written by Steve Kirkendall is a very powerful vi/ex clone providing -a remarkable number of bells and whistles like: - - * Syntax Highlighting. - * Multiple files in multiple windows. - * Browse modes for LaTeX (rather experimental), HTML and MAN pages. - * Networking support (http and ftp). - * GUI frontends for some of its platforms. diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index 3ead24730b1..eb2fb7db494 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -1,19 +1,12 @@ -# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:25 wiz Exp $ -# +# $NetBSD: Makefile,v 1.13 2008/04/22 16:23:57 jlam Exp $ -.include "../../editors/elvis/Makefile.common" +PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} +COMMENT= vi clone with regex-search, hex-edit, HTML/LaTeX preview (X11) -PKGNAME= elvis-x11-2.2.0 -PKGREVISION= 5 -COMMENT= GUI for elvis, includes console elvis +FILESDIR= ${.CURDIR}/../../editors/elvis/files +PATCHDIR= ${.CURDIR}/../../editors/elvis/patches +PKGDIR= ${.CURDIR}/../../editors/elvis -CONFLICTS+= elvis-[0-9]* +PKG_OPTIONS.elvis+= x11 -CONFIGURE_ARGS+= --with-x=yes -CONFIGURE_ARGS+= --with-xft - -#MAKEFLAGS+= CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}" - -.include "../../x11/libXft/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" +.include "../../editors/elvis/Makefile" |