Wed Apr 23 20:23:39 2008 UTC ()
Include bsd.prefs.mk so that the options appended by the package Makefile
take precedence.
(jlam)
diff -r1.7 -r1.8 pkgsrc/databases/sqsh-motif/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/sqsh-x11/Makefile
diff -r1.13 -r1.14 pkgsrc/editors/elvis-x11/Makefile
diff -r1.13 -r1.14 pkgsrc/www/htmldoc-x11/Makefile
--- pkgsrc/databases/sqsh-motif/Makefile 2008/04/22 16:23:36 1.7
+++ pkgsrc/databases/sqsh-motif/Makefile 2008/04/23 20:23:38 1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/22 16:23:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/23 20:23:38 jlam Exp $
PKGNAME= ${PKGNAME_BASE:S/-/-motif-/}
COMMENT= SQL shell for Sybase and MS-SQL servers (Motif GUI)
@@ -6,6 +6,8 @@
FILESDIR= ${.CURDIR}/../../databases/sqsh/files
PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
PKGDIR= ${.CURDIR}/../../databases/sqsh
+
+.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.sqsh+= sqsh-motif -sqsh-xaw
--- pkgsrc/databases/sqsh-x11/Makefile 2008/04/22 16:23:37 1.7
+++ pkgsrc/databases/sqsh-x11/Makefile 2008/04/23 20:23:38 1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/22 16:23:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/04/23 20:23:38 jlam Exp $
PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
COMMENT= SQL shell for Sybase and MS-SQL servers (Athena GUI)
@@ -6,6 +6,8 @@
FILESDIR= ${.CURDIR}/../../databases/sqsh/files
PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
PKGDIR= ${.CURDIR}/../../databases/sqsh
+
+.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.sqsh+= -sqsh-motif sqsh-xaw
--- pkgsrc/editors/elvis-x11/Makefile 2008/04/22 16:23:57 1.13
+++ pkgsrc/editors/elvis-x11/Makefile 2008/04/23 20:23:38 1.14
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/22 16:23:57 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/23 20:23:38 jlam Exp $
PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
COMMENT= vi clone with regex-search, hex-edit, HTML/LaTeX preview (X11)
@@ -6,6 +6,8 @@
FILESDIR= ${.CURDIR}/../../editors/elvis/files
PATCHDIR= ${.CURDIR}/../../editors/elvis/patches
PKGDIR= ${.CURDIR}/../../editors/elvis
+
+.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.elvis+= x11
--- pkgsrc/www/htmldoc-x11/Makefile 2008/04/22 16:24:31 1.13
+++ pkgsrc/www/htmldoc-x11/Makefile 2008/04/23 20:23:38 1.14
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/04/22 16:24:31 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/23 20:23:38 jlam Exp $
PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
@@ -7,6 +7,8 @@
PKGDIR= ${.CURDIR}/../../www/htmldoc
DESCR_SRC= ${.CURDIR}/DESCR
+
+.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.htmldoc+= htmldoc-gui