diff options
| author | jlam <jlam> | 2008-04-23 20:23:38 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-23 20:23:38 +0000 |
| commit | 6f895a0e7b13dd8c28985e89e3d20468744b2408 (patch) | |
| tree | e790ec4895521d1f1794f73680fa6eb016404e49 | |
| parent | 32555fd39ebfbfdd5b30bfd8b067e4aa9894abf6 (diff) | |
| download | pkgsrc-6f895a0e7b13dd8c28985e89e3d20468744b2408.tar.gz | |
Include bsd.prefs.mk so that the options appended by the package Makefile
take precedence.
| -rw-r--r-- | databases/sqsh-motif/Makefile | 4 | ||||
| -rw-r--r-- | databases/sqsh-x11/Makefile | 4 | ||||
| -rw-r--r-- | editors/elvis-x11/Makefile | 4 | ||||
| -rw-r--r-- | www/htmldoc-x11/Makefile | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/databases/sqsh-motif/Makefile b/databases/sqsh-motif/Makefile index ce185fbef1f..8a2be3efe4d 100644 --- a/databases/sqsh-motif/Makefile +++ b/databases/sqsh-motif/Makefile @@ -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" diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile index 7b636e240c7..45028ba075b 100644 --- a/databases/sqsh-x11/Makefile +++ b/databases/sqsh-x11/Makefile @@ -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" diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile index eb2fb7db494..e35eb5b792f 100644 --- a/editors/elvis-x11/Makefile +++ b/editors/elvis-x11/Makefile @@ -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" diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index d2d30f70408..d0d787672dd 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -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" |