From 42332fc5f9d6a9a3c6dafd9926ba298b9092fb61 Mon Sep 17 00:00:00 2001 From: krion Date: Sat, 18 Oct 2003 18:05:36 +0000 Subject: - Fix build on -current - Utilize USE_SDL PR: 58219 Submitted by: Ports Fury --- games/exult/Makefile | 56 ++++++++++++------------------ games/exult/files/patch-files-databuf.h | 12 +++++++ games/exult/files/patch-files-rwregress.cc | 10 ++++++ games/exult/pkg-message | 4 +++ games/exult/pkg-plist | 18 +++++----- 5 files changed, 57 insertions(+), 43 deletions(-) create mode 100644 games/exult/files/patch-files-databuf.h create mode 100644 games/exult/files/patch-files-rwregress.cc create mode 100644 games/exult/pkg-message (limited to 'games/exult') diff --git a/games/exult/Makefile b/games/exult/Makefile index 2156b36..a792649 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -5,60 +5,48 @@ # $FreeBSD$ # -PORTNAME= exult -PORTVERSION= 1.00 -CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +PORTNAME= exult +PORTVERSION= 1.00 +PORTREVISION= 1 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Ultima VII engine -LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity -ONLY_FOR_ARCHS= i386 - -SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config USE_XLIB= yes +USE_SDL= yes +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include \ + LDFLAGS="-L${X11BASE}/lib" CONFIGURE_ARGS= --with-x \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --disable-tools \ --disable-sdltest -# SDL cannot find X11 includes in normal way -CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include \ - SDL_CONFIG="${SDL_CONFIG}" MAN6= exult.6 -.include - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif +post-patch: + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|^DEBUG_FLAGS|#DEBUG_FLAGS|g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/exult ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/docs/exult.6 ${MANPREFIX}/man/man6 @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/exult.flx ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/exult_bg.flx ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/exult_si.flx ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/data/midisfx.flx ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/docs/exult.6 ${PREFIX}/man/man6 -.ifndef (NOPORTDOCS) +.for file in exult.flx exult_bg.flx exult_si.flx midisfx.flx + ${INSTALL_DATA} ${WRKSRC}/data/${file} ${DATADIR} +.endfor +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +.for file in FAQ NEWS README + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor .endif + @${SED} 's:/usr/local:${PREFIX}:g' ${PKGMESSAGE} -post-install: - @${ECHO_MSG} "******************************************************************************" - @${ECHO_MSG} "* Original Ultima VII data is required to run Exult" - @${ECHO_MSG} "* Please, read ${DOCSDIR}/README for additional information" - @${ECHO_MSG} "******************************************************************************" - -.include +.include diff --git a/games/exult/files/patch-files-databuf.h b/games/exult/files/patch-files-databuf.h new file mode 100644 index 0000000..bcd234e --- /dev/null +++ b/games/exult/files/patch-files-databuf.h @@ -0,0 +1,12 @@ +--- files/databuf.h.orig Thu May 23 07:24:04 2002 ++++ files/databuf.h Sat Aug 16 17:54:30 2003 +@@ -24,6 +24,9 @@ + #ifdef MACOS + # include + #endif ++#if defined(__GNUC__) && __GNUC__ >= 3 ++# include ++#endif + #include + #include + #include "U7file.h" diff --git a/games/exult/files/patch-files-rwregress.cc b/games/exult/files/patch-files-rwregress.cc new file mode 100644 index 0000000..ea6ad1a --- /dev/null +++ b/games/exult/files/patch-files-rwregress.cc @@ -0,0 +1,10 @@ +--- files/rwregress.cc.orig Tue Feb 5 06:01:24 2002 ++++ files/rwregress.cc Sat Aug 16 17:30:00 2003 +@@ -6,6 +6,7 @@ + #include + #include "utils.h" + #include ++#include + + using std::cout; + using std::endl; diff --git a/games/exult/pkg-message b/games/exult/pkg-message new file mode 100644 index 0000000..585cd68 --- /dev/null +++ b/games/exult/pkg-message @@ -0,0 +1,4 @@ +****************************************************************************** +* Original Ultima VII data is required to run Exult +* Please, read ${PREFIX}/share/doc/exult/README for additional information +****************************************************************************** diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist index 6e4c510..aa40dfa 100644 --- a/games/exult/pkg-plist +++ b/games/exult/pkg-plist @@ -1,10 +1,10 @@ bin/exult -share/exult/exult.flx -share/exult/exult_bg.flx -share/exult/exult_si.flx -share/exult/midisfx.flx -@dirrm share/exult -%%PORTDOCS%%share/doc/exult/FAQ -%%PORTDOCS%%share/doc/exult/NEWS -%%PORTDOCS%%share/doc/exult/README -%%PORTDOCS%%@dirrm share/doc/exult +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/exult.flx +%%DATADIR%%/exult_bg.flx +%%DATADIR%%/exult_si.flx +%%DATADIR%%/midisfx.flx +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.1