aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
committermarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
commit0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree17937489af4c767844fc63b684ae3e7b31948812 /emulators
parente959473966b963953d63d5f00fae8751f2decf0f (diff)
downloadfreebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/gxmame/Makefile6
-rw-r--r--emulators/mupen64-sdlinput/files/patch-SDL_ttf.c20
-rw-r--r--emulators/raine/Makefile3
3 files changed, 20 insertions, 9 deletions
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index e264c728f8ba..97f40f044519 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,8 +7,8 @@
PORTNAME= gxmame
DISTVERSION= 0.35beta2
+PORTREVISION= 4
PORTEPOCH= 1
-PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,13 +20,13 @@ COMMENT= GXmame is a GTK frontend for xmame
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GNOME= gtk20 intlhack gnomehack gnomeprefix
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-xmame-dir=${X11BASE}/share/xmame
+CONFIGURE_ARGS= --with-xmame-dir=${LOCALBASE}/share/xmame
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+=--disable-nls
diff --git a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
index f0e6a0abe42b..c428262407bc 100644
--- a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
+++ b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
@@ -1,6 +1,6 @@
---- src/SDL_ttf.c.orig Wed Oct 15 02:44:17 2003
-+++ src/SDL_ttf.c Thu Aug 12 15:06:42 2004
-@@ -39,7 +39,8 @@
+--- src/SDL_ttf.c.orig Tue Oct 14 20:44:17 2003
++++ src/SDL_ttf.c Wed Oct 4 08:38:49 2006
+@@ -39,10 +39,10 @@
#define FREEA(p) free(p)
#endif
@@ -9,4 +9,16 @@
+#include FT_FREETYPE_H
#include <freetype/ftoutln.h>
#include <freetype/ttnameid.h>
- #include <freetype/internal/ftobjs.h>
+-#include <freetype/internal/ftobjs.h>
+
+ /** hack **/
+ #ifndef ft_open_stream
+@@ -272,7 +272,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index a8a1757f85dd..c9d7b303c29a 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= raine
PORTVERSION= 0.43.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators games
MASTER_SITES= http://www.rainemu.com/html/archive/
DISTNAME= ${PORTNAME}s-${PORTVERSION}
@@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GCC= 3.2+
USE_BZIP2= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
USE_SDL= sdl
USE_GNOME= gnomehier
MAKEFILE= makefile