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
cvs diff -r1.7 -r1.8 pkgsrc/databases/sqsh-motif/Makefile (expand / switch to unified diff)

--- 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,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2008/04/22 16:23:36 jlam Exp $ 1# $NetBSD: Makefile,v 1.8 2008/04/23 20:23:38 jlam Exp $
2 2
3PKGNAME= ${PKGNAME_BASE:S/-/-motif-/} 3PKGNAME= ${PKGNAME_BASE:S/-/-motif-/}
4COMMENT= SQL shell for Sybase and MS-SQL servers (Motif GUI) 4COMMENT= SQL shell for Sybase and MS-SQL servers (Motif GUI)
5 5
6FILESDIR= ${.CURDIR}/../../databases/sqsh/files 6FILESDIR= ${.CURDIR}/../../databases/sqsh/files
7PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches 7PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
8PKGDIR= ${.CURDIR}/../../databases/sqsh 8PKGDIR= ${.CURDIR}/../../databases/sqsh
9 9
 10.include "../../mk/bsd.prefs.mk"
 11
10PKG_OPTIONS.sqsh+= sqsh-motif -sqsh-xaw 12PKG_OPTIONS.sqsh+= sqsh-motif -sqsh-xaw
11 13
12.include "../../databases/sqsh/Makefile" 14.include "../../databases/sqsh/Makefile"
cvs diff -r1.7 -r1.8 pkgsrc/databases/sqsh-x11/Makefile (expand / switch to unified diff)

--- 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,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2008/04/22 16:23:37 jlam Exp $ 1# $NetBSD: Makefile,v 1.8 2008/04/23 20:23:38 jlam Exp $
2 2
3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} 3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
4COMMENT= SQL shell for Sybase and MS-SQL servers (Athena GUI) 4COMMENT= SQL shell for Sybase and MS-SQL servers (Athena GUI)
5 5
6FILESDIR= ${.CURDIR}/../../databases/sqsh/files 6FILESDIR= ${.CURDIR}/../../databases/sqsh/files
7PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches 7PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches
8PKGDIR= ${.CURDIR}/../../databases/sqsh 8PKGDIR= ${.CURDIR}/../../databases/sqsh
9 9
 10.include "../../mk/bsd.prefs.mk"
 11
10PKG_OPTIONS.sqsh+= -sqsh-motif sqsh-xaw 12PKG_OPTIONS.sqsh+= -sqsh-motif sqsh-xaw
11 13
12.include "../../databases/sqsh/Makefile" 14.include "../../databases/sqsh/Makefile"
cvs diff -r1.13 -r1.14 pkgsrc/editors/elvis-x11/Makefile (expand / switch to unified diff)

--- 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,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2008/04/22 16:23:57 jlam Exp $ 1# $NetBSD: Makefile,v 1.14 2008/04/23 20:23:38 jlam Exp $
2 2
3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} 3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
4COMMENT= vi clone with regex-search, hex-edit, HTML/LaTeX preview (X11) 4COMMENT= vi clone with regex-search, hex-edit, HTML/LaTeX preview (X11)
5 5
6FILESDIR= ${.CURDIR}/../../editors/elvis/files 6FILESDIR= ${.CURDIR}/../../editors/elvis/files
7PATCHDIR= ${.CURDIR}/../../editors/elvis/patches 7PATCHDIR= ${.CURDIR}/../../editors/elvis/patches
8PKGDIR= ${.CURDIR}/../../editors/elvis 8PKGDIR= ${.CURDIR}/../../editors/elvis
9 9
 10.include "../../mk/bsd.prefs.mk"
 11
10PKG_OPTIONS.elvis+= x11 12PKG_OPTIONS.elvis+= x11
11 13
12.include "../../editors/elvis/Makefile" 14.include "../../editors/elvis/Makefile"
cvs diff -r1.13 -r1.14 pkgsrc/www/htmldoc-x11/Makefile (expand / switch to unified diff)

--- 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,13 +1,15 @@ @@ -1,13 +1,15 @@
1# $NetBSD: Makefile,v 1.13 2008/04/22 16:24:31 jlam Exp $ 1# $NetBSD: Makefile,v 1.14 2008/04/23 20:23:38 jlam Exp $
2 2
3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/} 3PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
4 4
5FILESDIR= ${.CURDIR}/../../www/htmldoc/files 5FILESDIR= ${.CURDIR}/../../www/htmldoc/files
6PATCHDIR= ${.CURDIR}/../../www/htmldoc/patches 6PATCHDIR= ${.CURDIR}/../../www/htmldoc/patches
7PKGDIR= ${.CURDIR}/../../www/htmldoc 7PKGDIR= ${.CURDIR}/../../www/htmldoc
8 8
9DESCR_SRC= ${.CURDIR}/DESCR 9DESCR_SRC= ${.CURDIR}/DESCR
10 10
 11.include "../../mk/bsd.prefs.mk"
 12
11PKG_OPTIONS.htmldoc+= htmldoc-gui 13PKG_OPTIONS.htmldoc+= htmldoc-gui
12 14
13.include "../../www/htmldoc/Makefile" 15.include "../../www/htmldoc/Makefile"