From 734f9e2b0143dfa46e8f750846ec6b876197b389 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 30 Dec 2016 13:33:44 +0000
Subject: Fix options framework abuse by sqsh*.

---
 databases/sqsh-motif/DESCR    | 12 ++++++++++++
 databases/sqsh-motif/Makefile | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 databases/sqsh-motif/DESCR

(limited to 'databases/sqsh-motif')

diff --git a/databases/sqsh-motif/DESCR b/databases/sqsh-motif/DESCR
new file mode 100644
index 00000000000..fbaf263b807
--- /dev/null
+++ b/databases/sqsh-motif/DESCR
@@ -0,0 +1,12 @@
+Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), it
+is intended as a replacement for the venerable 'isql' program supplied
+by Sybase.  It came about due to years of frustration of trying to do
+real work with a program that was never meant to perform real work.
+
+Sqsh is much more than a nice prompt, it is intended to provide much of
+the functionality provided by a good shell, such as variables,
+redirection, pipes, back-grounding, job control, history, command
+completion, and dynamic configuration.  Also, as a by-product of the
+design, it is remarkably easy to extend and add functionality.
+
+This package uses the Motif frontend.
diff --git a/databases/sqsh-motif/Makefile b/databases/sqsh-motif/Makefile
index d8bc00ae0c6..6c3e78a5d1f 100644
--- a/databases/sqsh-motif/Makefile
+++ b/databases/sqsh-motif/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2012/10/02 21:25:54 asau Exp $
+# $NetBSD: Makefile,v 1.11 2016/12/30 13:33:45 wiz Exp $
 
-PKGNAME=	${PKGNAME_BASE:S/-/-motif-/}
+PKGNAME=	sqsh-motif-${VERSION}
 COMMENT=	SQL shell for Sybase and MS-SQL servers (Motif GUI)
 
-FILESDIR=	${.CURDIR}/../../databases/sqsh/files
-PATCHDIR=	${.CURDIR}/../../databases/sqsh/patches
-PKGDIR=		${.CURDIR}/../../databases/sqsh
+CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE:Q}
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.sqsh+=	sqsh-motif -sqsh-xaw
-
-.include "../../databases/sqsh/Makefile"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+.include "../../databases/sqsh/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3