Include bsd.prefs.mk so that the options appended by the package Makefile

take precedence.
This commit is contained in:
jlam 2008-04-23 20:23:38 +00:00
parent 5b95469b1c
commit 8f876d71b3
4 changed files with 12 additions and 4 deletions

View file

@ -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 @@ 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
.include "../../databases/sqsh/Makefile"

View file

@ -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 @@ 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
.include "../../databases/sqsh/Makefile"

View file

@ -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 @@ FILESDIR= ${.CURDIR}/../../editors/elvis/files
PATCHDIR= ${.CURDIR}/../../editors/elvis/patches
PKGDIR= ${.CURDIR}/../../editors/elvis
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.elvis+= x11
.include "../../editors/elvis/Makefile"

View file

@ -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 @@ PKGDIR= ${.CURDIR}/../../www/htmldoc
DESCR_SRC= ${.CURDIR}/DESCR
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS.htmldoc+= htmldoc-gui
.include "../../www/htmldoc/Makefile"