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.

2 files changed, 112 insertions, 23 deletions

diff --git a/editors/elvis/patches/patch-ab b/editors/elvis/patches/patch-ab
index 6aeb6a6cc65..6292aeca1a1 100644
--- a/editors/elvis/patches/patch-ab
+++ b/editors/elvis/patches/patch-ab
@@ -1,8 +1,81 @@
-$NetBSD: patch-ab,v 1.2 2004/01/21 17:43:55 recht Exp $
+$NetBSD: patch-ab,v 1.3 2008/04/22 16:23:57 jlam Exp $
 
---- configure.orig	2003-10-21 04:32:25.000000000 +0200
-+++ configure	2004-01-21 18:22:46.000000000 +0100
-@@ -905,11 +905,8 @@
+--- configure.orig	2003-10-20 22:32:25.000000000 -0400
++++ configure
+@@ -27,6 +27,7 @@ GUI_GNOME=bug
+ #	 --bindir=DIR		where to install the executables
+ #	 --datadir=DIR		where to install the supporting data files
+ #	 --docdir=DIR		where to install the :help files & other docs
++#	 --sysconfdir=DIR	where to install the configuration files
+ #	 --prefix=DIR		like --bindir=DIR/bin --datadir=DIR/lib/elvis
+ #	 --ioctl=VARIETY	type of tty ioctl to use: termios, termio, sgtty
+ #	 --verbose		explain each decision
+@@ -66,6 +67,7 @@ PREFIX=/usr
+ BINDIR='$(PREFIX)/bin'
+ DATADIR='$(PREFIX)/share/elvis/'
+ DOCDIR='$(PREFIX)/share/elvis/doc/'
++SYSCONFDIR='/etc/elvis'
+ SYS=""
+ DEFAULT_CC="cc -O"
+ IOCTL=""
+@@ -130,6 +132,7 @@ usage()
+ 	echo "       --x-libraries=DIR  add DIR to path for X-windows libraries"
+ 	echo "       --bindir=DIR       where to install the executables"
+ 	echo "       --datadir=DIR      where to install the supporting data files"
++	echo "       --sysconfdir=DIR   where to install the configuration files"
+ 	echo "       --prefix=DIR       like --bindir=DIR/bin --datadir=DIR/share/elvis"
+ 	echo "       --libs=STRING      non-X11 part of the LIBS= string in Makefile"
+ 	echo "       --ioctl=VARIETY    type of tty ioctl to use: termios, termio, or sgtty"
+@@ -157,14 +160,6 @@ do
+ 		GUI_GNOME=define
+ 		args="$args --with-gnome"
+ 		;;
+-	  --with-x=no|--without-x)
+-		GUI_X11=undef
+-		args="$args --with-x=no"
+-		;;
+-	  --with-x*)
+-		GUI_X11=define
+-		args="$args --with-x"
+-		;;
+ 	  --with-xft=no|--without-xft)
+ 		FEATURE_XFT=undef
+ 		args="$args --with-xft=no"
+@@ -173,6 +168,14 @@ do
+ 		FEATURE_XFT=define
+ 		args="$args --with-xft"
+ 		;;
++	  --with-x=no|--without-x)
++		GUI_X11=undef
++		args="$args --with-x=no"
++		;;
++	  --with-x*)
++		GUI_X11=define
++		args="$args --with-x"
++		;;
+ 	  --with-gcc=no|--without-gcc)
+ 		gnu=n
+ 		forcegcc=n
+@@ -203,6 +206,10 @@ do
+ 		DOCDIR=`echo "$i"|sed 's/^--docdir=//'`
+ 		args="$args $i"
+ 		;;
++	  --sysconfdir=*)
++		SYSCONFDIR=`echo "$i"|sed 's/^--sysconfdir=//'`
++		args="$args $i"
++		;;
+ 	  --prefix=*)
+ 		PREFIX=`echo "$i"|sed 's/^--prefix=//'`
+ 		args="$args $i"
+@@ -886,6 +893,7 @@ echo "Compiler: $CC"
+ echo "Bin dir:  "`echo "$BINDIR" |sed s,'$(PREFIX)',"$PREFIX",`
+ echo "Data dir: "`echo "$DATADIR"|sed s,'$(PREFIX)',"$PREFIX",`
+ echo "Doc dir:  "`echo "$DOCDIR" |sed s,'$(PREFIX)',"$PREFIX",`
++echo "Conf dir: "`echo "$SYSCONFDIR"|sed s,'$(PREFIX)',"$PREFIX",`
+ echo "Man dir:  "`sh instman.sh -d -p"${PREFIX}"`
+ [ "$WHY" ] || echo "To see details, run \"configure --verbose\""
+ 
+@@ -905,11 +913,8 @@ if [ "$GUI_X11" = "define" ]
  then
  	case "$FEATURE_XFT" in
  	  define)
@@ -16,12 +89,20 @@ $NetBSD: patch-ab,v 1.2 2004/01/21 17:43:55 recht Exp $
  		;;
  	  *)	
  		xft=""
-@@ -950,7 +947,7 @@
+@@ -950,7 +955,7 @@ esac
  
  
  # Generate the "config.h" file
 -ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
