Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Aug 2004 14:38:59 +0200 (CEST)
From:      No Name <arundel@h3c.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/70769: Maintainer update of emulators/vba
Message-ID:  <200408211238.i7LCcxnl024792@skatecity.>
Resent-Message-ID: <200408211240.i7LCe9Yj017360@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         70769
>Category:       ports
>Synopsis:       Maintainer update of emulators/vba
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 21 12:40:09 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     No Name
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD skatecity 4.10-STABLE FreeBSD 4.10-STABLE #0: Sun Aug 15 16:14:46 CEST 2004 arundel@skatecity:/usr/obj/usr/src/sys/ARUNDEL i386


>Description:
	Resolves 4.x problem (BROKEN due to sys/socket.h) and adds a few minor changes.
>How-To-Repeat:
	
>Fix:

--- output-vba begins here ---
diff -ruN /usr/ports/emulators/vba/Makefile /usr/ports/custom/vba/Makefile
--- /usr/ports/emulators/vba/Makefile	Sat Aug 21 04:01:28 2004
+++ /usr/ports/custom/vba/Makefile	Sat Aug 21 12:15:16 2004
@@ -2,16 +2,17 @@
 # Date Created:				02 September 2003
 # Whom:					<arundel@gmx.net>
 #
-# $FreeBSD: ports/emulators/vba/Makefile,v 1.13 2004/08/16 01:16:13 kris Exp $
+# $FreeBSD: ports/emulators/vba/Makefile,v 1.11 2004/07/17 11:48:35 krion Exp $
 
 PORTNAME=	vba
 PORTVERSION=	1.7.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	VisualBoyAdvance-src-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	arundel@h3c.de
 COMMENT=	Open Source Gameboy Advance emulator
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
@@ -31,18 +32,22 @@
 CFLAGS+=	-O0
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on 4.x"
-.endif
-
 .ifndef(PROFILING)
 CONFIGURE_ARGS+=	--without-profiling
 .endif
 
+PLIST_SUB=	INSTALL_DEBUGGER=""
+
+.ifndef(WITH_DEBUGGER)
+CONFIGURE_ARGS+=	--disable-dev
+PLIST_SUB=	INSTALL_DEBUGGER="@comment "
+.endif
+
 CONFIGURE_ARGS+=	LIBS=-L${LOCALBASE}/lib
 
 DATA_FILES=	${WRKSRC}/src/VisualBoyAdvance.cfg
-PROG_FILES=	${WRKSRC}/src/sdl/VisualBoyAdvance ${WRKSRC}/src/sdl/TestEmu
+PROG_FILES=	${WRKSRC}/src/sdl/VisualBoyAdvance
+DEBUG_FILES=	${WRKSRC}/src/sdl/TestEmu
 DOC_FILES=	COPYING AUTHORS NEWS README ChangeLog INSTALL
 
 pre-everything::
@@ -50,6 +55,11 @@
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can enable profiling by defining PROFILING."
 .endif
+.ifndef(WITH_DEBUGGER)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You can install the ARM/THUMB debugger by defining WITH_DEBUGGER."
+.endif
+
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Due to a bug in gcc2 optimsations other than -O0 will be ignored on"
 	@${ECHO_MSG} "FreeBSD releases that didn't ship with gcc3 (prior 500035)."
@@ -58,7 +68,10 @@
 do-install:
 	${INSTALL} -d ${TARGET_DIR}
 	${INSTALL_PROGRAM} ${PROG_FILES} ${TARGET_DIR}
-	${CP} ${DATA_FILES} ${DATA_FILES}-default
+.ifdef(WITH_DEBUGGER)
+	${INSTALL_PROGRAM} ${DEBUG_FILES} ${TARGET_DIR}
+.endif
+	${SED} -e 's|filter=0|filter=1|' ${DATA_FILES} > ${DATA_FILES}-default
 	${INSTALL_DATA} ${DATA_FILES}-default ${TARGET_DIR}
 
 post-install:
diff -ruN /usr/ports/emulators/vba/files/patch-ab /usr/ports/custom/vba/files/patch-ab
--- /usr/ports/emulators/vba/files/patch-ab	Thu Jan  1 01:00:00 1970
+++ /usr/ports/custom/vba/files/patch-ab	Thu Aug 19 18:33:20 2004
@@ -0,0 +1,10 @@
+--- src/remote.cpp.old	Thu May 20 19:24:47 2004
++++ src/remote.cpp	Thu Aug 19 18:16:57 2004
+@@ -22,6 +22,7 @@
+ 
+ #ifndef WIN32
+ # include <unistd.h>
++# undef _BSD_SOCKLEN_T_
+ # include <sys/socket.h>
+ # include <netdb.h>
+ # ifdef HAVE_NETINET_IN_H
diff -ruN /usr/ports/emulators/vba/pkg-message /usr/ports/custom/vba/pkg-message
--- /usr/ports/emulators/vba/pkg-message	Fri May 14 13:49:01 2004
+++ /usr/ports/custom/vba/pkg-message	Thu Aug 19 20:18:33 2004
@@ -1,3 +1,5 @@
+-----------------------------------------------------------------
 The default configuration file has been installed as
 X11BASE/bin/VisualBoyAdvance.cfg-default. Please copy it to
 X11BASE/bin/VisualBoyAdvance.cfg before you start the emulator.
+-----------------------------------------------------------------
diff -ruN /usr/ports/emulators/vba/pkg-plist /usr/ports/custom/vba/pkg-plist
--- /usr/ports/emulators/vba/pkg-plist	Sat Jul 24 04:00:42 2004
+++ /usr/ports/custom/vba/pkg-plist	Thu Aug 19 19:18:48 2004
@@ -1,6 +1,6 @@
 bin/VisualBoyAdvance
 bin/VisualBoyAdvance.cfg-default
-bin/TestEmu
+%%INSTALL_DEBUGGER%%bin/TestEmu
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
--- output-vba ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200408211238.i7LCcxnl024792>