diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /emulators | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'emulators')
75 files changed, 195 insertions, 210 deletions
diff --git a/emulators/adamem/files/patch-Makefile.X b/emulators/adamem/files/patch-Makefile.X index e62f631ddee4..6f32f7500ee2 100644 --- a/emulators/adamem/files/patch-Makefile.X +++ b/emulators/adamem/files/patch-Makefile.X @@ -15,7 +15,7 @@ adamem: $(OBJECTS) - $(LD) -s -Wl,-Map,adamem.map -L/usr/X11R6/lib \ -+ $(LD) -s -Wl,-Map,adamem.map -L${X11BASE}/lib \ ++ $(LD) -s -Wl,-Map,adamem.map -L${LOCALBASE}/lib \ -o adamem $(OBJECTS) -lXext -lX11 -lz cvem: adamem diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile index ab2c930dec04..f9328f6cd51e 100644 --- a/emulators/atari800/Makefile +++ b/emulators/atari800/Makefile @@ -7,7 +7,7 @@ PORTNAME= atari800 PORTVERSION= 2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip @@ -42,7 +42,7 @@ PKGNAMESUFFIX= -sdl USE_SDL= sdl CONFIGURE_ARGS+= --target=sdl .else -USE_XLIB= yes +USE_XORG= x11 xext .if defined(WITHOUT_SHM) CONFIGURE_ARGS+= --target=x11 .else diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile index 3db4050f02ba..4f3863ffb44a 100644 --- a/emulators/basiliskII/Makefile +++ b/emulators/basiliskII/Makefile @@ -22,7 +22,8 @@ USE_BZIP2= yes USE_GNOME= esound gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --disable-fbdev-dga --enable-fpe=uae ac_cv_have_33bit_addressing=no ac_cv_file__dev_ptmx=no +CONFIGURE_ARGS= --disable-fbdev-dga --enable-fpe=uae ac_cv_have_33bit_addressing=no ac_cv_file__dev_ptmx=no \ + --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile index a8318f9e7238..53edd6249e20 100644 --- a/emulators/bfe/Makefile +++ b/emulators/bfe/Makefile @@ -7,10 +7,9 @@ PORTNAME= bfe2 PORTVERSION= 20030723 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= bfe +MASTER_SITES= SF DISTNAME= ${PORTNAME}-23jul2003 MAINTAINER= ports@FreeBSD.org @@ -20,7 +19,6 @@ RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index cdbc7f6b9133..a7875418a23f 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -205,7 +205,7 @@ CONFIGURE_ARGS+=--enable-x86-64 .endif .if defined(WITH_XPM) -USE_XPM= yes +USE_XORG= xpm CONFIGURE_ARGS+=--with-xpm .endif diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile index 5eddeb64fe21..c56073a98975 100644 --- a/emulators/cingb/Makefile +++ b/emulators/cingb/Makefile @@ -7,17 +7,16 @@ PORTNAME= cingb PORTVERSION= 0.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Yet another Nintendo GameBoy(tm) emulator WRKSRC= ${WRKDIR}/${PORTNAME} -USE_X_PREFIX= yes +USE_XORG= x11 xext MAKE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ALL_TARGET= standard @@ -36,7 +35,7 @@ CPPFLAGS+= -DUSE_LITTLE_ENDIAN do-configure: cd ${WRKSRC} && ${SED} -e \ 's|gcc|$${CC}|g ; \ - s|/usr/X11R6|$${X11BASE}|g ; \ + s|/usr/X11R6|$${LOCALBASE}|g ; \ s|^CFLAGS|#CFLAGS|g ; \ s|^OPTMZ|#OPTMZ|g ; \ s|%%%endian%%%|$${CPPFLAGS}|g ; \ diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile index 8866659bed67..0ab2cab002f8 100644 --- a/emulators/darcnes/Makefile +++ b/emulators/darcnes/Makefile @@ -7,7 +7,7 @@ PORTNAME= darcnes PORTVERSION= 9b0401 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators MASTER_SITES= http://www.dridus.com/~nyef/darcnes/download/ DISTNAME= dn${PORTVERSION} @@ -43,7 +43,7 @@ LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib MAKE_ARGS+= TARGET=Linux_svgalib PKGNAMESUFFIX= -svgalib .else -USE_XLIB= yes +USE_XORG= x11 xaw xext xmu xt .endif .endif diff --git a/emulators/darcnes/files/patch-ab b/emulators/darcnes/files/patch-ab index 69bbc0bfc021..7d046d199615 100644 --- a/emulators/darcnes/files/patch-ab +++ b/emulators/darcnes/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Mar 28 09:51:41 2001 -+++ Makefile Mon Feb 2 20:30:32 2004 +--- Makefile.orig 2001-03-28 02:51:41.000000000 +0200 ++++ Makefile 2008-04-01 16:53:11.000000000 +0200 @@ -11,16 +11,16 @@ #C_ONLY=-DC_ONLY @@ -36,17 +36,16 @@ LIBS=-lvgagl -lvga endif -@@ -43,9 +47,10 @@ +@@ -43,9 +47,9 @@ # ifeq ($(TARGET),Linux_X) CONFFLAGS=-DPCE_CD_SUPPORT -DSOUND -LDFLAGS+=-L/usr/X11R6/lib -CFLAGS+=-I/usr/X11R6/include -SFLAGS+=-I/usr/X11R6/include -+X11BASE?=/usr/X11R6 -+LDFLAGS+=-L${X11BASE}/lib -+CFLAGS+=-I${X11BASE}/include -+SFLAGS+=-I${X11BASE}/include ++LDFLAGS+=-L${LOCALBASE}/lib ++CFLAGS+=-I${LOCALBASE}/include ++SFLAGS+=-I${LOCALBASE}/include SYSTEMSRCS=video_x.c ui_x.c snd_unix.c keyboard_x.c cd_unix.c BINFILE=darcnes LIBS=-lXext -lXaw -lXmu -lXt -lX11 diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile index c265f0969b63..bcf85044f6d9 100644 --- a/emulators/dtcyber/Makefile +++ b/emulators/dtcyber/Makefile @@ -31,7 +31,7 @@ PLIST_DIRS= %%EXAMPLESDIR%% pre-patch: ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.x11 ${REINPLACE_CMD} -e 's|CFLAGS = -O2|CFLAGS+= |' ${WRKSRC}/Makefile.x11 - ${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile.x11 + ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.x11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dtcyber ${PREFIX}/bin diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile index c36f2ef18210..5dff619be6e4 100644 --- a/emulators/fceu/Makefile +++ b/emulators/fceu/Makefile @@ -7,10 +7,9 @@ PORTNAME= fceu PORTVERSION= 0.98.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fceultra +MASTER_SITES= SF/fceultra DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src MAINTAINER= xcas@cox.net @@ -20,7 +19,6 @@ USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes USE_SDL= sdl -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/fceu diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index c36f2ef18210..5dff619be6e4 100644 --- a/emulators/fceux/Makefile +++ b/emulators/fceux/Makefile @@ -7,10 +7,9 @@ PORTNAME= fceu PORTVERSION= 0.98.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= fceultra +MASTER_SITES= SF/fceultra DISTNAME= ${PORTNAME}-${PORTVERSION}-pre.src MAINTAINER= xcas@cox.net @@ -20,7 +19,6 @@ USE_BZIP2= yes USE_GCC= 3.4 USE_GMAKE= yes USE_SDL= sdl -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/fceu diff --git a/emulators/fmsx/files/patch-aa b/emulators/fmsx/files/patch-aa index b17d2497ee34..9c9611768148 100644 --- a/emulators/fmsx/files/patch-aa +++ b/emulators/fmsx/files/patch-aa @@ -11,7 +11,7 @@ +CC ?= gcc +DEFINES = -DFMSX -DUNIX -DLSB_FIRST -DMITSHM \ + -DDISK -DNARROW -DSOUND -D%%BPP%% -DZLIB -+CFLAGS = -O3 -Wall -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES} ++CFLAGS = -O3 -Wall -I${LOCALBASE}/include -L${LOCALBASE}/lib ${DEFINES} OBJECTS = fMSX.o MSX.o Patch.o Debug.o Disk.o Floppy.o Sound.o \ Z80.o I8255.o AY8910.o YM2413.o SCC.o V9938.o I8251.o \ Unix.o LibUnix.o SndUnix.o diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile index f298ea413f69..41912d7180ae 100644 --- a/emulators/gbe/Makefile +++ b/emulators/gbe/Makefile @@ -7,7 +7,7 @@ PORTNAME= gbe PORTVERSION= 0.0.22 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.zophar.net/unix/Files/ @@ -17,10 +17,10 @@ COMMENT= Nintendo GameBoy(tm) emulator with GNU source code PLIST_FILES= bin/gbe WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \ - LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" +MAKE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -USE_X_PREFIX= yes +USE_XORG= x11 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gbe ${PREFIX}/bin diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 7827c137ad2f..032184dca5c1 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -36,7 +36,7 @@ post-patch: ${REINPLACE_CMD} \ -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} \ - -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile.rules + -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} \ -e 's|%%LDFLAGS%%|${LDFLAGS}|' ${WRKSRC}/Makefile.rules ${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile index 9a5d453b1e47..54018bd864f5 100644 --- a/emulators/gngb/Makefile +++ b/emulators/gngb/Makefile @@ -7,14 +7,13 @@ PORTNAME= gngb PORTVERSION= 20060309 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://m.peponas.free.fr/gngb/download/ MAINTAINER= ports@FreeBSD.org COMMENT= GameBoy(tm) emulator -USE_X_PREFIX= yes USE_GNOME= gnometarget USE_SDL= sdl USE_GMAKE= yes @@ -23,13 +22,13 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/gngb -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib MAN1= gngb.1 .if defined(WITH_GL) -USE_GL= yes +USE_GL= gl .else CONFIGURE_ARGS+= --disable-gl .endif diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile index 95b0281bdf0e..8f61f0e2114f 100644 --- a/emulators/gngeo/Makefile +++ b/emulators/gngeo/Makefile @@ -24,8 +24,8 @@ CONFIGURE_ARGS= --program-transform-name="" --disable-gp2x CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CPPFLAGS= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${X11BASE}/include -LDFLAGS= `${SDL_CONFIG} --libs` -L${X11BASE}/lib +CPPFLAGS= ${CFLAGS} `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include +LDFLAGS= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib SUB_FILES= pkg-message diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile index fb73fcc337f7..3c931619adc0 100644 --- a/emulators/gsnes9x/Makefile +++ b/emulators/gsnes9x/Makefile @@ -7,10 +7,9 @@ PORTNAME= gsnes9x PORTVERSION= 3.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= GSnes9x-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -18,7 +17,6 @@ COMMENT= A GTK front-end for the Snes9X SNES emulator RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix gnomelibs USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index 33c5472561c5..5a755bdde917 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -38,7 +38,7 @@ USE_XORG= x11 post-patch: @${REINPLACE_CMD} -Ee \ - 's|/usr/X11R6|${X11BASE}|g; s|-O[0-9]?||g; s|-f[a-zA-Z-]+||g' \ + 's|/usr/X11R6|${LOCALBASE}|g; s|-O[0-9]?||g; s|-f[a-zA-Z-]+||g' \ ${WRKSRC}/configure do-install: diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile index 851df8a953ef..151c840a6e1b 100644 --- a/emulators/gxmame/Makefile +++ b/emulators/gxmame/Makefile @@ -7,11 +7,10 @@ PORTNAME= gxmame DISTVERSION= 0.35beta2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}-${DISTVERSION} MAINTAINER= ports@FreeBSD.org @@ -20,7 +19,6 @@ COMMENT= GXmame is a GTK frontend for xmame LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 RUN_DEPENDS= xmame:${PORTSDIR}/emulators/xmame -USE_XLIB= yes USE_GNOME= gtk20 intlhack gnomehack gnomeprefix USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile index aa31d9209f66..a022c1c599be 100644 --- a/emulators/ines/Makefile +++ b/emulators/ines/Makefile @@ -7,7 +7,7 @@ PORTNAME= ines PORTVERSION= 3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://fms.komkon.org/iNES/ DISTNAME= iNES30-FreeBSD-80x86-bin @@ -16,11 +16,20 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Nintendo Entertainment System emlator for X +ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS_REASON= is an i386 binary + NO_WRKSUBDIR= yes -USE_X_PREFIX= yes +USE_XORG= x11 xext NO_BUILD= yes STRIP= +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 600000 +LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ines ${PREFIX}/bin ${MKDIR} ${DATADIR} @@ -28,4 +37,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/CART.NES ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.pal ${DATADIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/emulators/linux-ePSXe/Makefile b/emulators/linux-ePSXe/Makefile index 59aa9509a3a1..c5c11ce7eb3b 100644 --- a/emulators/linux-ePSXe/Makefile +++ b/emulators/linux-ePSXe/Makefile @@ -19,7 +19,7 @@ COMMENT= A Sony Playstation emulator (Linux version) RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_ZIP= yes NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/emulators/linux-geepee32/Makefile b/emulators/linux-geepee32/Makefile index 905bb03f7598..996cf006e9d5 100644 --- a/emulators/linux-geepee32/Makefile +++ b/emulators/linux-geepee32/Makefile @@ -18,7 +18,7 @@ COMMENT= The only GP32 emulator for i386 RUN_DEPENDS= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 ONLY_FOR_ARCHS= i386 -USE_X_PREFIX= yes +USE_XLIB= yes USE_LINUX= yes USE_ZIP= yes NO_WRKSUBDIR= yes diff --git a/emulators/linux-padjoy/Makefile b/emulators/linux-padjoy/Makefile index 4b435d5da6e2..c8007557f5a9 100644 --- a/emulators/linux-padjoy/Makefile +++ b/emulators/linux-padjoy/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux WRKSRC= ${WRKDIR}/padJoy NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile index 1713977fbe0c..251a77c52f48 100644 --- a/emulators/linux-peops-softgpu/Makefile +++ b/emulators/linux-peops-softgpu/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-peops-spu/Makefile b/emulators/linux-peops-spu/Makefile index 633cc3de63fe..f0dd9a2da204 100644 --- a/emulators/linux-peops-spu/Makefile +++ b/emulators/linux-peops-spu/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-pete-mesagpu/Makefile b/emulators/linux-pete-mesagpu/Makefile index f553a5cb7faa..ee0aa3c0325c 100644 --- a/emulators/linux-pete-mesagpu/Makefile +++ b/emulators/linux-pete-mesagpu/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-pete-xgl2gpu/Makefile b/emulators/linux-pete-xgl2gpu/Makefile index 90e95e21dd17..bfd817b2d3d9 100644 --- a/emulators/linux-pete-xgl2gpu/Makefile +++ b/emulators/linux-pete-xgl2gpu/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 diff --git a/emulators/linux-vmware-toolbox2/Makefile b/emulators/linux-vmware-toolbox2/Makefile index 79df27b0d7f2..9320d859dc18 100644 --- a/emulators/linux-vmware-toolbox2/Makefile +++ b/emulators/linux-vmware-toolbox2/Makefile @@ -19,7 +19,7 @@ COMMENT=VMware toolbox for guest OS (for VMware 2.x, Linux version) ONLY_FOR_ARCHS= i386 PLIST_FILES= bin/linux-vmware-toolbox USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-vmware-toolbox4/Makefile b/emulators/linux-vmware-toolbox4/Makefile index 9f26764b6339..8b45185e071b 100644 --- a/emulators/linux-vmware-toolbox4/Makefile +++ b/emulators/linux-vmware-toolbox4/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes .if !defined(BATCH) IS_INTERACTIVE= yes .endif diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile index 47b46ce3cc07..71bf60afdf7e 100644 --- a/emulators/linux-vmware-toolbox5/Makefile +++ b/emulators/linux-vmware-toolbox5/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile index af5e83ce748d..7f4d89e19ec2 100644 --- a/emulators/linux-vmware-toolbox6/Makefile +++ b/emulators/linux-vmware-toolbox6/Makefile @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/vmware-tools-distrib ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes NO_BUILD= yes .if !defined(BATCH) IS_INTERACTIVE= yes diff --git a/emulators/linux-winetools/Makefile b/emulators/linux-winetools/Makefile index 0a2ca0ea468f..35c5aba03735 100644 --- a/emulators/linux-winetools/Makefile +++ b/emulators/linux-winetools/Makefile @@ -24,7 +24,7 @@ EXPIRATION_DATE=2007-11-14 NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes ONLY_FOR_ARCHS= i386 amd64 PLIST_FILES= bin/winetools diff --git a/emulators/m2000/files/patch-Makefile.X b/emulators/m2000/files/patch-Makefile.X index 955af5f915ee..60891bf0c96d 100644 --- a/emulators/m2000/files/patch-Makefile.X +++ b/emulators/m2000/files/patch-Makefile.X @@ -10,12 +10,12 @@ +LD ?= gcc # Linker used -CFLAGS = -Wall -fomit-frame-pointer -O2 -I/usr/X11/include \ -+CFLAGS += -Wall -fomit-frame-pointer -O2 -I${X11BASE}/include \ ++CFLAGS += -Wall -fomit-frame-pointer -O2 -I${LOCALBASE}/include \ -DLSB_FIRST -DHAVE_FTRUNCATE -DHAVE_CLOCK -DUNIX_X \ -DSOUND -DMITSHM -LFLAGS = -s -L/usr/X11/lib -+LFLAGS += -L${X11BASE}/lib ++LFLAGS += -L${LOCALBASE}/lib OBJECTS = M2000.o P2000.o Z80.o Z80Debug.o \ Unix.o X.o diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile index d3e80f96b642..69e7deaf770d 100644 --- a/emulators/mastergear/Makefile +++ b/emulators/mastergear/Makefile @@ -7,7 +7,7 @@ PORTNAME= mastergear PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://fms.komkon.org/MG/ DISTNAME= MG20-FreeBSD-80x86-bin @@ -23,7 +23,6 @@ ONLY_FOR_ARCHS= i386 NO_BUILD= yes STRIP= -USE_X_PREFIX= yes do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mg ${PREFIX}/bin diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile index ade1711fc1c0..652e7c08ba41 100644 --- a/emulators/mednafen/Makefile +++ b/emulators/mednafen/Makefile @@ -24,8 +24,8 @@ GNU_CONFIGURE= yes USE_SDL= sdl net USE_XORG= x11 USE_GL= glut -CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME} @@ -54,7 +54,7 @@ IGNORE= needs round(3), which appears in 5.3 or later pre-configure: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' -e \ - 's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${X11BASE}|g' \ + 's|/usr/local|${LOCALBASE}|g' -e 's|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/configure post-install: diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile index a4f025894fd8..3b339faac47d 100644 --- a/emulators/minivmac/Makefile +++ b/emulators/minivmac/Makefile @@ -7,10 +7,9 @@ PORTNAME= minivmac PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}.src.tgz ${PORTNAME}-${PORTVERSION}.prj.tgz MAINTAINER= ports@FreeBSD.org @@ -20,15 +19,15 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash WRKSRC= ${WRKDIR}/projects/bgclx86d -USE_XLIB= yes +USE_XORG= x11 xext USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include ALL_TARGET= # nothing PLIST_FILES= bin/minivmac post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/minivmac ${PREFIX}/bin diff --git a/emulators/mupen64-base/files/patch-Makefile b/emulators/mupen64-base/files/patch-Makefile index 461d7a8daf3b..69cefd17142d 100644 --- a/emulators/mupen64-base/files/patch-Makefile +++ b/emulators/mupen64-base/files/patch-Makefile @@ -223,13 +223,13 @@ mupen64: $(OBJ) $(OBJ_X86) $(OBJ_GTK_GUI) $(OBJ_VCR) - $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `sdl-config --libs` -L/usr/X11R6/lib -lGL -lpthread -ldl -o $@ - strip --strip-all $@ -+ $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lGL -o $@ ++ $(CXX) $^ $(CFLAGS) $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `avifile-config --libs` `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lGL -o $@ endif mupen64_oldgui: $(OBJ) $(OBJ_X86) main/main_gtk.o - $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `sdl-config --libs` -L/usr/X11R6/lib -lGL -lpthread -ldl -o $@ - strip --strip-all $@ -+ $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lGL -o $@ ++ $(CC) $^ $(LIB) -Wl,-export-dynamic $(GTK_LIBS) `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lGL -o $@ plugins/mupen64_input.so: $(OBJ_INPUT) $(CC) $^ -Wl,-Bsymbolic -shared $(GTK_LIBS) -o $@ diff --git a/emulators/mupen64-rice/Makefile b/emulators/mupen64-rice/Makefile index 1b144d704536..0db52eed3d67 100644 --- a/emulators/mupen64-rice/Makefile +++ b/emulators/mupen64-rice/Makefile @@ -54,7 +54,7 @@ CFLAGS+= -DUSE_GTK `${GTK_CONFIG} --cflags` -fPIC CFLAGS+= -O3 -fomit-frame-pointer -funroll-loops -ffast-math -Wall -pipe CFLAGS+= -DX86 -mcpu=athlon -msse -mmmx LDFLAGS+= `${GTK_CONFIG} --libs` \ - -lGL -lGLU -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lc + -lGL -lGLU -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lc MAKE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" LD="${CXX}" diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index 3718bb37e7f7..8a110889b650 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -7,10 +7,10 @@ PORTNAME= open-vm-tools PORTVERSION= ${BUILD_VER} +PORTREVISION= 1 CATEGORIES= emulators DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= open-vm-tools +MASTER_SITES= SF MAINTAINER= mbr@freebsd.org COMMENT?= Open VMware tools for FreeBSD VMware guests @@ -23,7 +23,9 @@ GNU_CONFIGURE= yes .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x .else -USE_XLIB= yes +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" +USE_XORG= x11 ice xineramaproto xinerama xrandr xtst USE_GNOME= gtk12 PLIST_SUB+= X11="" PLIST= ${PKGDIR}/pkg-plist-x11 @@ -71,8 +73,8 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/resume-vm-default ${PREFIX}/share/vmware-tools/resume-vm-default ${INSTALL_SCRIPT} ${WRKSRC}/scripts/freebsd/suspend-vm-default ${PREFIX}/share/vmware-tools/suspend-vm-default .if !defined(WITHOUT_X11) - ${INSTALL} ${WRKSRC}/toolbox/toolbox ${X11BASE}/sbin/vmware-toolbox - ${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${X11BASE}/sbin/vmware-user + ${INSTALL} ${WRKSRC}/toolbox/toolbox ${LOCALBASE}/sbin/vmware-toolbox + ${INSTALL} ${WRKSRC}/vmware-user/vmware-user ${LOCALBASE}/sbin/vmware-user .endif .include <bsd.port.post.mk> diff --git a/emulators/p-interp/Makefile b/emulators/p-interp/Makefile index 13e198346321..543be2df71e9 100644 --- a/emulators/p-interp/Makefile +++ b/emulators/p-interp/Makefile @@ -7,7 +7,7 @@ PORTNAME= p-interp PORTVERSION= 0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.klebsch.de/ \ ftp://ftp.apple.asimov.net/pub/apple_II/images/utility/programming/apple_pascal/:disks \ @@ -21,9 +21,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= A UCSD (Apple) Pascal p-code interpreter environment -BUILD_DEPENDS= gccmakedep:${X_IMAKE_PORT} +BUILD_DEPENDS= gccmakedep:${PORTSDIR}/devel/gccmakedep -USE_XLIB= yes +USE_XORG= x11 xt RESTRICTED= "Redistribution rights for Apple Pascal disk images are unclear" diff --git a/emulators/p-interp/files/patch-aa b/emulators/p-interp/files/patch-aa index 05659efbf057..3c7c9a28935a 100644 --- a/emulators/p-interp/files/patch-aa +++ b/emulators/p-interp/files/patch-aa @@ -12,7 +12,7 @@ OBJS=$(SRCS:%.c=%.o) -X11=/opt/X11 -+X11=${X11BASE} ++X11=${LOCALBASE} X11_INCLUDE=$(X11)/include X11_LIB=$(X11)/lib diff --git a/emulators/pcemu/files/patch-aa b/emulators/pcemu/files/patch-aa index d8a4879d43d6..a572a0b609f3 100644 --- a/emulators/pcemu/files/patch-aa +++ b/emulators/pcemu/files/patch-aa @@ -23,7 +23,7 @@ ! OPTIONS = -DBOOT720 -DLITTLE_ENDIAN -DBIGCASE -DINLINE_FUNCTIONS \ ! -DBOOTFILE=\"${LOCALPREFIX}/lib/pcemu/DriveA\" ! #XROOT = /usr/local/X11R5 -! XROOT = $(X11BASE) +! XROOT = $(LOCALBASE) ! CFLAGS = -I$(XROOT)/include -O2 -pipe #-fomit-frame-pointer # You may need to add -N to the LFLAGS if you get sporadic segmentation diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile index 91c84ebf8593..045a0e4b4648 100644 --- a/emulators/quasi88/Makefile +++ b/emulators/quasi88/Makefile @@ -7,7 +7,7 @@ PORTNAME= quasi88 PORTVERSION= 0.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.117.ne.jp/~show/pc8801/ EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= PC-8801 emulator for X -USE_XLIB= yes +USE_XORG= x11 xext USE_GMAKE= yes MAKE_ENV= DATADIR="${DATADIR}" _CC="${CC}" _CFLAGS="${CFLAGS}" \ _CXX="${CXX}" LD="${CXX}" PROGRAM="${PORTNAME}" @@ -47,7 +47,7 @@ post-patch: s|^SDL_|# SDL_|g ; \ s|gcc|$${_CC}|g ; \ s|-O2|$${_CFLAGS}|g ; \ - s|/usr/X11R6|$${X11BASE}|g ; \ + s|/usr/X11R6|$${LOCALBASE}|g ; \ s|g++|$${_CXX}|g ; \ s|^CXXLIBS|# CXXLIBS|g ; \ s|^LD|# LD|g ; \ diff --git a/emulators/raine/files/patch-makefile b/emulators/raine/files/patch-makefile index 7794091e6965..9e4062cbd1dc 100644 --- a/emulators/raine/files/patch-makefile +++ b/emulators/raine/files/patch-makefile @@ -10,7 +10,7 @@ SDL_CFLAGS = "$(shell sdl-config --cflags)" - INCDIR += $(PNG_CFLAGS) $(ALLEGRO_CFLAGS) $(SDL_CFLAGS) -I$(X11BASE)/include -I$(LOCALBASE)/include -+ INCDIR += ` allegro-config --cflags` `libpng-config --cflags` -I$(X11BASE)/include -I$(LOCALBASE)/include ++ INCDIR += ` allegro-config --cflags` `libpng-config --cflags` -I$(LOCALBASE)/include DEFINE = -D__RAINE__ \ diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile index 61b56ff65b94..61619a04a49a 100644 --- a/emulators/ski/Makefile +++ b/emulators/ski/Makefile @@ -40,12 +40,12 @@ do-install: cd ${PREFIX}/bin ; ${LN} -sf ski ${SL} .endfor ${INSTALL_DATA} ${WRKSRC}/nue/usr/X11R6/lib/X11/app-defaults/XSki \ - ${X11BASE}/lib/X11/app-defaults + ${LOCALBASE}/lib/X11/app-defaults ${INSTALL_MAN} ${WRKSRC}/usr/man/man1/ski.1 ${PREFIX}/man/man1 @${MKDIR} ${PREFIX}/share/examples/ski ${INSTALL_DATA} ${FILESDIR}/ia64.cmd ${PREFIX}/share/examples/ski ${INSTALL_DATA} ${WRKSRC}/nue/usr/X11R6/lib/X11/app-defaults/XSki \ - ${X11BASE}/lib/X11/app-defaults + ${LOCALBASE}/lib/X11/app-defaults .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/usr/doc/ski-0.943l/* ${DOCSDIR} diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile index 7c7effe55049..f78dbd96d791 100644 --- a/emulators/snes9express/Makefile +++ b/emulators/snes9express/Makefile @@ -7,10 +7,9 @@ PORTNAME= snes9express PORTVERSION= 1.42 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= tlp@liquidx.org COMMENT= GTK interface for snes9x @@ -19,8 +18,6 @@ RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x USE_GETTEXT= yes USE_GNOME= gtk20 -USE_XLIB= yes - GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index f1f9b6d4ff32..d1c00728ddc4 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -17,17 +17,18 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= acm@FreeBSD.org COMMENT= Super Nintendo Entertainment System(SNES) Emulator +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png + USE_BZIP2= yes USE_XORG= x11 sm ice xext USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-extensions -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${X11BASE}/include \ - -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDLIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ +MAKE_ARGS= INCLUDES="-I${WRKSRC}/unzip -I${WRKSRC} -I${LOCALBASE}/include \ + ${PTHREAD_CFLAGS}" LDLIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ OPTIMISE="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile index a5e78a7d2e41..07cc766d8f19 100644 --- a/emulators/spim/Makefile +++ b/emulators/spim/Makefile @@ -8,7 +8,7 @@ PORTNAME= spim PORTVERSION= 7.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/ @@ -28,8 +28,8 @@ OPTIONS= GUI "Graphical user interface" on .include <bsd.port.pre.mk> .if defined(WITH_GUI) -USE_XLIB= yes -BUILD_DEPENDS+= imake:${X_IMAKE_PORT} +USE_XORG= x11 xaw +BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake PLIST_FILES+= bin/xspim MAN1+= xspim.1 .endif diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile index 3efb6862f86e..09aa0aa61a1d 100644 --- a/emulators/stella/Makefile +++ b/emulators/stella/Makefile @@ -24,8 +24,8 @@ USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e \ diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile index ace625de7b7f..83ac882f8be6 100644 --- a/emulators/stonx/Makefile +++ b/emulators/stonx/Makefile @@ -15,8 +15,6 @@ DISTNAME= STonX-0.6.7-epsilon MAINTAINER= treif@mayn.de COMMENT= AtariST emulator -BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT} -RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT} BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ gccmakedep:${PORTSDIR}/devel/gccmakedep \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index 350092f2ddd7..9af70e5520c9 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -7,7 +7,7 @@ PORTNAME= tme PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ @@ -16,6 +16,7 @@ COMMENT= Emulator for Sun 2/120, 3/150 and SPARCstation 2 machines GNU_CONFIGURE= yes USE_GMAKE= yes +USE_XORG= x11 USE_GNOME= gtk12 gnometarget CONFIGURE_ARGS+= --disable-shared MAKE_ENV= LANG=C diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile index f04102382ed5..675608e07bdf 100644 --- a/emulators/tuxnes/Makefile +++ b/emulators/tuxnes/Makefile @@ -7,17 +7,17 @@ PORTNAME= tuxnes PORTVERSION= 0.75 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A Nintendo Entertainment System 8-bit emulator ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS_REASON= uses i386 assembly code -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index 326cd1197ad6..913e5eb8c16f 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -7,7 +7,7 @@ PORTNAME= twin PORTVERSION= 3.1.14 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= emulators devel MASTER_SITES= ${MASTER_SITE_NETBSD} \ @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 alpha powerpc WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 USE_AUTOTOOLS= autoconf:213 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile index 55ce050e3045..b56b44dd21bd 100644 --- a/emulators/vMac/Makefile +++ b/emulators/vMac/Makefile @@ -5,41 +5,35 @@ # $FreeBSD$ # -PORTNAME= vMac -PORTVERSION= 0.1.9.3 -PORTREVISION= 2 -CATEGORIES= emulators -MASTER_SITES= http://www.vmac.org/download/XWindows/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-src -EXTRACT_SUFX= .tgz +PORTNAME= vMac +PORTVERSION= 0.1.9.3 +PORTREVISION= 3 +CATEGORIES= emulators +MASTER_SITES= http://www.vmac.org/download/XWindows/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-src +EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Emulates a MacPlus machine! Runs MacOS versions up to 7.5.5 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_XLIB= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_XORG= x11 ice sm xext pre-patch: (cd ${WRKSRC} && ${SH} ${FILESDIR}/dos2unx gemulator.c) post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vMac \ - ${PREFIX}/bin - @${STRIP_CMD} ${PREFIX}/bin/vMac + ${INSTALL_PROGRAM} ${WRKSRC}/vMac ${PREFIX}/bin + ${STRIP_CMD} ${PREFIX}/bin/vMac .if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CREDITS \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/INSTALL \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README \ - ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.rom \ - ${DOCSDIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.rom ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}: diff --git a/emulators/vba/pkg-message b/emulators/vba/pkg-message index eb5b9fab1567..cb364d43a385 100644 --- a/emulators/vba/pkg-message +++ b/emulators/vba/pkg-message @@ -1,7 +1,7 @@ ----------------------------------------------------------------- The default configuration file has been installed as -X11BASE/bin/VisualBoyAdvance.cfg-default. Please copy it to -X11BASE/bin/VisualBoyAdvance.cfg before you start the emulator. +%%LOCALBASE%%/bin/VisualBoyAdvance.cfg-default. Please copy it to +%%LOCALBASE%%/bin/VisualBoyAdvance.cfg before you start the emulator. If all you see after loading a ROM is a black screen and/or VisualBoy Advance crashes, try switching the video filter. diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile index e9a7f32bc884..bfa7f1826f8b 100644 --- a/emulators/vgb/Makefile +++ b/emulators/vgb/Makefile @@ -7,7 +7,7 @@ PORTNAME= vgb PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor @@ -19,7 +19,7 @@ COMMENT= Nintendo GameBoy(tm) emulator WRKSRC= ${WRKDIR}/GB -USE_X_PREFIX= yes +USE_XORG= x11 xext do-configure: @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/vgb.sh \ diff --git a/emulators/vgb/files/patch-aa b/emulators/vgb/files/patch-aa index 7b4066607784..93ce83ec0574 100644 --- a/emulators/vgb/files/patch-aa +++ b/emulators/vgb/files/patch-aa @@ -17,7 +17,7 @@ # libraries libX11.* and libXext.* are located on your system. ! CC ?= gcc ! DEFINES = -DUNIX -DLSB_FIRST -! CFLAGS += -I${X11BASE}/include -L${X11BASE}/lib ${DEFINES} +! CFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib ${DEFINES} OBJECTS = VGB.o GB.o Z80.o Debug.o Unix.o # Make the standard distribution: VGB, DASM, and utilities. diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 1a2f477e7242..2e0f7a723ca0 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -28,7 +28,6 @@ RESTRICTED= "ROMs are copyrighted by Commodore Business Machines" USE_XORG= xpm xext xv x11 xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes xv USE_GMAKE= yes -USE_GCC= 3.4+ GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile index 94801a23348e..a5cc3c527200 100644 --- a/emulators/visualos/Makefile +++ b/emulators/visualos/Makefile @@ -7,15 +7,14 @@ PORTNAME= VisualOS PORTVERSION= 1.0.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME:L} MAINTAINER= ports@FreeBSD.org COMMENT= A visual simulator of an operating system to help understand how OSes work -USE_X_PREFIX= yes USE_GNOME= gnomehack gnomeprefix libglade USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/emulators/vmware-guestd4/Makefile b/emulators/vmware-guestd4/Makefile index f77f18e6a167..e45e7935fcd4 100644 --- a/emulators/vmware-guestd4/Makefile +++ b/emulators/vmware-guestd4/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -guestd @@ -30,7 +30,7 @@ USE_RC_SUBR= vmware-guestd.sh IS_INTERACTIVE= yes .endif .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .endif @@ -108,10 +108,10 @@ post-patch: .if defined(VMWARE_X_PORTS) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${LOCALBASE}/bin + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${LOCALBASE}/etc/XF86Config-4_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${LOCALBASE}/lib/modules/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware -${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end .else diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile index b44520196eeb..003c3d937a8d 100644 --- a/emulators/vmware-guestd5/Makefile +++ b/emulators/vmware-guestd5/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -#PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware Workstation PKGNAMESUFFIX?= -guestd @@ -29,13 +29,13 @@ ONLY_FOR_ARCHS= i386 amd64 IS_INTERACTIVE= yes .endif .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .if defined(WITH_VMWARE_GTK) PLIST_SUB+= INSTALLXGTKTOOL:="" USE_ICONV= yes USE_GETTEXT= yes -USE_XLIB= yes +USE_XORG= x11 xsxt USE_GNOME= glib12 gtk12 .if (${OSVERSION} >= 600000) LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x @@ -162,18 +162,18 @@ post-extract: .if defined(VMWARE_X_PORTS) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${X11BASE}/bin - ${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-tcl ${LOCALBASE}/bin + ${LN} -sfh vmware-toolbox-tcl ${LOCALBASE}/bin/vmware-toolbox .if defined(WITH_VMWARE_GTK) - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${LOCALBASE}/bin .endif - if [ ! -d ${X11BASE}/lib/modules/input ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/input ; \ + if [ ! -d ${LOCALBASE}/lib/modules/input ] ; then \ + ${MKDIR} ${LOCALBASE}/lib/modules/input ; \ fi .if ${ARCH} == i386 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware .else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${LOCALBASE}/lib/modules/input/vmmouse_drv.o_VMware .endif -${WRKSRC}/lib/sbin${BITS}/vmware-guestd --cmd toolinstall.end diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index 60ae8f304577..39f7ee129332 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -#PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= emulators kld MASTER_SITES= # bundled with VMware Workstation PKGNAMESUFFIX?= -guestd @@ -40,7 +40,7 @@ WANT_GNOME= yes .include <bsd.port.pre.mk> .if defined(VMWARE_X_PORTS) -USE_X_PREFIX= yes +USE_XORG= x11 NO_BUILD= yes .if ${ARCH} == amd64 WITH_VMWARE_GTK= yes @@ -181,13 +181,13 @@ post-extract: do-install: .if ${ARCH} == i386 - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-tcl ${X11BASE}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-tcl ${LOCALBASE}/bin .endif .if defined(WITH_VMWARE_GTK) - ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${X11BASE}/bin - ${LN} -sfh vmware-toolbox-gtk ${X11BASE}/bin/vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${LOCALBASE}/bin + ${LN} -sfh vmware-toolbox-gtk ${LOCALBASE}/bin/vmware-toolbox .else - ${LN} -sfh vmware-toolbox-tcl ${X11BASE}/bin/vmware-toolbox + ${LN} -sfh vmware-toolbox-tcl ${LOCALBASE}/bin/vmware-toolbox .endif -${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1 diff --git a/emulators/vmware-tools3/Makefile b/emulators/vmware-tools3/Makefile index dc0ddf592142..8529a0535a01 100644 --- a/emulators/vmware-tools3/Makefile +++ b/emulators/vmware-tools3/Makefile @@ -7,7 +7,7 @@ PORTNAME= vmware-tools PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= # bundled with VMware itself DISTNAME= vmware-freebsd-tools @@ -23,7 +23,6 @@ IGNOREFILES= ${DISTFILES} WRKSRC= ${WRKDIR}/vmware-freebsd-tools ONLY_FOR_ARCHS= i386 -USE_X_PREFIX= yes NO_BUILD= yes NO_LATEST_LINK= yes .if !defined(BATCH) diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 0cddbb8fa396..762147470990 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -45,7 +45,7 @@ SUB_LIST= BRIDGED="${VMNET_BRIDGED}" \ VMNET1_MINOR="${VMNET1_MINOR}" ONLY_FOR_ARCHS= i386 USE_LINUX= yes -USE_X_PREFIX= yes +USE_XLIB= yes WRKSRC= ${WRKDIR}/vmware-distrib GZCAT= ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/extract MAN1= vmware.1 diff --git a/emulators/vpce/Makefile b/emulators/vpce/Makefile index a82b74b7d71b..3786bf817ff5 100644 --- a/emulators/vpce/Makefile +++ b/emulators/vpce/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpce PORTVERSION= 0.3f -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.geocities.com/SiliconValley/Way/3340/ \ http://freebsd.unixfreunde.de/sources/ @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PC Engine (TG16) emulator on X NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 NO_BUILD= yes STRIP= diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c6023d922da9..262deb61901c 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -10,7 +10,7 @@ PORTNAME= wine PORTVERSION= 0.9.60 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ +MASTER_SITES= SFE \ http://ibiblio.org/pub/linux/system/emulators/wine/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -38,7 +38,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes USE_GL= glut -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index c6023d922da9..262deb61901c 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -10,7 +10,7 @@ PORTNAME= wine PORTVERSION= 0.9.60 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ +MASTER_SITES= SFE \ http://ibiblio.org/pub/linux/system/emulators/wine/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -38,7 +38,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes USE_GL= glut -USE_XPM= yes +USE_XORG= xpm SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/emulators/xbraitenberg/Makefile b/emulators/xbraitenberg/Makefile index a81743ad37aa..bf87c2fc2c71 100644 --- a/emulators/xbraitenberg/Makefile +++ b/emulators/xbraitenberg/Makefile @@ -7,14 +7,14 @@ PORTNAME= xbraitenberg PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.lcdf.org/~eddietwo/xbraitenberg/ MAINTAINER= ports@FreeBSD.org COMMENT= A Braitenberg vehicle simulator with pseudo-physics -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext USE_GNOME= gnometarget GNU_CONFIGURE= yes diff --git a/emulators/xgngeo/Makefile b/emulators/xgngeo/Makefile index 64a46d7e3ac2..6a52089e8ad1 100644 --- a/emulators/xgngeo/Makefile +++ b/emulators/xgngeo/Makefile @@ -39,7 +39,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco .endif post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/data/py/configfile.py + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/data/py/configfile.py @${REINPLACE_CMD} -e 's|gtk.threads_init|gtk.gdk.threads_init|g' -e \ 's|gtk.threads_enter|gtk.gdk.threads_enter|g' -e \ 's|gtk.threads_leave|gtk.gdk.threads_leave|g' ${WRKSRC}/data/py/__init__.py diff --git a/emulators/xgngeo/files/patch-data-py_configfile.py b/emulators/xgngeo/files/patch-data-py_configfile.py index a80c43581d0b..c8e1073b7b07 100644 --- a/emulators/xgngeo/files/patch-data-py_configfile.py +++ b/emulators/xgngeo/files/patch-data-py_configfile.py @@ -5,7 +5,7 @@ "z80clock": 0, #Other thing section. - "libglpath": "/usr/lib/libGL.so", -+ "libglpath": "%%X11BASE%%/lib/libGL.so", ++ "libglpath": "%%LOCALBASE%%/lib/libGL.so", "sleepidle": "true", "bench": "false", },{ #XGngeo's default. diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile index 5f5ce5a6b945..176986fb70ca 100644 --- a/emulators/xgs/Makefile +++ b/emulators/xgs/Makefile @@ -9,7 +9,7 @@ PORTNAME= xgs PORTVERSION= 0.50 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://www.inwards.com/xgs/ \ http://www.inwards.com/xgs/2mg/ @@ -27,7 +27,7 @@ RESTRICTED= "xgs.rom copyright is owned by Apple and cannot be distributed" # Source building # WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XLIB= yes +USE_XORG= x11 ice sm xext USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x diff --git a/emulators/xhomer/files/patch-Makefile b/emulators/xhomer/files/patch-Makefile index c230a7bd59c1..6e96d9f5d0b6 100644 --- a/emulators/xhomer/files/patch-Makefile +++ b/emulators/xhomer/files/patch-Makefile @@ -5,7 +5,7 @@ # other to "Y" or by setting both to "N" (most non-Linux systems). -X11DIR = /usr/X11R6 -+X11DIR = $(X11BASE) ++X11DIR = $(LOCALBASE) ifeq ($(X11DIR)/include/X11/extensions/xf86dga.h,$(wildcard $(X11DIR)/include/X11/extensions/xf86dga.h)) ifeq ($(X11DIR)/include/X11/extensions/xf86dga1.h,$(wildcard $(X11DIR)/include/X11/extensions/xf86dga1.h)) diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 67676c0d4b01..f83eef163065 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -7,7 +7,7 @@ PORTNAME?= xmame PORTVERSION?= 0.106 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= emulators MASTER_SITES= http://www.franksworld.org/dist/xmame/ \ http://x.mame.net/download/ \ @@ -143,9 +143,9 @@ SDLSOUNDCOMMENT= .endif .if defined(WITH_OPENGL) -USE_XLIB= yes +USE_XORG+= x11 DISPLAY_TARGET= opengl -CFLAGS+= ${PTHREAD_CFLAGS} -I${X11BASE}/include +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include USE_GL= yes DISPLAY_METHOD= x11 PLIST_SUB+= OPENGL="" @@ -157,13 +157,13 @@ PLIST_SUB+= OPENGL="@comment " .if defined(WITH_SVGALIB) DISPLAY_TARGET= svgalib LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib -USE_XPM= yes +USE_XORG+= xpm DISPLAY_METHOD= svgalib .endif .if defined(WITH_X11) DISPLAY_METHOD= x11 -USE_XLIB= yes +USE_XORG+= x11 .endif # Option WITH_ESOUND @@ -203,7 +203,7 @@ do-configure: -e "s@# SOUND_SDL@${SDLSOUNDCOMMENT}SOUND_SDL@g" \ -e "s@^DISPLAY_METHOD.*@DISPLAY_METHOD = ${DISPLAY_METHOD}@g" \ -e "s@# X11_DGA@X11_DGA@g" \ - -e "s@/usr/X11R6@${X11BASE}@g" \ + -e "s@/usr/X11R6@${LOCALBASE}@g" \ -e "s@^SDL_CONFIG.*@SDL_CONFIG = ${SDL_CONFIG}@g" \ -e "s@^GLLIBS += .*@GLLIBS += ${PTHREAD_LIBS}@g" \ ${WRKSRC}/makefile.unix diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile index fd3f7f70537e..f2ee48376781 100644 --- a/emulators/xzx/Makefile +++ b/emulators/xzx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xzx PORTVERSION= 4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://mitglied.lycos.de/suppentops123/spectrum/xzx/ DISTNAME= ${PORTNAME}-pro-${PORTVERSION} @@ -16,13 +16,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11 # xmkmf is used in configure script; USE_IMAKE makes the build unhappy -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake # Server redirects to distfile; won't work with -A FETCH_CMD= /usr/bin/fetch -Rr USE_MOTIF= yes -USE_X_PREFIX= yes +USE_XORG= x11 ice sm xext xpm xt xxf86vm # License forbids redistribution RESTRICTED= Redistribution forbidden by license diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index e5137028c076..a617f5956fc0 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -68,9 +68,9 @@ CONFIGURE_ARGS+=--without-x PKGNAMESUFFIX= -nox11 .else CONFIGURE_ARGS+=--with-x -CFLAGS+= -I${X11BASE}/include -CPPFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .endif .if defined(WITH_OPENGL) |