Restructure the following packages:

	databases/sqsh
	databases/sqsh-motif
	databases/sqsh-x11

The latter two are now just databases/sqsh built with a specific set of
options.  Changes include:

+ Add options.mk that supports three options:

	sqsh-motif		Motif GUI
	sqsh-xaw		Athena GUI
	sybase-openclient	Use real Sybase

  Note that USE_SYBASE_OPENCLIENT is a legacy variable for the new
  global "sybase-openclient" option.

+ Remove Makefile.common and move all logic into sqsh/Makefile and
  sqsh/options.mk.

+ Remove section in patch-aa that tried to deal with termcap/curses
  issues for readline.  That is now automatically taken care of in
  pkgsrc through termcap.buildlink3.mk, which is included here
  indirectly by readline/buildlink3.mk.

+ Add full DESTDIR support.

+ Bump the PKGREVISION for sqsh, sqsh-motif and sqsh-x11 to 5.  All
  three packages now track and use the same PKGREVISION number.

5 files changed, 94 insertions, 75 deletions

diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 91245c7f34c..d827aea41b1 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,9 +1,50 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:37 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/22 16:23:36 jlam Exp $
 
-PKGNAME=	sqsh-2.1
-PKGREVISION=	2
+# This section contains variables that might be overridden.
+PKGNAME?=	${PKGNAME_BASE}
+COMMENT?=	SQL shell for Sybase and MS-SQL servers
 
