ports/67878: portupgrade: freesci

[Radim Kolar]

>Number:         67878
>Category:       ports
>Synopsis:       portupgrade: 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:   Sat Jun 12 14:50:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Radim Kolar
>Release:        FreeBSD 5.2.1-RELEASE-p6 i386
>Organization:
Sanatana Dharma
>Environment:
System: FreeBSD sanatana.dharma 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:
	
This is superset of ports/67575. Patch configure instead of going through
auto*tools hell.
>How-To-Repeat:
>Fix:
diff -Naur /usr/ports/emulators/freesci/Makefile freesci/Makefile
--- /usr/ports/emulators/freesci/Makefile	Mon Mar  8 14:09:04 2004
+++ freesci/Makefile	Sat Jun 12 16:22:28 2004
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	freesci
-PORTVERSION=	0.3.4a
-PORTREVISION=	1
+PORTVERSION=	0.3.4c
+PORTREVISION=	0
 CATEGORIES=	emulators games
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://teksolv.de/~jameson/
@@ -23,12 +23,20 @@
 WANT_SDL=	yes
 
 CONFIGURE_TARGET=
-CONFIGURE_ENV=	CFLAGS=${PTHREAD_CFLAGS}
-
+	
+CFLAGS=${PTHREAD_CFLAGS}
 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
@@ -64,6 +72,7 @@
 .else
 CONFIGURE_ARGS+=	--without-ggi
 .endif
+CONFIGURE_ENV= CFLAGS="${CFLAGS}"
 
 pre-everything::
 .if !defined(WITH_CONSOLE)
@@ -78,8 +87,11 @@
 .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:
+pre-configure:
 	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/g' ${WRKSRC}/configure
 
 post-install:
diff -Naur /usr/ports/emulators/freesci/distinfo freesci/distinfo
--- /usr/ports/emulators/freesci/distinfo	Tue Feb  3 16:09:48 2004
+++ freesci/distinfo	Sat Jun 12 16:00:28 2004
@@ -1,2 +1,2 @@
-MD5 (freesci-0.3.4a.tar.bz2) = 135bcfc64496b0b7f11e756bbb8fdaf9
-SIZE (freesci-0.3.4a.tar.bz2) = 965754
+MD5 (freesci-0.3.4c.tar.bz2) = 2ec3240460316cb2901371d07662b1c4
+SIZE (freesci-0.3.4c.tar.bz2) = 953374
diff -Naur /usr/ports/emulators/freesci/files/patch-configure freesci/files/patch-configure
--- /usr/ports/emulators/freesci/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ freesci/files/patch-configure	Sat Jun 12 16:07:37 2004
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Apr  8 04:19:41 2004
++++ configure	Sat Jun 12 16:07:07 2004
+@@ -9619,6 +9619,8 @@
+ 
+ fi
+ 
++CFLAGS="$X_CFLAGS $CFLAGS"
++CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+ 
+ if test x"$have_x" = xyes; then
+ 
diff -Naur /usr/ports/emulators/freesci/pkg-descr freesci/pkg-descr
--- /usr/ports/emulators/freesci/pkg-descr	Fri Oct  3 15:51:20 2003
+++ freesci/pkg-descr	Sat Jun 12 16:12:13 2004
@@ -12,4 +12,4 @@
 - George Reid
 greid at ukug.uk.freebsd.org
 
-WWW: http://freesci.linuxgames.com/index.shtml
+WWW: http://freesci.linuxgames.com/
>Release-Note:
>Audit-Trail:
>Unformatted: