ports/113768: Update port: games/exult
KATO Tsuguru
tkato432 at yahoo.com
Sat Jun 16 18:10:03 UTC 2007
>Number: 113768
>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 Jun 16 18:10:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Fix build with gcc4
- Support SUB_FILES
New file:
files/patch-audio__midi_drivers__fmopldrv.h
files/patch-hash_utils.h
files/patch-mouse.h
files/patch-usecode__ucxt__include__ucfunc.h
files/pkg-message.in
Remove file:
pkg-message
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/exult/Makefile games/exult/Makefile
--- /usr/ports/games/exult/Makefile Sun May 27 12:22:35 2007
+++ games/exult/Makefile Thu Jun 14 02:54:37 2007
@@ -23,27 +23,25 @@
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
MAN1= expack.1 ipack.1 shp2pcx.1 splitshp.1 textpack.1
MAN6= exult.6
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Broken with gcc 4.2
-.endif
+SUB_FILES= pkg-message
post-patch:
@${REINPLACE_CMD} -e 's|desktop||' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
post-install:
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in FAQ NEWS README
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
- @${SED} -e 's|%%DOCSDIR%%|${DOCSDIR}|' <${PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/exult/files/patch-audio__midi_drivers__fmopldrv.h games/exult/files/patch-audio__midi_drivers__fmopldrv.h
--- /usr/ports/games/exult/files/patch-audio__midi_drivers__fmopldrv.h Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-audio__midi_drivers__fmopldrv.h Thu Jun 14 01:30:50 2007
@@ -0,0 +1,11 @@
+--- audio/midi_drivers/fmopldrv.h.orig Wed Aug 7 03:10:31 2002
++++ audio/midi_drivers/fmopldrv.h Thu Jun 14 01:30:28 2007
+@@ -76,7 +76,7 @@
+ /* output a packed midi command to the midi stream
+ * valid only if mode is MO_SIMPLE
+ */
+- void OplDriver::send(uint32 b);
++ void send(uint32 b);
+
+ /* retrieve a string representation of an error code */
+ static const char *get_error_name(int error_code);
diff -urN /usr/ports/games/exult/files/patch-hash_utils.h games/exult/files/patch-hash_utils.h
--- /usr/ports/games/exult/files/patch-hash_utils.h Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-hash_utils.h Thu Jun 14 01:08:15 2007
@@ -0,0 +1,20 @@
+--- hash_utils.h.orig Mon Sep 1 02:32:24 2003
++++ hash_utils.h Thu Jun 14 01:07:42 2007
+@@ -26,7 +26,7 @@
+ #else
+ #if HAVE_EXT_HASH_MAP
+ # include <ext/hash_map>
+-# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
++# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0) || (__GNUC__ >= 4)))
+ using __gnu_cxx::hash_map;
+ # else
+ using std::hash_map;
+@@ -44,7 +44,7 @@
+ #else
+ #if HAVE_EXT_HASH_SET
+ # include <ext/hash_set>
+-# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
++# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0) || (__GNUC__ >= 4)))
+ using __gnu_cxx::hash_set;
+ # else
+ using std::hash_set;
diff -urN /usr/ports/games/exult/files/patch-mouse.h games/exult/files/patch-mouse.h
--- /usr/ports/games/exult/files/patch-mouse.h Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-mouse.h Thu Jun 14 01:29:50 2007
@@ -0,0 +1,11 @@
+--- mouse.h.orig Mon Sep 1 02:32:24 2003
++++ mouse.h Thu Jun 14 01:28:55 2007
+@@ -27,6 +27,8 @@
+ #include "vgafile.h"
+ #include "glshape.h"
+
++class Game_window;
++
+ /*
+ * Handle custom mouse pointers.
+ */
diff -urN /usr/ports/games/exult/files/patch-usecode__ucxt__include__ucfunc.h games/exult/files/patch-usecode__ucxt__include__ucfunc.h
--- /usr/ports/games/exult/files/patch-usecode__ucxt__include__ucfunc.h Thu Jan 1 09:00:00 1970
+++ games/exult/files/patch-usecode__ucxt__include__ucfunc.h Thu Jun 14 01:41:38 2007
@@ -0,0 +1,11 @@
+--- usecode/ucxt/include/ucfunc.h.orig Mon Sep 1 02:32:28 2003
++++ usecode/ucxt/include/ucfunc.h Thu Jun 14 01:41:17 2007
+@@ -206,7 +206,7 @@
+ bool output_list(std::ostream &o, unsigned int funcno, const UCOptions &options);
+
+ bool output_ucs(std::ostream &o, const FuncMap &funcmap, const std::map<unsigned int, std::string> &intrinsics, const UCOptions &options);
+- std::ostream &UCFunc::output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
++ std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
+ std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap,
+ unsigned int funcid,
+ unsigned int numargs, bool return_var);
diff -urN /usr/ports/games/exult/files/pkg-message.in games/exult/files/pkg-message.in
--- /usr/ports/games/exult/files/pkg-message.in Thu Jan 1 09:00:00 1970
+++ games/exult/files/pkg-message.in Thu Jun 14 00:34:35 2007
@@ -0,0 +1,4 @@
+******************************************************************************
+* Run Exult from directory, containing original Ultima VII data.
+* Please, read %%DOCSDIR%%/README for additional information.
+******************************************************************************
diff -urN /usr/ports/games/exult/pkg-message games/exult/pkg-message
--- /usr/ports/games/exult/pkg-message Thu Apr 1 13:30:18 2004
+++ games/exult/pkg-message Thu Jan 1 09:00:00 1970
@@ -1,4 +0,0 @@
-******************************************************************************
-* Run Exult from directory, containing original Ultima VII data.
-* Please, read %%DOCSDIR%%/README for additional information.
-******************************************************************************
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list