ports/67575: portupdate: freesci

[Radim Kolar]

>Number:         67575
>Category:       ports
>Synopsis:       portupdate: freesci
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 04 09:40:21 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
Sanatana Dharma
>Environment:
System: FreeBSD asura.bsd 5.2.1-RELEASE-p6 FreeBSD 5.2.1-RELEASE-p6 #7: Mon May 10 17:15:51 CEST 2004 root at asura.bsd:/usr/src/sys/i386/compile/UP i386
>Description:
allow use of XSHM for much faster display
allow extra C optim.
>How-To-Repeat:
There is one slight problem which should be corrected before commiting, but
this is not critical.

command @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
should run before running configure script but after autoconf tool. uncomment use pthread_flags in configure_env
>Fix:
diff -Naur7 /usr/ports/emulators/freesci/Makefile freesci/Makefile
--- /usr/ports/emulators/freesci/Makefile	Mon Mar  8 14:09:04 2004
+++ freesci/Makefile	Sat May 29 21:30:30 2004
@@ -17,22 +17,37 @@
 COMMENT=	A portable interpreter for SCI games, such as the Space Quest series
 
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
+USE_AUTOCONF_VER=257
+USE_AUTOMAKE_VER=17
+USE_AUTOMAKE=yes
+USE_AUTOHEADER=yes
+AUTOMAKE_ENV+= AUTOCONF=autoconf257
 
 CONFIGURE_TARGET=
-CONFIGURE_ENV=	CFLAGS=${PTHREAD_CFLAGS}
+CONFIGURE_ARGS=--disable-dependency-tracking
+#CONFIGURE_ENV=	CFLAGS=${PTHREAD_CFLAGS}
+CONFIGURE_ENV+= AUTOMAKE=automake17 AUTOCONF=autoconf257 AUTOHEADER=autoheader257 ACLOCAL=aclocal17
 
 MAN6=	freesci-tools.6 freesci.6
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+= -O3 -fexpensive-optimizations -fomit-frame-pointer -funroll-loops \
+	-fstrict-aliasing
+.if ${ARCH} != "alpha"
+CFLAGS+=	-ffast-math
+.endif
+.endif	
+
 .if ${HAVE_SDL:Msdl}!=""
 WITH_SDL=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libdirectfb-0.9.so.16)
 WITH_DIRECTFB=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libggi.so.2)
@@ -74,16 +89,22 @@
 .endif
 .if !defined(WITH_GGI)
 	@${ECHO_MSG} "Define WITH_GGI to build with GGI support"
 .endif
 .if !defined(WITH_DIRECTFB)
 	@${ECHO_MSG} "Define WITH_DIRECTFB to build with DirectFB support"
 .endif
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to build with extra optim."
+.endif	
 
 post-patch:
+	cd ${WRKSRC} && ${SETENV} AUTOCONF=autoconf257 aclocal17
+
+pre-configure:
 	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/games/freesci
 	@${INSTALL_DATA} ${WRKSRC}/doc/sci.sgml ${WRKSRC}/doc/freesci.sgml \
 		${WRKSRC}/doc/game-list.sgml ${WRKSRC}/doc/sci-kernel.sgml \
diff -Naur7 /usr/ports/emulators/freesci/files/patch-configure.in freesci/files/patch-configure.in
--- /usr/ports/emulators/freesci/files/patch-configure.in	Thu Jan  1 01:00:00 1970
+++ freesci/files/patch-configure.in	Sat May 29 17:59:40 2004
@@ -0,0 +1,11 @@
+--- configure.in.orig	Mon Jan 27 01:07:59 2003
++++ configure.in	Sat May 29 17:57:08 2004
+@@ -134,6 +134,8 @@
+ 
+ #--- beginning
+ AC_PATH_XTRA
++CFLAGS="$X_CFLAGS $CFLAGS"
++CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+ 
+ if test x"$have_x" = xyes; then
+ 	AC_CHECK_HEADERS(X11/Xft/Xft.h)
>Release-Note:
>Audit-Trail:
>Unformatted: