From lofi@lofi.dyndns.org  Wed Jun 12 22:11:34 2002
Return-Path: <lofi@lofi.dyndns.org>
Received: from lofi.dyndns.org (pD9003321.dip.t-dialin.net [217.0.51.33])
	by hub.freebsd.org (Postfix) with ESMTP id 5267437B409
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jun 2002 22:11:33 -0700 (PDT)
Received: from lofi.dyndns.org (lofi@localhost [127.0.0.1]) by lofi.dyndns.org  with ESMTP id g5D5Ao5R022701 for <FreeBSD-gnats-submit@freebsd.org>; Thu, 13 Jun 2002 07:11:31 +0200 (CEST)
Received: (from lofi@localhost)
	by lofi.dyndns.org (8.12.3/8.12.3/Submit) id g5D5Ao4h022700;
	Thu, 13 Jun 2002 07:10:50 +0200 (CEST)
Message-Id: <200206130510.g5D5Ao4h022700@lofi.dyndns.org>
Date: Thu, 13 Jun 2002 07:10:50 +0200 (CEST)
From: Michael Nottebrock <lofi@lofi.dyndns.org>
Reply-To: Michael Nottebrock <michaelnottebrock@gmx.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update emulators/gngb to latest snapshot
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         39215
>Category:       ports
>Synopsis:       Update emulators/gngb to latest snapshot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nakai
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 12 22:20:01 PDT 2002
>Closed-Date:    Tue Jul 30 04:55:48 PDT 2002
>Last-Modified:  Tue Jul 30 04:55:48 PDT 2002
>Originator:     Michael Nottebrock
>Release:        FreeBSD 4.6-RC i386
>Organization:
>Environment:



	
>Description:
	Update emulators/gngb to latest snapshot.	

>How-To-Repeat:
	
>Fix:
diff -urN gngb.orig/Makefile gngb/Makefile
--- gngb.orig/Makefile	Fri Apr 19 11:25:35 2002
+++ gngb/Makefile	Thu Jun 13 06:44:46 2002
@@ -6,24 +6,45 @@
 #
 
 PORTNAME=	gngb
-PORTVERSION=	20010318
+PORTVERSION=	20020111
 CATEGORIES=	emulators
-MASTER_SITES=	http://frogus.multimania.com/
-DISTNAME=	${PORTNAME}_${PORTVERSION}_src
+MASTER_SITES=	http://membres.lycos.fr/frogus/gngb/download/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_XLIB=	yes
 USE_X_PREFIX=	yes
-
-post-patch:
-		perl -pi -e 's/<SDL\//<SDL11\//' ${WRKSRC}/*.[ch]
-
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/gngb ${PREFIX}/bin
+CONFIGURE_ENV=	CFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
+PORT_CFLAGS=	-DSDL_YUV -I${LOCALBASE}/include -I${LOCALBASE}/include/SDL11 -I${X11BASE}/include
+
+pre-everything::
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can enable additional compilation optimizations"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+.endif
+.if defined(WITH_GL)
+CONFIGURE_ARGS=	--with-gl
+PORT_CFLAGS+=	-DSDL_GL
+.else
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable OpenGL support by defining WITH_GL"
+	@${ECHO_MSG}
+.endif
+
+pre-configure:
+	@${PERL} -pi -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lSDL|-lSDL-1.1|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
+post-configure:
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${PERL} -pi -e 's|(CFLAGS =).*|\1 ${PORT_CFLAGS} ${CFLAGS}|' ${WRKSRC}/src/Makefile
+.endif
 
 .include <bsd.port.mk>
diff -urN gngb.orig/distinfo gngb/distinfo
--- gngb.orig/distinfo	Sun Apr 22 03:40:55 2001
+++ gngb/distinfo	Thu Jun 13 06:33:01 2002
@@ -1 +1 @@
-MD5 (gngb_20010318_src.tar.gz) = cd7d0c1cd8852f49ae938f0f8c1ba9a5
+MD5 (gngb-20020111.tar.gz) = 549100377559045cf80d370de6203ba8
diff -urN gngb.orig/files/patch-aa gngb/files/patch-aa
--- gngb.orig/files/patch-aa	Sun Apr 22 03:40:59 2001
+++ gngb/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,30 +0,0 @@
---- Makefile.orig	Sun Apr 22 10:34:08 2001
-+++ Makefile	Sun Apr 22 10:39:35 2001
-@@ -15,23 +15,23 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
--GL_MODE = 1
-+#GL_MODE = 1
- 
- CC = gcc
- INCDIRS = -I. -I/usr/include 
- LIBDIRS =  -L/usr/X11R6/lib 
- DEBUG = -g 
- PROFILE = -pg -O3
--OPT = -O3  -mpentiumpro  -Wno-unused -funroll-loops -fstrength-reduce -ffast-math -malign-functions=2   -malign-jumps=2 -malign-loops=2 -fomit-frame-pointer -Wall -g
-+OPT = -O3  -mpentiumpro  -Wno-unused -funroll-loops -fstrength-reduce -ffast-math -malign-functions=2   -malign-jumps=2 -malign-loops=2 -fomit-frame-pointer -Wall -g -I/usr/local/include/
- OBJ = memory.o vram.o interrupt.o  cpu.o rom.o sound.o serial.o frame_skip.o main.o 
- DOBJ = debuger/memory.o debuger/vram.o debuger/interrupt.o debuger/cpu.o debuger/rom.o debuger/sound.o debuger/serial.o debuger/frame_skip.o debuger/log.o debuger/debuger.o
- 
- ifdef GL_MODE
- CFLAGS = $(OPT) -D_REENTRANT -DSDL_GL
--LIBS = -lSDL -lpthread -lGL
-+LIBS = -lSDL-1.1 -lpthread -lGL -L/usr/local/lib
- else
- CFLAGS = $(OPT) -D_REENTRANT 
--LIBS = -lSDL -lpthread 
-+LIBS = -lSDL-1.1 -L/usr/local/lib -lc_r
- endif
- 
- all : gngb
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->nakai 
Responsible-Changed-By: pat 
Responsible-Changed-When: Mon Jun 17 22:00:50 PDT 2002 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39215 
State-Changed-From-To: open->closed 
State-Changed-By: nakai 
State-Changed-When: Tue Jul 30 04:55:34 PDT 2002 
State-Changed-Why:  
Update commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=39215 
>Unformatted:
