pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors Restructure the following packages:
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c772b73920f
branches: trunk
changeset: 541434:3c772b73920f
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Apr 22 16:23:57 2008 +0000
description:
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:
editors/elvis-x11/DESCR | 10 ---
editors/elvis-x11/Makefile | 23 ++-----
editors/elvis/DESCR | 13 ++--
editors/elvis/Makefile | 44 ++++++++++++--
editors/elvis/Makefile.common | 26 ---------
editors/elvis/PLIST | 115 ++++++++++++++++++++++++++++++++++++++++
editors/elvis/PLIST.common | 116 -----------------------------------------
editors/elvis/distinfo | 6 +-
editors/elvis/options.mk | 19 ++++++
editors/elvis/patches/patch-ab | 93 ++++++++++++++++++++++++++++++--
editors/elvis/patches/patch-ac | 42 ++++++++------
11 files changed, 299 insertions(+), 208 deletions(-)
diffs (truncated from 604 to 300 lines):
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis-x11/DESCR
--- a/editors/elvis-x11/DESCR Tue Apr 22 16:23:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 92a79e0c3075 -r 3c772b73920f editors/elvis-x11/Makefile
--- a/editors/elvis-x11/Makefile Tue Apr 22 16:23:36 2008 +0000
+++ b/editors/elvis-x11/Makefile Tue Apr 22 16:23:57 2008 +0000
@@ -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= elvis-x11-2.2.0
-PKGREVISION= 5
-COMMENT= GUI for elvis, includes console elvis
+PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
+COMMENT= vi clone with regex-search, hex-edit, HTML/LaTeX preview (X11)
-CONFLICTS+= elvis-[0-9]*
-
-CONFIGURE_ARGS+= --with-x=yes
-CONFIGURE_ARGS+= --with-xft
+FILESDIR= ${.CURDIR}/../../editors/elvis/files
+PATCHDIR= ${.CURDIR}/../../editors/elvis/patches
+PKGDIR= ${.CURDIR}/../../editors/elvis
-#MAKEFLAGS+= CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}"
+PKG_OPTIONS.elvis+= x11
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "../../editors/elvis/Makefile"
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis/DESCR
--- a/editors/elvis/DESCR Tue Apr 22 16:23:36 2008 +0000
+++ b/editors/elvis/DESCR Tue Apr 22 16:23:57 2008 +0000
@@ -1,8 +1,7 @@
-Elvis - written by Steve Kirkendall is a very powerful vi/ex clone providing
-a remarkable number of bells and whistles like:
+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 (rather experimental), HTML and MAN pages.
- * Networking support (http and ftp).
- * GUI frontends for some of its platforms.
+ * Syntax Highlighting
+ * Multiple files in multiple windows
+ * Browse modes for LaTeX, HTML and man pages
+ * Networking support (HTTP and FTP)
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis/Makefile
--- a/editors/elvis/Makefile Tue Apr 22 16:23:36 2008 +0000
+++ b/editors/elvis/Makefile Tue Apr 22 16:23:57 2008 +0000
@@ -1,14 +1,42 @@
-# $NetBSD: Makefile,v 1.4 2007/02/22 19:26:25 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2008/04/22 16:23:57 jlam Exp $
+
+# This section contains variables that might be overridden.
+PKGNAME?= ${PKGNAME_BASE}
+COMMENT?= vi clone with regex-search, hex-edit, HTML/LaTeX preview
-.include "./Makefile.common"
+# Normal package Makefile contents follow.
+DISTNAME= elvis-2.2_0
+PKGNAME_BASE= ${DISTNAME:S/_/./}
+PKGREVISION= 6
+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.the-little-red-haired-girl.org/
+
+PKG_DESTDIR_SUPPORT= user-destdir
-PKGNAME= elvis-2.2.0
-PKGREVISION= 2
-COMMENT= Vi clone with regex search, hex editing, HTML and TeX previewing
+.include "options.mk"
+
+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}
-CONFLICTS+= elvis-x11[0-9]*
+PKG_SYSCONFSUBDIR?= elvis
+CONF_FILES= ${PREFIX}/share/elvis/elvis.rc \
+ ${PKG_SYSCONFDIR}/elvis.rc
-CONFIGURE_ARGS+= --with-x=no
+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"
.include "../../mk/bsd.pkg.mk"
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis/Makefile.common
--- a/editors/elvis/Makefile.common Tue Apr 22 16:23:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2005/12/29 06:21:38 jlam Exp $
-#
-
-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/
-
-PLIST_SRC= ${.CURDIR}/../elvis/PLIST.common
-PATCHDIR= ${.CURDIR}/../elvis/patches
-DISTINFO_FILE= ${.CURDIR}/../elvis/distinfo
-
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/elvis
-
-PKG_SYSCONFSUBDIR?= elvis
-CONF_FILES= ${PREFIX}/share/elvis/elvis.rc ${PKG_SYSCONFDIR}/elvis.rc
-
-SUBST_CLASSES+= sysconf
-SUBST_STAGE.sysconf= post-patch
-SUBST_FILES.sysconf= configure
-SUBST_FILES.sysconf+= Makefile.in
-SUBST_SED.sysconf= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/elvis/PLIST Tue Apr 22 16:23:57 2008 +0000
@@ -0,0 +1,115 @@
+@comment $NetBSD: PLIST,v 1.1 2008/04/22 16:23:57 jlam Exp $
+bin/elvfmt
+bin/elvis
+bin/elvtags
+bin/ref
+man/man1/elvfmt.1
+man/man1/elvis.1
+man/man1/elvtags.1
+man/man1/ref.1
+share/doc/elvis/bugs.txt
+share/doc/elvis/ctags.man
+share/doc/elvis/doexec.txt
+share/doc/elvis/elvfmt.man
+share/doc/elvis/elvis.html
+share/doc/elvis/elvis.man
+share/doc/elvis/elviscut.html
+share/doc/elvis/elvisdm.html
+share/doc/elvis/elvisex.html
+share/doc/elvis/elvisexp.html
+share/doc/elvis/elvisgui.html
+share/doc/elvis/elvisinp.html
+share/doc/elvis/elvismsg.html
+share/doc/elvis/elvisnet.html
+share/doc/elvis/elvisopt.html
+share/doc/elvis/elvisos.html
+share/doc/elvis/elvisqr.html
+share/doc/elvis/elvisre.html
+share/doc/elvis/elvisses.html
+share/doc/elvis/elvistag.html
+share/doc/elvis/elvistip.html
+share/doc/elvis/elvistrs.msg
+share/doc/elvis/elvisvi.html
+share/doc/elvis/elvtags.man
+share/doc/elvis/fmt.man
+share/doc/elvis/howto.html
+share/doc/elvis/license.html
+share/doc/elvis/printdoc.bat
+share/doc/elvis/ref.man
+share/elvis/README
+share/elvis/elvis.ali
+share/elvis/elvis.arf
+share/elvis/elvis.awf
+share/elvis/elvis.brf
+share/elvis/elvis.bro
+share/elvis/elvis.bwf
+share/elvis/elvis.clr
+share/elvis/elvis.glade
+share/elvis/elvis.gnome
+share/elvis/elvis.ini
+share/elvis/elvis.lat
+share/elvis/elvis.msg
+share/elvis/elvis.pc8
+share/elvis/elvis.ps
+share/elvis/elvis.rc
+share/elvis/elvis.spe
+share/elvis/elvis.syn
+share/elvis/elvis.x11
+share/elvis/icons/elvis.xpm
+share/elvis/icons/elvis1.xpm
+share/elvis/icons/elvis2.xpm
+share/elvis/icons/elvis3.xpm
+share/elvis/icons/kde.xpm
+share/elvis/icons/mini.xpm
+share/elvis/icons/normal.xpm
+share/elvis/icons/presley.xpm
+share/elvis/icons/small.xpm
+share/elvis/scripts/align.ex
+share/elvis/scripts/augz.ex
+share/elvis/scripts/cb.ex
+share/elvis/scripts/cursor.ex
+share/elvis/scripts/decode.ex
+share/elvis/scripts/define.ex
+share/elvis/scripts/dict.ex
+share/elvis/scripts/ellipse.ex
+share/elvis/scripts/find.ex
+share/elvis/scripts/fontsize.ex
+share/elvis/scripts/html.ex
+share/elvis/scripts/info.ex
+share/elvis/scripts/info2.ex
+share/elvis/scripts/inregion.ex
+share/elvis/scripts/isearch.ex
+share/elvis/scripts/life.ex
+share/elvis/scripts/likevim.ex
+share/elvis/scripts/mailto.ex
+share/elvis/scripts/makehtml.ex
+share/elvis/scripts/match.ex
+share/elvis/scripts/pig.ex
+share/elvis/scripts/reverse.ex
+share/elvis/scripts/rot13.ex
+share/elvis/scripts/sfb.ex
+share/elvis/scripts/shade.ex
+share/elvis/scripts/show.ex
+share/elvis/scripts/since.ex
+share/elvis/scripts/tags.ex
+share/elvis/scripts/wc.ex
+share/elvis/scripts/whois.ex
+share/elvis/scripts/xbuf.ex
+share/elvis/stubs/ansistub.c
+share/elvis/stubs/gdkstub.c
+share/elvis/stubs/glibstub.c
+share/elvis/stubs/gtkstub.c
+share/elvis/stubs/pthread.c
+share/elvis/stubs/unixstub.c
+share/elvis/stubs/xftstub.c
+share/elvis/stubs/xlibstub.c
+share/elvis/stubs/xpmstub.c
+share/elvis/tags
+share/elvis/themes/sand.ex
+share/elvis/themes/sand.xpm
+@dirrm share/elvis/themes
+@dirrm share/elvis/stubs
+@dirrm share/elvis/scripts
+@dirrm share/elvis/icons
+@dirrm share/doc/elvis
+@dirrm share/elvis
diff -r 92a79e0c3075 -r 3c772b73920f editors/elvis/PLIST.common
--- a/editors/elvis/PLIST.common Tue Apr 22 16:23:36 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.3 2006/05/15 16:29:19 joerg Exp $
-bin/elvfmt
-bin/elvis
-bin/elvtags
-bin/ref
-man/man1/elvfmt.1
-man/man1/elvis.1
-man/man1/elvtags.1
-man/man1/ref.1
-share/elvis/README
-share/elvis/README.etc
-share/doc/elvis/bugs.txt
-share/doc/elvis/ctags.man
-share/doc/elvis/doexec.txt
-share/doc/elvis/elvfmt.man
-share/doc/elvis/elvis.html
-share/doc/elvis/elvis.man
-share/doc/elvis/elviscut.html
-share/doc/elvis/elvisdm.html
-share/doc/elvis/elvisex.html
-share/doc/elvis/elvisexp.html
-share/doc/elvis/elvisgui.html
-share/doc/elvis/elvisinp.html
-share/doc/elvis/elvismsg.html
-share/doc/elvis/elvisnet.html
-share/doc/elvis/elvisopt.html
-share/doc/elvis/elvisos.html
-share/doc/elvis/elvisqr.html
-share/doc/elvis/elvisre.html
-share/doc/elvis/elvisses.html
Home |
Main Index |
Thread Index |
Old Index