Date: Wed, 29 Nov 2006 03:02:48 GMT From: Jeremy Karlson<karlj000@unbc.ca> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/105987: Update Port: emulators/adamem Message-ID: <200611290302.kAT32mrC070764@www.freebsd.org> Resent-Message-ID: <200611290730.kAT7UDXq094084@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105987 >Category: ports >Synopsis: Update Port: emulators/adamem >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 29 07:30:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jeremy Karlson >Release: FreeBSD 5 STABLE >Organization: >Environment: >Description: This PR is in response to an email I received stating the port won't build when X moves to /usr/local. >How-To-Repeat: >Fix: Replace the existing port with the contents of this shell archive. This patch SHOULD correct the problem, but I don't have a machine where X is installed in /usr/local to confirm this 100%. Please test this first, if at all within your ability. Thanks. Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # adamem # adamem/Makefile # adamem/distinfo # adamem/pkg-descr # adamem/pkg-plist # adamem/files # adamem/files/patch-Coleco.c # adamem/files/patch-DSP.c # adamem/files/patch-X.c # adamem/files/patch-Makefile.X # echo c - adamem mkdir -p adamem > /dev/null 2>&1 echo x - adamem/Makefile sed 's/^X//' >adamem/Makefile << 'END-of-adamem/Makefile' X# New ports collection makefile for: adamem X# Date created: November 11, 2001 X# Whom: Jeremy Karlson X# X# $FreeBSD: ports/emulators/adamem/Makefile,v 1.6 2004/09/23 07:16:23 danfe Exp $ X# X XPORTNAME= adamem XPORTVERSION= 1.0 XCATEGORIES= emulators XMASTER_SITES= http://www.komkon.org/~dekogel/files/coleco/ XDISTNAME= ${PORTNAME} X XMAINTAINER= karlj000@unbc.ca XCOMMENT= ADAMEm is a portable Coleco ADAM and ColecoVision emulator X XNO_WRKSUBDIR= yes XUSE_XLIB= yes XUSE_X_PREFIX= yes XALL_TARGET= x X XPROGDIR= ${PREFIX}/${PORTNAME} X Xdo-install: X ${MKDIR} ${PROGDIR} X ${INSTALL_PROGRAM} ${WRKSRC}/adamem ${PROGDIR} X ${LN} -s adamem ${PROGDIR}/cvem X ${INSTALL_DATA} ${WRKSRC}/adamem.snd ${PROGDIR} X ${INSTALL_DATA} ${WRKSRC}/OS7.rom ${PROGDIR} X ${INSTALL_DATA} ${WRKSRC}/WP.rom ${PROGDIR} X ${INSTALL_DATA} ${WRKSRC}/EOS.rom ${PROGDIR} X.ifndef(NOPORTDOCS) X @${MKDIR} ${DOCSDIR} X ${INSTALL_DATA} ${WRKSRC}/adamem.txt ${DOCSDIR} X.endif X X.include <bsd.port.mk> END-of-adamem/Makefile echo x - adamem/distinfo sed 's/^X//' >adamem/distinfo << 'END-of-adamem/distinfo' XMD5 (adamem.tar.gz) = a6b2b0276cc353d5e236a7ca247dfc07 XSHA256 (adamem.tar.gz) = 81e5e77f08978b6df559cc8eb4e09ffddcb6bdba6bf85e33d1afd75ef08a0d86 XSIZE (adamem.tar.gz) = 559250 END-of-adamem/distinfo echo x - adamem/pkg-descr sed 's/^X//' >adamem/pkg-descr << 'END-of-adamem/pkg-descr' XADAMEm is a portable Coleco ADAM and ColecoVision emulator. X XWWW: http://www.komkon.org/~dekogel/adamem.html END-of-adamem/pkg-descr echo x - adamem/pkg-plist sed 's/^X//' >adamem/pkg-plist << 'END-of-adamem/pkg-plist' Xadamem/adamem Xadamem/cvem Xadamem/adamem.snd Xadamem/OS7.rom Xadamem/WP.rom Xadamem/EOS.rom X@dirrm adamem X%%PORTDOCS%%share/doc/adamem/adamem.txt X%%PORTDOCS%%@dirrm share/doc/adamem END-of-adamem/pkg-plist echo c - adamem/files mkdir -p adamem/files > /dev/null 2>&1 echo x - adamem/files/patch-Coleco.c sed 's/^X//' >adamem/files/patch-Coleco.c << 'END-of-adamem/files/patch-Coleco.c' X--- Coleco.c.orig Wed Sep 22 13:28:07 2004 X+++ Coleco.c Wed Sep 22 13:32:20 2004 X@@ -616,7 +616,7 @@ X OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0,OutE0 X }; X X-void Z80_Out (unsigned Port,byte Val) X+FASTCALL void Z80_Out (unsigned Port,byte Val) X { X OutPortFn fn; X Port&=0xff; X@@ -763,7 +763,7 @@ X InpE0,InpE0,InpE2,InpE2,InpE0,InpE0,InpE2,InpE2 X }; X X-byte Z80_In (unsigned Port) X+FASTCALL byte Z80_In (unsigned Port) X { X InPortFn fn; X Port&=0xff; END-of-adamem/files/patch-Coleco.c echo x - adamem/files/patch-DSP.c sed 's/^X//' >adamem/files/patch-DSP.c << 'END-of-adamem/files/patch-DSP.c' X--- DSP.c.orig Mon Oct 7 20:23:32 2002 X+++ DSP.c Mon Oct 7 20:24:02 2002 X@@ -15,7 +15,7 @@ X X #include <stdio.h> X #include <string.h> X-#include <values.h> X+#include <limits.h> X X static int initialised=0; X static int stereo=0; X@@ -103,7 +103,7 @@ X if (freq>MAXFREQ) X freq=MAXFREQ; X X- if (freq>(MAXINT/441)) freq=MAXINT/441; /* avoid overflows */ X+ if (freq>(INT_MAX/441)) freq=INT_MAX/441; /* avoid overflows */ X if (channel==3) X { X for (i=0;i<5;++i) END-of-adamem/files/patch-DSP.c echo x - adamem/files/patch-X.c sed 's/^X//' >adamem/files/patch-X.c << 'END-of-adamem/files/patch-X.c' X--- X.c.orig Wed Sep 22 13:33:07 2004 X+++ X.c Wed Sep 22 13:33:49 2004 X@@ -1370,41 +1370,41 @@ X return 2; X } X X-static void PutPixel32_0 (int offset,int c) X+FASTCALL static void PutPixel32_0 (int offset,int c) X { X *(unsigned*)(DisplayBuf+offset*4)=c; X } X X-static void PutPixel16_0 (int offset,int c) X+FASTCALL static void PutPixel16_0 (int offset,int c) X { X *(unsigned short*)(DisplayBuf+offset*2)=c; X } X X-static void PutPixel8_0 (int offset,int c) X+FASTCALL static void PutPixel8_0 (int offset,int c) X { X DisplayBuf[offset]=c; X } X X-static void PutPixel32_1 (int offset,int c) X+FASTCALL static void PutPixel32_1 (int offset,int c) X { X *(unsigned*)(DisplayBuf+offset*4*2)= X *(unsigned*)(DisplayBuf+offset*4*2+1)= X c; X } X X-static void PutPixel16_1 (int offset,int c) X+FASTCALL static void PutPixel16_1 (int offset,int c) X { X *(unsigned short*)(DisplayBuf+offset*2*2)= X *(unsigned short*)(DisplayBuf+offset*2*2+1)= X c; X } X X-static void PutPixel8_1 (int offset,int c) X+FASTCALL static void PutPixel8_1 (int offset,int c) X { X DisplayBuf[offset*2]=DisplayBuf[offset*2+1]=c; X } X X-static void PutPixel32_2 (int offset,int c) X+FASTCALL static void PutPixel32_2 (int offset,int c) X { X offset=(offset&0x00FF)+((offset&0xFF00)<<1); X *(unsigned*)(DisplayBuf+offset*4*2)= X@@ -1412,7 +1412,7 @@ X c; X } X X-static void PutPixel16_2 (int offset,int c) X+FASTCALL static void PutPixel16_2 (int offset,int c) X { X offset=(offset&0x00FF)+((offset&0xFF00)<<1); X *(unsigned short*)(DisplayBuf+offset*2*2)= X@@ -1420,7 +1420,7 @@ X c; X } X X-static void PutPixel8_2 (int offset,int c) X+FASTCALL static void PutPixel8_2 (int offset,int c) X { X offset=(offset&0x00FF)+((offset&0xFF00)<<1); X DisplayBuf[offset*2]=DisplayBuf[offset*2+1]=c; END-of-adamem/files/patch-X.c echo x - adamem/files/patch-Makefile.X sed 's/^X//' >adamem/files/patch-Makefile.X << 'END-of-adamem/files/patch-Makefile.X' X--- Makefile.X.orig Mon Nov 27 23:36:18 2006 X+++ Makefile.X Mon Nov 27 23:37:51 2006 X@@ -15,7 +15,8 @@ X LD = gcc # Linker used X X CFLAGS = -Wall -O2 -fomit-frame-pointer \ X- -DLSB_FIRST -DUNIX_X -DUNIX -DMITSHM -DHAVE_CLOCK -DSOUND -DZLIB X+ -DLSB_FIRST -DUNIX_X -DUNIX -DMITSHM -DHAVE_CLOCK -DSOUND -DZLIB \ X+ -I${PREFIX}/include X X OBJECTS = ADAMEm.o Coleco.o Z80.o \ X DSP.o Sound.o X.o Z80Debug.o Bitmap.o Unix.o X@@ -26,7 +27,7 @@ X rm -f *.o *~ X X adamem: $(OBJECTS) X- $(LD) -s -Wl,-Map,adamem.map -L/usr/X11R6/lib \ X+ $(LD) -s -Wl,-Map,adamem.map -L${PREFIX}/lib \ X -o adamem $(OBJECTS) -lXext -lX11 -lz X X cvem: adamem X@@ -42,7 +43,7 @@ X $(LD) -s -o keys keys.o X X adamem.snd: makedata X- makedata X+ ./makedata X X makedata.o: makedata.c X makedata: makedata.o END-of-adamem/files/patch-Makefile.X exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611290302.kAT32mrC070764>