From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 6 21:20:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F0051065673 for ; Wed, 6 May 2009 21:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id DBF508FC1E for ; Wed, 6 May 2009 21:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n46LK1Cg081095 for ; Wed, 6 May 2009 21:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n46LK19t081094; Wed, 6 May 2009 21:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 6 May 2009 21:20:01 GMT Resent-Message-Id: <200905062120.n46LK19t081094@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Janos Mohacsi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB0CB1065670 for ; Wed, 6 May 2009 21:10:47 +0000 (UTC) (envelope-from mohacsi@skye.ki.iif.hu) Received: from skye.ki.iif.hu (skye.ki.iif.hu [IPv6:2001:738:0:402::2]) by mx1.freebsd.org (Postfix) with ESMTP id AC09F8FC16 for ; Wed, 6 May 2009 21:10:46 +0000 (UTC) (envelope-from mohacsi@skye.ki.iif.hu) Received: from skye.ki.iif.hu (localhost.ki.iif.hu [127.0.0.1]) by skye.ki.iif.hu (8.14.3/8.14.3) with ESMTP id n46LAj36080159 for ; Wed, 6 May 2009 23:10:45 +0200 (CEST) (envelope-from mohacsi@skye.ki.iif.hu) Received: (from root@localhost) by skye.ki.iif.hu (8.14.3/8.14.3/Submit) id n46LAj2d080158; Wed, 6 May 2009 23:10:45 +0200 (CEST) (envelope-from mohacsi) Message-Id: <200905062110.n46LAj2d080158@skye.ki.iif.hu> Date: Wed, 6 May 2009 23:10:45 +0200 (CEST) From: Janos Mohacsi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/134306: [MAINTAINER] emulators/yape: update to 0.32.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 May 2009 21:20:02 -0000 >Number: 134306 >Category: ports >Synopsis: [MAINTAINER] emulators/yape: update to 0.32.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 06 21:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Janos Mohacsi >Release: FreeBSD 7.2-STABLE i386 >Organization: NIIF/HUNGARNET >Environment: System: FreeBSD skye.ki.iif.hu 7.2-STABLE FreeBSD 7.2-STABLE #1: Tue May 5 14:54:35 CEST >Description: - Update to 0.32.5 Added file(s): - files/patch-serial.h Removed file(s): - files/patch-main.cpp - files/patch-main.h Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- yape-0.32.5.patch begins here --- diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/Makefile /home/ports/emulators/yape/Makefile --- /home/ports/emulators/yape.orig/Makefile 2008-06-24 11:56:08.000000000 +0200 +++ /home/ports/emulators/yape/Makefile 2009-05-06 22:10:18.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= yape -PORTVERSION= 0.32.4 -PORTREVISION= 3 +PORTVERSION= 0.32.5 CATEGORIES= emulators MASTER_SITES= http://yape.homeserver.hu/download/ DISTNAME= ${PORTNAME}SDL-${PORTVERSION} diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/distinfo /home/ports/emulators/yape/distinfo --- /home/ports/emulators/yape.orig/distinfo 2006-01-23 20:37:37.000000000 +0100 +++ /home/ports/emulators/yape/distinfo 2009-05-06 22:10:21.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (yapeSDL-0.32.4.tar.gz) = b2b7a180d2c7893805f820f80f59ad30 -SHA256 (yapeSDL-0.32.4.tar.gz) = 10238e52ccdf35f17fbc5cfe15c3cc3d45bd2a9de067cf00b4309f41959d8634 -SIZE (yapeSDL-0.32.4.tar.gz) = 127195 +MD5 (yapeSDL-0.32.5.tar.gz) = 2d37d720975dc6a0fd9ec4e7964cafb1 +SHA256 (yapeSDL-0.32.5.tar.gz) = 2944a42ac8beb1735f839e82f57d94e9dbd1a0b33e64891c88d1374e4d953830 +SIZE (yapeSDL-0.32.5.tar.gz) = 135478 diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-Makefile /home/ports/emulators/yape/files/patch-Makefile --- /home/ports/emulators/yape.orig/files/patch-Makefile 2005-10-13 16:44:05.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-Makefile 2009-05-06 23:08:03.000000000 +0200 @@ -1,16 +1,26 @@ -$FreeBSD: ports/emulators/yape/files/patch-Makefile,v 1.1 2005/10/13 14:44:05 mnag Exp $ +$FreeBSD$ ---- Makefile.orig Thu Oct 13 00:09:50 2005 -+++ Makefile Thu Oct 13 00:10:03 2005 -@@ -12,8 +12,8 @@ - - headers = $(objects:.o=.h) +--- Makefile.orig ++++ Makefile +@@ -23,8 +23,8 @@ + hasnoheader = main.h dos.h + sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h -CC = g++ --cflags = -O3 -finline -frerun-loop-opt -Winline `sdl-config --cflags` +-cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags` +CC = $(CXX) -+cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline `sdl-config --cflags` ++cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags` libs = `sdl-config --libs` #SDL_CFLAGS := $(shell sdl-config --cflags) +@@ -72,6 +72,9 @@ + prg.o : prg.cpp prg.h + $(CC) $(cflags) -c $< + ++serial.o : serial.cpp serial.h ++ $(CC) $(cflags) -c $< ++ + sound.o : sound.cpp sound.h + $(CC) $(cflags) -c $< + diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-README.SDL /home/ports/emulators/yape/files/patch-README.SDL --- /home/ports/emulators/yape.orig/files/patch-README.SDL 2005-10-13 16:44:05.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-README.SDL 2009-05-06 22:19:25.000000000 +0200 @@ -1,14 +1,14 @@ -$FreeBSD: ports/emulators/yape/files/patch-README.SDL,v 1.1 2005/10/13 14:44:05 mnag Exp $ +$FreeBSD$ --- README.SDL.orig +++ README.SDL -@@ -78,7 +78,7 @@ +@@ -80,7 +80,7 @@ LALT + W : toggle between unlimited speed and 50 Hz frame rate (original speed) Internal disk LOAD/SAVE operations are supported to the current - file system directory, which is usually '/home//yape'. + file system directory, which is usually '/home//.yape'. - Any PRG files you may wish to load, should go there. + Any PRG files you may wish to load, should go there, although you can browse the directory tree + from the user interface, too. - This means that an exact filename match will load diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-archdep.cpp /home/ports/emulators/yape/files/patch-archdep.cpp --- /home/ports/emulators/yape.orig/files/patch-archdep.cpp 2005-10-25 09:43:17.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-archdep.cpp 2009-05-06 22:23:39.000000000 +0200 @@ -1,9 +1,9 @@ -$FreeBSD: ports/emulators/yape/files/patch-archdep.cpp,v 1.2 2005/10/13 14:44:05 mnag Exp $ +$FreeBSD$ --- archdep.cpp.orig +++ archdep.cpp -@@ -49,7 +49,7 @@ +@@ -75,7 +75,7 @@ int ad_makedirs(char *path) { strcpy(temp,path); @@ -12,30 +12,21 @@ CreateDirectory(temp, NULL); return 1; -@@ -108,7 +108,7 @@ +@@ -296,7 +296,7 @@ + // Possible buffer overflow fixed. + strncpy(temp, path, 512); + if (strlen(temp) > 506) return 0; +- strcat(temp, "/yape"); ++ strcat(temp, "/.yape"); + mkdir(temp, 0777); - strcpy( homedir , getenv( "HOME" )); - //strcpy( filter, filefilter); -- strcat( homedir, "/yape" ); -+ strcat( homedir, "/.yape" ); - chdir ( homedir ); - dirp = opendir( homedir ); - //fprintf( stderr, "reading from %s\n", homedir); -@@ -136,7 +136,7 @@ - int ad_makedirs(char *path) - { - strcpy(temp,path); -- strcat(temp, "/yape"); -+ strcat(temp, "/.yape"); - mkdir(temp, 0777); - - return 1; -@@ -146,7 +146,7 @@ - { - - strcpy( temp, tmpchr); + return 1; +@@ -307,7 +307,7 @@ + // Possible buffer overflow fixed. + strncpy(temp, tmpchr, 512); + if (strlen(temp) > 496) return NULL; - strcat( temp, "/yape/yape.conf"); + strcat( temp, "/.yape/yape.conf"); - return temp; } + diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-main.cpp /home/ports/emulators/yape/files/patch-main.cpp --- /home/ports/emulators/yape.orig/files/patch-main.cpp 2005-10-13 16:44:05.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-main.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ - -$FreeBSD: ports/emulators/yape/files/patch-main.cpp,v 1.1 2005/10/13 14:44:05 mnag Exp $ - ---- main.cpp.orig -+++ main.cpp -@@ -12,6 +12,7 @@ - - #include "main.h" - #include "interface.h" -+#include - - - // SDL stuff -@@ -210,11 +211,11 @@ - Yc = (luma[j+1] - 2.0)* 255.0 / (5.0 - 2.0); // 5V is the base voltage - // RED, GREEN and BLUE component - colorindex = (j)*16*3 + i*3; -- col = (Uint8) max(min((Yc + 1.367 * Vc),255.0),0); -+ col = (Uint8) fmax(fmin((Yc + 1.367 * Vc),255.0),0); - p4col_calc[ colorindex ] = p4col_calc[ 384 + colorindex ] = col; -- col = (Uint8) max(min((Yc - 0.336 * Uc - 0.698 * Vc ),255.0),0); -+ col = (Uint8) fmax(fmin((Yc - 0.336 * Uc - 0.698 * Vc ),255.0),0); - p4col_calc[ colorindex + 1] = p4col_calc[ 384 + colorindex + 1] = col; -- col = (Uint8) max(min((Yc + 1.732 * Uc),255.0),0); -+ col = (Uint8) fmax(fmin((Yc + 1.732 * Uc),255.0),0); - p4col_calc[ colorindex + 2] = p4col_calc[ 384 + colorindex + 2] = col; - } - diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-main.h /home/ports/emulators/yape/files/patch-main.h --- /home/ports/emulators/yape.orig/files/patch-main.h 2005-10-25 09:43:17.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-main.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/emulators/yape/files/patch-main.h,v 1.2 2005/10/13 14:44:05 mnag Exp $ - ---- main.h.orig -+++ main.h -@@ -17,7 +17,7 @@ - #include - #include - #include --#include "SDL/SDL.h" -+#include "SDL.h" - - #include "keyboard.h" - #include "cpu.h" diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-serial.h /home/ports/emulators/yape/files/patch-serial.h --- /home/ports/emulators/yape.orig/files/patch-serial.h 1970-01-01 01:00:00.000000000 +0100 +++ /home/ports/emulators/yape/files/patch-serial.h 2009-05-06 22:58:22.000000000 +0200 @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- serial.h.orig ++++ serial.h +@@ -1,7 +1,7 @@ + #ifndef _SERIAL_H + #define _SERIAL_H + +-#include "SDL/SDL.h" ++#include "SDL.h" + + class CSerial { + diff -ruN --exclude=CVS /home/ports/emulators/yape.orig/files/patch-sound.h /home/ports/emulators/yape/files/patch-sound.h --- /home/ports/emulators/yape.orig/files/patch-sound.h 2005-10-25 09:43:17.000000000 +0200 +++ /home/ports/emulators/yape/files/patch-sound.h 2009-05-06 22:33:52.000000000 +0200 @@ -1,5 +1,5 @@ -$FreeBSD: ports/emulators/yape/files/patch-sound.h,v 1.2 2005/10/13 14:44:05 mnag Exp $ +$FreeBSD$ --- sound.h.orig +++ sound.h @@ -7,8 +7,8 @@ #ifndef _SOUND_H #define _SOUND_H --#include "SDL/SDL.h" -+#include "SDL.h" +-#include ++#include + #include "types.h" - - class MEM; + extern void init_audio(unsigned int sampleFrq = 48000); --- yape-0.32.5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: