Date: Sun, 15 May 2005 15:36:54 +0200 From: "Miguel Mendez" <flynn@energyhq.es.eu.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/81064: Update emulators/fuse to 0.7.0 Message-ID: <1116164214.0@scienide.energyhq.es.eu.org> Resent-Message-ID: <200505151340.j4FDeFCI037568@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81064
>Category: ports
>Synopsis: Update emulators/fuse to 0.7.0
>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: Sun May 15 13:40:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Miguel Mendez
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 5.4-RELEASE #0: Thu May 12 19:57:42 UTC 2005
root@scienide.energyhq.es.eu.org:/usr/src/sys/i386/compile/SCIENIDE.SMP
>Description:
Update to 0.7.0
Changelog: http://sourceforge.net/project/shownotes.php?release_id=253535
Update, OPTIONS'ify and pet portlint
2 patches are gone: patch-ui_ggi_ggikeyboard.c.patch and patch-z80_z80.pl
GGI support seems to have been removed so it's not in the OPTIONS menu
This is step 3/3 of the fuse update, which depends on both the lib765 and libspectrum
PRs.
>How-To-Repeat:
>Fix:
--- fuse.diff begins here ---
diff -ruN fuse.old/Makefile fuse/Makefile
--- fuse.old/Makefile Wed Feb 4 06:20:05 2004
+++ fuse/Makefile Sun May 15 14:14:29 2005
@@ -6,8 +6,7 @@
#
PORTNAME= fuse
-PORTVERSION= 0.6.1.1
-PORTREVISION= 1
+PORTVERSION= 0.7.0
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fuse-emulator
@@ -15,17 +14,28 @@
MAINTAINER= kemm@in-line.ru
COMMENT= Free Unix (Sinclair ZX-)Spectrum Emulator
-LIB_DEPENDS= spectrum.2:${PORTSDIR}/emulators/libspectrum \
- 765.3:${PORTSDIR}/emulators/lib765 \
+LIB_DEPENDS= spectrum.4:${PORTSDIR}/emulators/libspectrum \
+ 765.4:${PORTSDIR}/emulators/lib765 \
xml2.5:${PORTSDIR}/textproc/libxml2 \
png.5:${PORTSDIR}/graphics/png
+WANT_GNOME= yes
+WANT_SDL= yes
USE_XLIB= yes
USE_PERL5_BUILD= yes
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-plus3-disk-prefix=${LOCALBASE}
+OPTIONS= SMALLMEM "Low memory compile needed" off \
+ GTK "Use GTK1 user interface" off \
+ SDL "Use SDL user interface" on \
+ SVGALIB "Use SVGAlib user interface" off \
+ GTK2 "Use GTK2 user interface" on \
+ GCRYPT "Support digital signing of .RZX files" off
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_SMALLMEM)
CONFIGURE_ARGS+= --enable-smallmem
.endif
@@ -46,11 +56,6 @@
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
.endif
-.if defined(WITH_GGI)
-CONFIGURE_ARGS+= --with-ggi
-LIB_DEPENDS+= ggi.2:${PORTSDIR}/graphics/libggi
-.endif
-
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --with-gtk2
USE_GNOME+= gtk20
@@ -58,30 +63,16 @@
.if defined(WITH_GCRYPT) || exists(${LOCALBASE}/include/gcrypt.h)
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
-LIB_DEPENDS+= gcrypt.6:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+= gcrypt.13:${PORTSDIR}/security/libgcrypt
.endif
MAN1= fuse.1
DOCS= AUTHORS ChangeLog README THANKS
-pre-everything::
- @${ECHO_MSG} ${CONFIGURE_ARGS}
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You may use the following build options:"
- @${ECHO_MSG} ""
- @${ECHO_MSG} " WITH_SMALLMEM=yes low memory compile needed"
- @${ECHO_MSG} " WITHOUT_GTK=yes don't use GTK1 user interface"
- @${ECHO_MSG} " WITH_SDL=yes use SDL user interface"
- @${ECHO_MSG} " WITH_SVGALIB=yes use SVGAlib user interface"
- @${ECHO_MSG} " WITH_GGI=yes use GGI user interface"
- @${ECHO_MSG} " WITH_GTK2=yes use GTK2 user interface"
- @${ECHO_MSG} " WITH_GCRYPT=yes support digital signing of .RZX files"
- @${ECHO_MSG} ""
-
.if !defined(NOPORTDOCS)
post-install:
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN fuse.old/distinfo fuse/distinfo
--- fuse.old/distinfo Wed Mar 31 05:07:41 2004
+++ fuse/distinfo Sat May 14 21:52:10 2005
@@ -1,2 +1,2 @@
-MD5 (fuse-0.6.1.1.tar.gz) = 6738574d0f01f758ed352a6d3cb5f4b1
-SIZE (fuse-0.6.1.1.tar.gz) = 509597
+MD5 (fuse-0.7.0.tar.gz) = d81ad260cd6a8dd533af01ee6a5f9527
+SIZE (fuse-0.7.0.tar.gz) = 872031
diff -ruN fuse.old/files/patch-osssound.c fuse/files/patch-osssound.c
--- fuse.old/files/patch-osssound.c Wed Oct 29 17:20:57 2003
+++ fuse/files/patch-osssound.c Sat May 14 21:53:58 2005
@@ -1,5 +1,5 @@
---- osssound.c.orig Sat Sep 13 16:53:12 2003
-+++ osssound.c Tue Oct 28 17:19:06 2003
+--- sound/osssound.c.orig Sat Sep 13 16:53:12 2003
++++ sound/osssound.c Tue Oct 28 17:19:06 2003
@@ -107,6 +107,7 @@
return 1;
}
diff -ruN fuse.old/files/patch-ui_ggi_ggikeyboard.c.patch fuse/files/patch-ui_ggi_ggikeyboard.c.patch
--- fuse.old/files/patch-ui_ggi_ggikeyboard.c.patch Wed Oct 29 17:20:57 2003
+++ fuse/files/patch-ui_ggi_ggikeyboard.c.patch Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- ui/ggi/ggikeyboard.c.orig Sat Sep 13 16:53:48 2003
-+++ ui/ggi/ggikeyboard.c Tue Oct 28 14:52:14 2003
-@@ -43,6 +43,8 @@
- #include "widget/widget.h"
- #endif /* #ifdef USE_WIDGET */
-
-+#include "fuse.h"
-+
- void
- ggikeyboard_keypress( int keysym )
- {
diff -ruN fuse.old/files/patch-z80_z80.pl fuse/files/patch-z80_z80.pl
--- fuse.old/files/patch-z80_z80.pl Wed Oct 29 17:20:57 2003
+++ fuse/files/patch-z80_z80.pl Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
---- z80/z80.pl.orig Sat Sep 13 16:53:54 2003
-+++ z80/z80.pl Tue Oct 28 13:00:53 2003
-@@ -1128,9 +1128,10 @@
-
- {
- no strict qw( refs );
-+ my $func = "opcode_$opcode";
-
-- if( exists &{ "opcode_$opcode" } ) {
-- "opcode_$opcode"->( @arguments );
-+ if( defined (&$func) ) {
-+ &$func( @arguments );
- }
- }
-
diff -ruN fuse.old/pkg-plist fuse/pkg-plist
--- fuse.old/pkg-plist Wed Oct 29 17:20:57 2003
+++ fuse/pkg-plist Sun May 15 15:04:00 2005
@@ -1,32 +1,45 @@
@comment $FreeBSD: ports/emulators/fuse/pkg-plist,v 1.1 2003/10/29 16:20:57 sergei Exp $
bin/fuse
-share/fuse/disk_plus3.z80
-share/fuse/keyboard.scr
-share/fuse/tape_128.z80
-share/fuse/tape_16.z80
-share/fuse/tape_2048.z80
-share/fuse/tape_2068.z80
-share/fuse/tape_48.z80
-share/fuse/tape_plus2.z80
-share/fuse/tape_plus2a.z80
-share/fuse/tape_plus3.z80
-share/fuse/tape_pentagon.z80
-share/fuse/128-0.rom
-share/fuse/128-1.rom
-share/fuse/48.rom
-share/fuse/plus2-0.rom
-share/fuse/plus2-1.rom
-share/fuse/plus3-0.rom
-share/fuse/plus3-1.rom
-share/fuse/plus3-2.rom
-share/fuse/plus3-3.rom
-share/fuse/tc2048.rom
-share/fuse/tc2068-0.rom
-share/fuse/tc2068-1.rom
-share/fuse/128p-0.rom
-share/fuse/128p-1.rom
-share/fuse/trdos.rom
-@dirrm share/fuse
+%%DATADIR%%/cassette.bmp
+%%DATADIR%%/plus3disk.bmp
+%%DATADIR%%/disk_plus3.z80
+%%DATADIR%%/keyboard.scr
+%%DATADIR%%/tape_128.z80
+%%DATADIR%%/tape_16.z80
+%%DATADIR%%/tape_2048.z80
+%%DATADIR%%/tape_2068.z80
+%%DATADIR%%/tape_48.z80
+%%DATADIR%%/tape_plus2.z80
+%%DATADIR%%/tape_plus2a.z80
+%%DATADIR%%/tape_plus3.z80
+%%DATADIR%%/tape_pentagon.z80
+%%DATADIR%%/128-0.rom
+%%DATADIR%%/128-1.rom
+%%DATADIR%%/48.rom
+%%DATADIR%%/plus2-0.rom
+%%DATADIR%%/plus2-1.rom
+%%DATADIR%%/plus3-0.rom
+%%DATADIR%%/plus3-1.rom
+%%DATADIR%%/plus3-2.rom
+%%DATADIR%%/plus3-3.rom
+%%DATADIR%%/tc2048.rom
+%%DATADIR%%/tc2068-0.rom
+%%DATADIR%%/tc2068-1.rom
+%%DATADIR%%/128p-0.rom
+%%DATADIR%%/128p-1.rom
+%%DATADIR%%/trdos.rom
+%%DATADIR%%/tape_scorpion.z80
+%%DATADIR%%/plus3e-0.rom
+%%DATADIR%%/plus3e-1.rom
+%%DATADIR%%/plus3e-2.rom
+%%DATADIR%%/plus3e-3.rom
+%%DATADIR%%/256s-0.rom
+%%DATADIR%%/256s-1.rom
+%%DATADIR%%/256s-2.rom
+%%DATADIR%%/256s-3.rom
+%%DATADIR%%/se-0.rom
+%%DATADIR%%/se-1.rom
+@dirrm %%DATADIR%%
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/README
--- fuse.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1116164214.0>