Stephan Andre' [2007-10-05, 13:18:46]:
> This is on an i386 -current system last compiled Oct 2nd.
> 
> Here is the tail of the compile attempt.  When fixed I'll learn
> something, as I don't see the conflict with includes(?).
> 
> c++ -DPACKAGE=\"toppler\" -DVERSION=\"0.96\" -DSDL_MIXER=1 -DHAVE_SCANDIR=1  
> -I. -I.   -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 
> -D_REENTRANT -DDATADIR=\"/usr/local/share/toppler\" 
> -DSCOREFILE=\"/var/games/toppler.hsc\"  -O2 -pipe -c 
> snowball.cc
> snowball.cc:9: error: `long int time' redeclared as different kind of symbol
> /usr/include/time.h:114: error: previous declaration of `time_t time(time_t*)'

this seems to be due to the new SDL version. time.h gets pulled in via
the new header SDL_stdinc.h. the simplest fix is probably to just rename
the time variable.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/toppler/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile    2007/09/15 18:01:03     1.14
+++ Makefile    2007/10/12 20:34:38
@@ -4,7 +4,7 @@
 
 VERSION=       0.96
 DISTNAME=      toppler-${VERSION}
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    games
 
 HOMEPAGE=      http://toppler.sourceforge.net/
@@ -24,6 +24,9 @@
 MAKE_FLAGS=    scoredir=/var/games
 
 USE_X11=       Yes
+
+pre-configure:
+       @perl -pi -e 's,time,mytime,g' ${WRKSRC}/snowball.cc
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/toppler

Reply via email to