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.

1 files changed, 45 insertions, 4 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"