[pkgsrc/trunk]: pkgsrc Include bsd.prefs.mk so that the options appended by t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9370f1e22c46
branches:  trunk
changeset: 541519:9370f1e22c46
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 23 20:23:38 2008 +0000

description:
Include bsd.prefs.mk so that the options appended by the package Makefile
take precedence.

diffstat:

 databases/sqsh-motif/Makefile |  4 +++-
 databases/sqsh-x11/Makefile   |  4 +++-
 editors/elvis-x11/Makefile    |  4 +++-
 www/htmldoc-x11/Makefile      |  4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diffs (72 lines):

diff -r 4799f32f0e47 -r 9370f1e22c46 databases/sqsh-motif/Makefile
--- a/databases/sqsh-motif/Makefile     Wed Apr 23 20:22:31 2008 +0000
+++ b/databases/sqsh-motif/Makefile     Wed Apr 23 20:23:38 2008 +0000
@@ -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)
@@ -7,6 +7,8 @@
 PATCHDIR=      ${.CURDIR}/../../databases/sqsh/patches
 PKGDIR=                ${.CURDIR}/../../databases/sqsh
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS.sqsh+=     sqsh-motif -sqsh-xaw
 
 .include "../../databases/sqsh/Makefile"
diff -r 4799f32f0e47 -r 9370f1e22c46 databases/sqsh-x11/Makefile
--- a/databases/sqsh-x11/Makefile       Wed Apr 23 20:22:31 2008 +0000
+++ b/databases/sqsh-x11/Makefile       Wed Apr 23 20:23:38 2008 +0000
@@ -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)
@@ -7,6 +7,8 @@
 PATCHDIR=      ${.CURDIR}/../../databases/sqsh/patches
 PKGDIR=                ${.CURDIR}/../../databases/sqsh
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS.sqsh+=     -sqsh-motif sqsh-xaw
 
 .include "../../databases/sqsh/Makefile"
diff -r 4799f32f0e47 -r 9370f1e22c46 editors/elvis-x11/Makefile
--- a/editors/elvis-x11/Makefile        Wed Apr 23 20:22:31 2008 +0000
+++ b/editors/elvis-x11/Makefile        Wed Apr 23 20:23:38 2008 +0000
@@ -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)
@@ -7,6 +7,8 @@
 PATCHDIR=      ${.CURDIR}/../../editors/elvis/patches
 PKGDIR=                ${.CURDIR}/../../editors/elvis
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS.elvis+=    x11
 
 .include "../../editors/elvis/Makefile"
diff -r 4799f32f0e47 -r 9370f1e22c46 www/htmldoc-x11/Makefile
--- a/www/htmldoc-x11/Makefile  Wed Apr 23 20:22:31 2008 +0000
+++ b/www/htmldoc-x11/Makefile  Wed Apr 23 20:23:38 2008 +0000
@@ -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-/}
 
@@ -8,6 +8,8 @@
 
 DESCR_SRC=     ${.CURDIR}/DESCR
 
+.include "../../mk/bsd.prefs.mk"
+
 PKG_OPTIONS.htmldoc+=  htmldoc-gui
 
 .include "../../www/htmldoc/Makefile"