+# Normal package Makefile contents follow.
+DISTNAME=	sqsh-2.1-src
+PKGNAME_BASE=	${DISTNAME:S/-src//}
+PKGREVISION=	5
+CATEGORIES=	databases
+MASTER_SITES=	${HOMEPAGE}
+
+CONFLICTS+=	sqsh-[0-9]*
 CONFLICTS+=	sqsh-motif-[0-9]*
 CONFLICTS+=	sqsh-x11-[0-9]*
 
-.include "Makefile.common"
+MAINTAINER=	tsarna@NetBSD.org
+HOMEPAGE=	http://www.sqsh.org/
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "options.mk"
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
+GNU_CONFIGURE=		yes
+BUILD_TARGET=		build
+
+CONFIGURE_ARGS+=	--with-readline
+CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.readline:Q}/include
+CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.readline:Q}/lib
+
+CHECK_HEADERS_SKIP=	src/sqsh_config.h
+
+CONF_FILES+=		${PREFIX}/share/examples/sqsh/sample.sqshrc	\
+			${PKG_SYSCONFDIR}/sqshrc
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sqsh.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sqsh
+	${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc \
+		${DESTDIR}${PREFIX}/share/examples/sqsh
+
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
deleted file mode 100644
index 67d3b61944b..00000000000
--- a/databases/sqsh/Makefile.common
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2006/11/10 20:04:26 rillig Exp $
-
-DISTNAME=	sqsh-2.1-src
-CATEGORIES=	databases
-MASTER_SITES=	${HOMEPAGE}
-
-MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://www.sqsh.org/
-COMMENT?=	SQL shell for Sybase and MS-SQL servers
-
-BUILD_TARGET=		build
-
-WRKSRC=			${WRKDIR}/${DISTNAME:C|-src||}
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-readline
-
-CHECK_HEADERS_SKIP=	src/sqsh_config.h
-
-CONF_FILES+=		${PREFIX}/share/examples/sqsh/sample.sqshrc ${PKG_SYSCONFDIR}/sqshrc
-
-# support for the native Sybase Open Client
-BUILD_DEFS+=		USE_SYBASE_OPENCLIENT
-BUILD_DEFS+=		SYBASE
-.if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
-.  if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
-BUILDLINK_PASSTHRU_DIRS=${SYBASE}
-_SYBASE=		${SYBASE}
-.  else
-PKG_FAIL_REASON+=	"You must define SYBASE to the base directory of Open Client."
-.  endif
-.else
-_SYBASE=		${BUILDLINK_PREFIX.freetds}
-CONFIGURE_ENV+=		SYBASE_LIBS=-lct
-MAKE_FLAGS+=		SYBASE_LIBS=-lct
-.endif
-
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${_SYBASE}/lib
-CONFIGURE_ENV+=		SYBASE=${_SYBASE:Q}
-CONFIGURE_ENV+=		INCDIRS="${BUILDLINK_PREFIX.readline}/include"
-CONFIGURE_ENV+=		LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/${PKGMANDIR}/man1/sqsh.1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sqsh
-	${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc ${PREFIX}/share/examples/sqsh
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(USE_SYBASE_OPENCLIENT)
-.  include "../../databases/freetds/buildlink3.mk"
-.endif
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo
index e706ee5a6b4..09f7cfa2e6b 100644
--- a/databases/sqsh/distinfo
+++ b/databases/sqsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/01/13 13:44:13 joerg Exp $
+$NetBSD: distinfo,v 1.9 2008/04/22 16:23:36 jlam Exp $
 
 SHA1 (sqsh-2.1-src.tar.gz) = 7bbdda5590262e465508c889b86107465f3a2b90
 RMD160 (sqsh-2.1-src.tar.gz) = 9a76e661a10b79fd4c0d7f58878caf6e6349e590
 Size (sqsh-2.1-src.tar.gz) = 358874 bytes
-SHA1 (patch-aa) = 9d7dae1b650839229ec007ba68fad0a2824d2e1e
+SHA1 (patch-aa) = 998ec509579798eac267fa2b8fa8da95852bfd2d
 SHA1 (patch-ab) = 1b2617e9b4f426780aac5989da21c2d5ddea7e56
 SHA1 (patch-ac) = 8b1edf45f4513ce45f8236f6fb76088cec5a5b31
 SHA1 (patch-ad) = 0448f23965e537e62d2b2d2e4c4567472cd6f886
diff --git a/databases/sqsh/options.mk b/databases/sqsh/options.mk
new file mode 100644
index 00000000000..7258e115204
--- /dev/null
+++ b/databases/sqsh/options.mk
@@ -0,0 +1,45 @@
+# $NetBSD: options.mk,v 1.1 2008/04/22 16:23:36 jlam Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.sqsh
+PKG_SUPPORTED_OPTIONS+=		sybase-openclient
+PKG_OPTIONS_OPTIONAL_GROUPS+=	x11
+PKG_OPTIONS_GROUP.x11+=		sqsh-motif sqsh-xaw
+PKG_OPTIONS_LEGACY_VARS+=	USE_SYBASE_OPENCLIENT:sybase-openclient
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Motif GUI support.
+###
+.if !empty(PKG_OPTIONS:Msqsh-motif)
+.  include "../../mk/motif.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE:Q}
+.endif
+
+###
+### Athena GUI support.
+###
+.if !empty(PKG_OPTIONS:Msqsh-xaw)
+.  include "../../mk/xaw.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x
+.endif
+
+###
+### Support for the native Sybase Open Client.
+###
+.if !empty(PKG_OPTIONS:Msybase-openclient)
+BUILD_DEFS+=		SYBASE
+.  if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
+BUILDLINK_PASSTHRU_DIRS+=	${SYBASE}
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${SYBASE:Q}/lib
+CONFIGURE_ENV+=		SYBASE=${SYBASE:Q}
+.  else
+PKG_FAIL_REASON+=	"You must define SYBASE to the base directory of Open Client."
+.  endif
+.else
+.  include "../../databases/freetds/buildlink3.mk"
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX:Q}/lib
+CONFIGURE_ENV+=		SYBASE=${BUILDLINK_PREFIX.freetds:Q}
+CONFIGURE_ENV+=		SYBASE_LIBS=-lct
+MAKE_FLAGS+=		SYBASE_LIBS=-lct
+.endif
diff --git a/databases/sqsh/patches/patch-aa b/databases/sqsh/patches/patch-aa
index d5aae7d2d20..cea003ab1ea 100644
--- a/databases/sqsh/patches/patch-aa
+++ b/databases/sqsh/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2004/03/29 03:11:03 grant Exp $
+$NetBSD: patch-aa,v 1.6 2008/04/22 16:23:36 jlam Exp $
 
---- configure.orig	2001-11-10 00:58:04.000000000 +1100
+--- configure.orig	2001-11-09 08:58:04.000000000 -0500
 +++ configure
 @@ -1209,6 +1209,8 @@ echo "configure:1191: checking Open Clie
  				SYBASE_OS="-lm -ldl -ldgc";;
@@ -11,15 +11,6 @@ $NetBSD: patch-aa,v 1.5 2004/03/29 03:11:03 grant Exp $
  			*)
  				SYBASE_OS="-lm -ldl";;
  		esac
-@@ -1373,7 +1375,7 @@ else
- 			CPPFLAGS="${CPPFLAGS} -L${READLINE_LIBDIR}"
- 		fi
- 
--		for lib in "-lHcurses" "-lcurses" "-lncurses" "-ltermcap" \
-+		for lib in "-ltermcap" "-lHcurses" "-lcurses" "-lncurses" \
- 			"-ltermcap -lucb"
- 		do
- 			LIBS="${ORIG_LIBS} -lreadline ${lib}"
 @@ -1459,7 +1461,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else