Attachment 57930 Details for Bug 87370 – output-vba

output-vba

output-vba (text/plain), 6.84 KB, created by No Name on 2005-10-13 14:00:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: No Name

Created: 2005-10-13 14:00:27 UTC

Size: 6.84 KB

patch

obsolete

>diff -ruN /usr/ports/emulators/vba/Makefile /usr/ports/custom/vba/Makefile
>--- /usr/ports/emulators/vba/Makefile	Thu Jul 21 02:03:11 2005
>+++ /usr/ports/custom/vba/Makefile	Thu Oct 13 07:19:59 2005
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	vba
> PORTVERSION=	1.7.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	emulators
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -22,10 +22,9 @@
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> USE_SDL=	sdl
>+CONFIGURE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" LIBS="-lintl"
> WRKSRC=		${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
> 
>-TARGET_DIR=	${PREFIX}/bin/
>-
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
>@@ -36,47 +35,63 @@
> CFLAGS+=	-O0
> .endif
> 
>-.ifndef(PROFILING)
>-CONFIGURE_ARGS+=	--without-profiling
>-.endif
>+PLIST_SUB=	INSTALL_GTK="@comment "
> 
>-PLIST_SUB=	INSTALL_DEBUGGER=""
>-
>-.ifndef(WITH_DEBUGGER)
>-CONFIGURE_ARGS+=	--disable-dev
>-PLIST_SUB=	INSTALL_DEBUGGER="@comment "
>+.ifdef(WITH_GTK)
>+PLIST_SUB=	INSTALL_GTK=""
>+CONFIGURE_ARGS+=	--enable-gtk
>+LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
>+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
>+		glademm-2.0.1:${PORTSDIR}/devel/libglademm
>+.endif
>+
>+.ifdef(WITH_GTK2)
>+PLIST_SUB=	INSTALL_GTK=""
>+CONFIGURE_ARGS+=	--enable-gtk=2.4
>+LIB_DEPENDS+=	gdk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk12 \
>+		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
>+		glademm-2.4.1:${PORTSDIR}/devel/libglademm
> .endif
> 
>-CONFIGURE_ARGS+=	LIBS=-L${LOCALBASE}/lib
>+.ifndef(PROFILING)
>+CONFIGURE_ARGS+=	--without-profiling
>+.endif
> 
> DATA_FILES=	${WRKSRC}/src/VisualBoyAdvance.cfg
> PROG_FILES=	${WRKSRC}/src/sdl/VisualBoyAdvance
>-DEBUG_FILES=	${WRKSRC}/src/sdl/TestEmu
> DOC_FILES=	COPYING AUTHORS NEWS README ChangeLog INSTALL
> 
>+.ifdef(WITH_GTK || WITH_GTK2)
>+PROG_FILES+=	${WRKSRC}/src/gtk/gvba
>+GTK_DATA_FILES=	${WRKSRC}/src/gtk/vba.glade
>+.endif
>+
> pre-everything::
> .ifndef(PROFILING)
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "You can enable profiling by defining PROFILING."
> .endif
>-.ifndef(WITH_DEBUGGER)
>+.ifndef(WITH_GTK)
> 	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "You can install the ARM/THUMB debugger by defining WITH_DEBUGGER."
>+	@${ECHO_MSG} "You can install the GTK based X version by defining WITH_GTK."
>+.endif
>+.ifndef(WITH_GTK2)
>+	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "You can install the GTK2 based X version by defining WITH_GTK2."
> .endif
>-
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "Due to a bug in gcc2 optimizations other than -O0 will be ignored on"
> 	@${ECHO_MSG} "FreeBSD releases that didn't ship with gcc3 (prior 500035)."
> 	@${ECHO_MSG} ""
> 
> do-install:
>-	${INSTALL} -d ${TARGET_DIR}
>-	${INSTALL_PROGRAM} ${PROG_FILES} ${TARGET_DIR}
>-.ifdef(WITH_DEBUGGER)
>-	${INSTALL_PROGRAM} ${DEBUG_FILES} ${TARGET_DIR}
>+	${INSTALL_PROGRAM} ${PROG_FILES} ${PREFIX}/bin
>+.ifdef(WITH_GTK || WITH_GTK2)
>+	${INSTALL} -d ${PREFIX}/share/VisualBoyAdvance
>+	${INSTALL_DATA} ${GTK_DATA_FILES} ${PREFIX}/share/VisualBoyAdvance
> .endif
> 	${SED} -e 's|filter=0|filter=1|' ${DATA_FILES} > ${DATA_FILES}-default
>-	${INSTALL_DATA} ${DATA_FILES}-default ${TARGET_DIR}
>+	${INSTALL_DATA} ${DATA_FILES}-default ${PREFIX}/bin
> 
> post-install:
> .ifndef(NOPORTDOCS)
>diff -ruN /usr/ports/emulators/vba/files/patch-aa /usr/ports/custom/vba/files/patch-aa
>--- /usr/ports/emulators/vba/files/patch-aa	Sat Jul 17 13:48:35 2004
>+++ /usr/ports/custom/vba/files/patch-aa	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/sdl/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
>-+++ src/sdl/SDL.cpp		Tue Feb 10 14:45:09 2004
>-@@ -621,7 +621,7 @@
>-   }
>- #else
>- #define SDL_CALL_STRETCHER \
>--        asm volatile("call *%%eax"::"a" (stretcher),"S" (src),"D" (dest))
>-+        asm volatile("call *%%eax" : "=a" (stretcher),"=S" (src),"=D" (dest))
>- #endif
>- #else
>- #define SDL_CALL_STRETCHER \
>diff -ruN /usr/ports/emulators/vba/files/patch-src-getopt.h /usr/ports/custom/vba/files/patch-src-getopt.h
>--- /usr/ports/emulators/vba/files/patch-src-getopt.h	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/custom/vba/files/patch-src-getopt.h	Thu Oct 13 07:19:59 2005
>@@ -0,0 +1,11 @@
>+--- src/getopt.h.orig	Sun Oct  9 23:31:12 2005
>++++ src/getopt.h	Sun Oct  9 23:31:25 2005
>+@@ -112,7 +112,7 @@
>+ extern int getopt (int argc, char *const *argv, const char *shortopts);
>+ #else /* not __GNU_LIBRARY__ */
>+ # if !defined (HAVE_DECL_GETOPT)
>+-extern int getopt ();
>++//extern int getopt ();
>+ # endif
>+ #endif /* __GNU_LIBRARY__ */
>+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
>diff -ruN /usr/ports/emulators/vba/files/patch-src-remote.cpp /usr/ports/custom/vba/files/patch-src-remote.cpp
>--- /usr/ports/emulators/vba/files/patch-src-remote.cpp	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/custom/vba/files/patch-src-remote.cpp	Thu Oct 13 07:19:59 2005
>@@ -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/files/patch-src-sdl-SDL.cpp /usr/ports/custom/vba/files/patch-src-sdl-SDL.cpp
>--- /usr/ports/emulators/vba/files/patch-src-sdl-SDL.cpp	Sat Aug 21 15:59:20 2004
>+++ /usr/ports/custom/vba/files/patch-src-sdl-SDL.cpp	Thu Oct 13 07:19:59 2005
>@@ -1,10 +1,11 @@
>---- 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
>+--- src/sdl/SDL.cpp.orig	Sun Feb  8 14:45:01 2004
>++++ src/sdl/SDL.cpp		Tue Feb 10 14:45:09 2004
>+@@ -621,7 +621,7 @@
>+   }
>+ #else
>+ #define SDL_CALL_STRETCHER \
>+-        asm volatile("call *%%eax"::"a" (stretcher),"S" (src),"D" (dest))
>++        asm volatile("call *%%eax" : "=a" (stretcher),"=S" (src),"=D" (dest))
>+ #endif
>+ #else
>+ #define SDL_CALL_STRETCHER \
>diff -ruN /usr/ports/emulators/vba/pkg-descr /usr/ports/custom/vba/pkg-descr
>--- /usr/ports/emulators/vba/pkg-descr	Tue Feb 17 11:06:24 2004
>+++ /usr/ports/custom/vba/pkg-descr	Thu Oct 13 14:44:56 2005
>@@ -16,4 +16,8 @@
> - AGBPrint support for development
> - RTC support
> 
>+NOTICE: Thx go out to Wouter Groeneveld for helping me to test the port.
>+
> WWW: http://vba.ngemu.com/
>+
>+arundel@h3c.de
>diff -ruN /usr/ports/emulators/vba/pkg-plist /usr/ports/custom/vba/pkg-plist
>--- /usr/ports/emulators/vba/pkg-plist	Sat Aug 21 15:59:20 2004
>+++ /usr/ports/custom/vba/pkg-plist	Thu Oct 13 07:19:59 2005
>@@ -1,10 +1,12 @@
> bin/VisualBoyAdvance
> bin/VisualBoyAdvance.cfg-default
>-%%INSTALL_DEBUGGER%%bin/TestEmu
>+%%INSTALL_GTK%%bin/gvba
>+%%INSTALL_GTK%%share/VisualBoyAdvance/vba.glade
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%INSTALL_GTK%%@dirrm share/VisualBoyAdvance
> %%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View

Attachments on bug 87370: 57930