[pkgsrc/pkgsrc-2009Q1]: pkgsrc/emulators/bochs Pullup ticket #2785 - requeste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afef62383be3
branches:  pkgsrc-2009Q1
changeset: 556849:afef62383be3
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Jun 05 08:50:14 2009 +0000

description:
Pullup ticket #2785 - requested by mishka
bochs: build fix

Revisisons pulled up:
- emulators/bochs/Makefile      1.58
- emulators/bochs/PLIST         1.13
---
Module Name:    pkgsrc
Committed By:   mishka
Date:           Mon May 25 12:54:48 UTC 2009

Modified Files:
        pkgsrc/emulators/bochs: Makefile PLIST

Log Message:
Fix package build caused by improper PLIST generation due to x11 options.

diffstat:

 emulators/bochs/Makefile |  8 +++++---
 emulators/bochs/PLIST    |  5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 1073fdb0dafb -r afef62383be3 emulators/bochs/Makefile
--- a/emulators/bochs/Makefile  Thu Jun 04 20:42:50 2009 +0000
+++ b/emulators/bochs/Makefile  Fri Jun 05 08:50:14 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
+# $NetBSD: Makefile,v 1.57.2.1 2009/06/05 08:50:14 tron Exp $
 
 DISTNAME=              bochs-2.3.7
 PKGREVISION=           3
@@ -22,13 +22,12 @@
 
 CONFIGURE_ARGS+=       --enable-cdrom
 CONFIGURE_ARGS+=       --enable-ne2000
-CONFIGURE_ARGS+=       --with-nogui
 
 MAKE_ENV+=             GZIP_CMD=${GZIP_CMD:Q}
 MAKE_ENV+=             GUNZIP_CMD=${GUNZIP_CMD:Q}
 MAKE_ENV+=             WGET=${FETCH_CMD:Q}
 
-PLIST_VARS+=           notiny
+PLIST_VARS+=           notiny nox11 x11
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bochs
 PKG_SUPPORTED_OPTIONS+=        debug tiny x11
@@ -101,9 +100,12 @@
 .endif
 
 .if empty(PKG_OPTIONS:Mx11)
+PLIST.nox11=           yes
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       --without-x11
 CONFIGURE_ARGS+=       --with-term
+.else
+PLIST.x11=             yes
 .endif
 
 .if ${OPSYS} == "Linux"
diff -r 1073fdb0dafb -r afef62383be3 emulators/bochs/PLIST
--- a/emulators/bochs/PLIST     Thu Jun 04 20:42:50 2009 +0000
+++ b/emulators/bochs/PLIST     Fri Jun 05 08:50:14 2009 +0000
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2009/03/20 17:17:48 mishka Exp $
+@comment $NetBSD: PLIST,v 1.12.2.1 2009/06/05 08:50:15 tron Exp $
 bin/bochs
 bin/bxcommit
 bin/bximage
+${PLIST.notiny}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
+${PLIST.notiny}${PLIST.x11}lib/bochs/plugins/libbx_x.la
 ${PLIST.notiny}lib/bochs/plugins/libbx_acpi.la
 ${PLIST.notiny}lib/bochs/plugins/libbx_biosdev.la
 ${PLIST.notiny}lib/bochs/plugins/libbx_busmouse.la
@@ -26,7 +28,6 @@
 ${PLIST.notiny}lib/bochs/plugins/libbx_speaker.la
 ${PLIST.notiny}lib/bochs/plugins/libbx_unmapped.la
 ${PLIST.notiny}lib/bochs/plugins/libbx_vga.la
-${PLIST.notiny}lib/bochs/plugins/libbx_x.la
 man/man1/bochs-dlx.1
 man/man1/bochs.1
 man/man1/bxcommit.1