summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authormishka <mishka@pkgsrc.org>2009-05-25 12:54:48 +0000
committermishka <mishka@pkgsrc.org>2009-05-25 12:54:48 +0000
commiteed6246f37fdd69cfb62b53a96af897fd3ff0ea7 (patch)
tree4fe1e26e4d2c3ea1a5c052b1fef2b7af8832b0ed /emulators
parentfbca3a9931b23bbda0a9351d54aa481f51c99850 (diff)
downloadpkgsrc-eed6246f37fdd69cfb62b53a96af897fd3ff0ea7.tar.gz
Fix package build caused by improper PLIST generation due to x11 options.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/bochs/Makefile8
-rw-r--r--emulators/bochs/PLIST5
2 files changed, 8 insertions, 5 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index d718cd1419c..94178e4a739 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
+# $NetBSD: Makefile,v 1.58 2009/05/25 12:54:48 mishka Exp $
DISTNAME= bochs-2.3.7
PKGREVISION= 3
@@ -22,13 +22,12 @@ CXXFLAGS+= -DPARANOID
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 @@ CONFIGURE_ARGS+= --enable-sb16=dummy
.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 --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
index 740d449d118..91227e2253f 100644
--- a/emulators/bochs/PLIST
+++ b/emulators/bochs/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.12 2009/03/20 17:17:48 mishka Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/05/25 12:54:48 mishka 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_serial.la
${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