-+ELVISPATH=`echo "~/.elvis:@PKG_SYSCONFDIR@:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
++ELVISPATH=`echo "~/.elvis:$SYSCONFDIR:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
  cat >config.h <<eof-config
  /* config.h */
  
+@@ -1200,6 +1205,7 @@ s!^PREFIX=.*!PREFIX=$PREFIX!
+ s!^BINDIR=.*!BINDIR=$BINDIR!
+ s!^DATADIR=.*!DATADIR=$DATADIR!
+ s!^DOCDIR=.*!DOCDIR=$DOCDIR!
++s!^SYSCONFDIR=.*!SYSCONFDIR=$SYSCONFDIR!
+ eof-all
+ if [ -d /usr/local/X11/include ]
+ then
diff --git a/editors/elvis/patches/patch-ac b/editors/elvis/patches/patch-ac
index b98d2a9f55f..8eba97c5bee 100644
--- a/editors/elvis/patches/patch-ac
+++ b/editors/elvis/patches/patch-ac
@@ -1,8 +1,20 @@
-$NetBSD: patch-ac,v 1.2 2006/05/15 16:29:19 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/04/22 16:23:57 jlam Exp $
 
---- Makefile.in.orig	2003-10-21 02:32:25.000000000 +0000
+--- Makefile.in.orig	2003-10-20 22:32:25.000000000 -0400
 +++ Makefile.in
-@@ -440,23 +440,24 @@ install.unix: $(ALL) doc/elvtags.man
+@@ -89,6 +89,11 @@ DATADIR=$(PREFIX)/share/elvis
+ DOCDIR= $(PREFIX)/share/elvis/doc
+ 
+ ################################################################################
++# This is the directory where "make install" will place the customized elvis
++# configuration files.
++SYSCONFDIR=/etc/elvis
++
++################################################################################
+ # This is the shell command for copying one file to another
+ CP=cp
+ 
+@@ -440,23 +445,16 @@ install.unix: $(ALL) doc/elvtags.man
  	(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
  	-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
  	chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
@@ -10,29 +22,25 @@ $NetBSD: patch-ac,v 1.2 2006/05/15 16:29:19 joerg Exp $
 -	-[ -d /etc/elvis ] || mkdir /etc/elvis
 -	-chmod 0755 /etc/elvis/
 -	-@ : >/etc/elvis/README && ( \
-+	${BSD_INSTALL_MAN} doc/elvfmt.man ${PREFIX}/${PKGMANDIR}/man1/elvfmt.1
-+	${BSD_INSTALL_MAN} doc/elvis.man ${PREFIX}/${PKGMANDIR}/man1/elvis.1
-+	${BSD_INSTALL_MAN} doc/elvtags.man ${PREFIX}/${PKGMANDIR}/man1/elvtags.1
-+	${BSD_INSTALL_MAN} doc/ref.man ${PREFIX}/${PKGMANDIR}/man1/ref.1
-+	-@ : >$(DATADIR)/README.etc && ( \
- 	  echo "This directory contains system-dependent versions of elvis' configuration" \
- 	  echo "files.  The standard versions are available in $(DATADIR)"  \
- 	  echo "To customize any of these configuration files for this system,"  \
+-	  echo "This directory contains system-dependent versions of elvis' configuration" \
+-	  echo "files.  The standard versions are available in $(DATADIR)"  \
+-	  echo "To customize any of these configuration files for this system,"  \
 -	  echo "first copy the standard version of the file into /etc/elvis and" \
-+	  echo "first copy the standard version of the file into @PKG_SYSCONFDIR@ and" \
- 	  echo "then edit the copy.  Leave the standard version unchanged." \
+-	  echo "then edit the copy.  Leave the standard version unchanged." \
 -	) >>/etc/elvis/README
 -	-chmod 0644 /etc/elvis/README
-+	) >>$(DATADIR)/README.etc
-+	-chmod 0644 $(DATADIR)/README.etc
++	${BSD_INSTALL_MAN} doc/elvfmt.man $(PREFIX)/${PKGMANDIR}/man1/elvfmt.1
++	${BSD_INSTALL_MAN} doc/elvis.man $(PREFIX)/${PKGMANDIR}/man1/elvis.1
++	${BSD_INSTALL_MAN} doc/elvtags.man $(PREFIX)/${PKGMANDIR}/man1/elvtags.1
++	${BSD_INSTALL_MAN} doc/ref.man $(PREFIX)/${PKGMANDIR}/man1/ref.1
  	@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
  	@echo "files.  DO NOT MODIFY THESE FILES!  To perform host-specific customization," >>$(DATADIR)/README
 -	@echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
-+	@echo "copy files from this directory into @PKG_SYSCONFDIR@/, and then modify the copies." >>$(DATADIR)/README
++	@echo "copy files from this directory into $(SYSCONFDIR)/, and then modify the copies." >>$(DATADIR)/README
  	@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
  	@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
 -	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
-+	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or @PKG_SYSCONFDIR@/" >>$(DATADIR)/README
++	@echo "modify the copies.  Any file that elvis finds in ~/.elvis/ or $(SYSCONFDIR)/" >>$(DATADIR)/README
  	@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
  	chmod 0644 $(DATADIR)/README