Date: Sun, 19 Oct 2003 01:45:32 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58219: Update port: games/exult Message-ID: <20031019014532.166db087.tkato@prontomail.com> Resent-Message-ID: <200310181650.h9IGoKNu093785@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58219
>Category: ports
>Synopsis: Update port: games/exult
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 18 09:50:20 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Utilize USE_SDL
New file:
files/patch-files-databuf.h
files/patch-files-rwregress.cc
pkg-message
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/exult/Makefile games/exult/Makefile
--- /usr/ports/games/exult/Makefile Thu Oct 16 19:37:15 2003
+++ games/exult/Makefile Sat Oct 18 22:38:19 2003
@@ -5,60 +5,48 @@
# $FreeBSD: ports/games/exult/Makefile,v 1.8 2003/10/16 02:21:10 kris Exp $
#
-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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/exult/files/patch-files-databuf.h games/exult/files/patch-files-databuf.h
--- /usr/ports/games/exult/files/patch-files-databuf.h Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-files-databuf.h Sat Aug 16 17:54:41 2003
@@ -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 <cassert>
+ #endif
++#if defined(__GNUC__) && __GNUC__ >= 3
++# include <cassert>
++#endif
+ #include <fstream>
+ #include <iomanip>
+ #include "U7file.h"
diff -urN /usr/ports/games/exult/files/patch-files-rwregress.cc games/exult/files/patch-files-rwregress.cc
--- /usr/ports/games/exult/files/patch-files-rwregress.cc Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-files-rwregress.cc Sat Aug 16 17:49:20 2003
@@ -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 <iostream>
+ #include "utils.h"
+ #include <strstream>
++#include <cassert>
+
+ using std::cout;
+ using std::endl;
diff -urN /usr/ports/games/exult/pkg-message games/exult/pkg-message
--- /usr/ports/games/exult/pkg-message Thu Jan 1 09:00:00 1970
+++ games/exult/pkg-message Sat Aug 16 16:42:06 2003
@@ -0,0 +1,4 @@
+******************************************************************************
+* Original Ultima VII data is required to run Exult
+* Please, read /usr/local/share/doc/exult/README for additional information
+******************************************************************************
diff -urN /usr/ports/games/exult/pkg-plist games/exult/pkg-plist
--- /usr/ports/games/exult/pkg-plist Fri Jun 28 00:51:36 2002
+++ games/exult/pkg-plist Sat Aug 16 18:16:28 2003
@@ -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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031019014532.166db087.tkato>