Fix options framework abuse by sqsh*.

7 files changed, 100 insertions, 95 deletions

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"
diff --git a/databases/sqsh-x11/DESCR b/databases/sqsh-x11/DESCR
new file mode 100644
index 00000000000..b057e2f41ed
--- /dev/null
+++ b/databases/sqsh-x11/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 Xaw frontend.
diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile
index d9f8eb5fbb2..41b4cc70b82 100644
--- a/databases/sqsh-x11/Makefile
+++ b/databases/sqsh-x11/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/-/-x11-/}
+PKGNAME=	sqsh-x11-${VERSION}
 COMMENT=	SQL shell for Sybase and MS-SQL servers (Athena GUI)
 
-FILESDIR=	${.CURDIR}/../../databases/sqsh/files
-PATCHDIR=	${.CURDIR}/../../databases/sqsh/patches
-PKGDIR=		${.CURDIR}/../../databases/sqsh
+CONFIGURE_ARGS+=	--with-x
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.sqsh+=	-sqsh-motif sqsh-xaw
-
-.include "../../databases/sqsh/Makefile"
+.include "../../mk/xaw.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../databases/sqsh/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 6376868a35d..7654467591d 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,48 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2016/09/19 13:04:20 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2016/12/30 13:33:44 wiz Exp $
 
-# 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=	15
-CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sqsh/}
-
-CONFLICTS+=	sqsh-[0-9]*
-CONFLICTS+=	sqsh-motif-[0-9]*
-CONFLICTS+=	sqsh-x11-[0-9]*
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.sqsh.org/
-
-.include "options.mk"
-
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
-GNU_CONFIGURE=		yes
-BUILD_TARGET=		build
-
-CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
-CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.editlinereadline: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 "../../mk/readline.buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
new file mode 100644
index 00000000000..913454fd585
--- /dev/null
+++ b/databases/sqsh/Makefile.common
@@ -0,0 +1,52 @@
+# $NetBSD: Makefile.common,v 1.15 2016/12/30 13:33:44 wiz Exp $
+#
+# used by databases/sqsh/Makefile
+# used by databases/sqsh-motif/Makefile
+# used by databases/sqsh-x11/Makefile
+
+# 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-${VERSION}-src
+PKGNAME_BASE=	${DISTNAME:S/-src//}
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sqsh/}
+
+VERSION=	2.1
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.sqsh.org/
+LICENSE=	gnu-gpl-v2
+
+PATCHDIR=	${.CURDIR}/../../databases/sqsh/patches
+DISTINFO_FILE=	${.CURDIR}/../../databases/sqsh/distinfo
+PLIST_SRC=	${.CURDIR}/../../databases/sqsh/PLIST
+
+.include "${.CURDIR}/../../databases/sqsh/options.mk"
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
+GNU_CONFIGURE=		yes
+BUILD_TARGET=		build
+
+CONFIGURE_ARGS+=	--with-readline
+CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
+CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.editlinereadline: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 share/examples/sqsh
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/sqsh.1
+	${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc \
+		${DESTDIR}${PREFIX}/share/examples/sqsh
+
+.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
diff --git a/databases/sqsh/options.mk b/databases/sqsh/options.mk
index 1e23308a354..6b7051de87f 100644
--- a/databases/sqsh/options.mk
+++ b/databases/sqsh/options.mk
@@ -1,40 +1,11 @@
-# $NetBSD: options.mk,v 1.3 2013/01/19 20:27:30 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2016/12/30 13:33:45 wiz 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
+PKG_SUPPORTED_OPTIONS=		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
-
-###
-### Common dependencies for X GUI support.
-###
-.if !empty(PKG_OPTIONS:Msqsh-motif) || !empty(PKG_OPTIONS:Msqsh-xaw)
-.  include "../../x11/libX11/buildlink3.mk"
-.  include "../../x11/libXext/buildlink3.mk"
-.  include "../../x11/libXmu/buildlink3.mk"
-.  include "../../x11/libXt/buildlink3.mk"
-.endif
-
-###
 ### Support for the native Sybase Open Client.
 ###
 .if !empty(PKG_OPTIONS:Msybase-openclient)