aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
Diffstat (limited to 'emulators')
-rw-r--r--emulators/bochs/Makefile12
-rw-r--r--emulators/bochs/distinfo6
-rw-r--r--emulators/bochs/pkg-plist3
3 files changed, 10 insertions, 11 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 8fe0c40c8cad..97415ef5cb62 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= bochs
-PORTVERSION= 2.3
-PORTREVISION= 2
+PORTVERSION= 2.3.5
PORTEPOCH= 2
CATEGORIES= emulators
MASTER_SITES= SF
@@ -15,8 +14,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
-BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -179,7 +178,7 @@ CONFIGURE_ARGS+=--with-wx
.endif
.if defined(WITH_X11)
-USE_XLIB= yes
+USE_XORG= xext xt
CONFIGURE_ARGS+=--with-x11
.endif
@@ -229,7 +228,8 @@ post-patch:
s|^parport1: .+|#&|' \
${WRKSRC}/.bochsrc
@${REINPLACE_CMD} -Ee \
- 's|(^sharedir.+=).+|\1 ${DATADIR}|; \
+ 's|install_share install_doc|install_share|; \
+ s|(^sharedir.+=).+|\1 ${DATADIR}|; \
s|(^docdir.+=).+|\1 ${DOCSDIR}|' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e \
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 0901d658296a..193c3039daa3 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,3 +1,3 @@
-MD5 (bochs-2.3.tar.gz) = 100c02fbcd402c2b4862d0251be539fd
-SHA256 (bochs-2.3.tar.gz) = fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a
-SIZE (bochs-2.3.tar.gz) = 3812273
+MD5 (bochs-2.3.5.tar.gz) = 2d9b2c1e17b4eba2d46b208be09df4a9
+SHA256 (bochs-2.3.5.tar.gz) = ff6b7d7eb950d05ade2f5fee00b3bd50542d5d22dc5c7ea564a0d02001e0fb16
+SIZE (bochs-2.3.5.tar.gz) = 3916867
diff --git a/emulators/bochs/pkg-plist b/emulators/bochs/pkg-plist
index 01fba0ef0b8a..01ac232272d1 100644
--- a/emulators/bochs/pkg-plist
+++ b/emulators/bochs/pkg-plist
@@ -3,6 +3,7 @@ bin/bochs
bin/bxcommit
bin/bximage
%%DATADIR%%/BIOS-bochs-latest
+%%DATADIR%%/BIOS-bochs-legacy
%%DATADIR%%/VGABIOS-elpin-2.40
%%DATADIR%%/VGABIOS-elpin-LICENSE
%%DATADIR%%/VGABIOS-lgpl-README
@@ -23,7 +24,6 @@ bin/bximage
%%DATADIR%%/keymaps/x11-pc-si.map
%%DATADIR%%/keymaps/x11-pc-uk.map
%%DATADIR%%/keymaps/x11-pc-us.map
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -33,7 +33,6 @@ bin/bximage
%%PORTDOCS%%%%DOCSDIR%%/html/Linux.html
%%PORTDOCS%%%%DOCSDIR%%/html/cosimulation.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/iodebug.html
%%PORTDOCS%%%%DOCSDIR%%/memory.txt
%%PORTDOCS%%%%DOCSDIR%%/random.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html