ports/58521: Update port: games/xkoules
KATO Tsuguru
tkato at prontomail.com
Sat Oct 25 14:10:28 UTC 2003
>Number: 58521
>Category: ports
>Synopsis: Update port: games/xkoules
>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: Sat Oct 25 07:10:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-xlib::inlstring.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xkoules/Makefile games/xkoules/Makefile
--- /usr/ports/games/xkoules/Makefile Sat Oct 25 22:12:15 2003
+++ games/xkoules/Makefile Sat Oct 25 22:24:30 2003
@@ -7,6 +7,7 @@
PORTNAME= xkoules
PORTVERSION= 1.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade/koules
@@ -16,18 +17,6 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Fast action arcade-style game for X Window
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN= "Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-PLIST_SUB= SNDSRV:=""
-.else
-PLIST_SUB= SNDSRV:="@comment "
-.endif
-
USE_IMAKE= yes
MAN6= xkoules.6
@@ -42,4 +31,4 @@
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/xkoules/files/patch-aa games/xkoules/files/patch-aa
--- /usr/ports/games/xkoules/files/patch-aa Sat Oct 21 22:01:43 2000
+++ games/xkoules/files/patch-aa Sat Oct 25 20:44:36 2003
@@ -18,7 +18,7 @@
#if defined(FreeBSDArchitecture)
SYSDEFS =
-#if !defined(NAS_SOUND)&&!defined(RSOUND)
-+#if !defined(NAS_SOUND)&&!defined(RSOUND)&&defined(i386Architecture)
++#if !defined(NAS_SOUND)&&!defined(RSOUND)
#define SOUND
SOUNDSERVER = koules.sndsrv.freebsd
SOUNDOBJS = sound.o
diff -urN /usr/ports/games/xkoules/files/patch-xlib::inlstring.h games/xkoules/files/patch-xlib::inlstring.h
--- /usr/ports/games/xkoules/files/patch-xlib::inlstring.h Thu Jan 1 09:00:00 1970
+++ games/xkoules/files/patch-xlib::inlstring.h Sat Oct 25 20:53:12 2003
@@ -0,0 +1,63 @@
+--- xlib/inlstring.h.orig Thu Mar 5 03:59:19 1998
++++ xlib/inlstring.h Sat Oct 25 20:52:47 2003
+@@ -238,12 +238,12 @@
+ static INLINE void *
+ __memcpy_aligndest (void *dest, const void *src, int n)
+ {
+- __asm__ __volatile__ ("
+- cmpl $3, %%ecx
+- ja 1f
+- call * __memcpy_jumptable (, %%ecx, 4)
+- jmp 2f
+- 1:call __memcpyasm_regargs
++ __asm__ __volatile__ ("\
++ cmpl $3, %%ecx \
++ ja 1f \
++ call * __memcpy_jumptable (, %%ecx, 4) \
++ jmp 2f \
++ 1:call __memcpyasm_regargs \
+ "
+ :
+ :"b" (dest), "d" (src), "c" (n)
+@@ -255,13 +255,13 @@
+ static INLINE void *
+ __memcpy_destaligned (void *dest, const void *src, int n)
+ {
+- __asm__ __volatile__ ("
+- cmpl $32, %%ecx
+- ja 1f
+- call * __memcpy_jumptable (, %%ecx, 4)
+- jmp 2f
+- 1:call __memcpyasm_regargs_aligned
+- 2:
++ __asm__ __volatile__ ("\
++ cmpl $32, %%ecx \
++ ja 1f \
++ call * __memcpy_jumptable (, %%ecx, 4) \
++ jmp 2f \
++ 1:call __memcpyasm_regargs_aligned \
++ 2: \
+ "
+ :
+ :"b" (dest), "d" (src), "c" (n)
+@@ -273,13 +273,13 @@
+ static INLINE void *
+ __memcpy_balanced (void *dest, const void *src, int n)
+ {
+- __asm__ __volatile__ ("
+- cmpl $19, %%ecx
+- ja 1f
+- call * __memcpy_jumptable (, %%ecx, 4)
+- jmp 2f
+- 1:call __memcpyasm_regargs
+- 2:
++ __asm__ __volatile__ ("\
++ cmpl $19, %%ecx \
++ ja 1f \
++ call * __memcpy_jumptable (, %%ecx, 4) \
++ jmp 2f \
++ 1:call __memcpyasm_regargs \
++ 2: \
+ "
+ :
+ :"b" ((long) dest), "d" ((long) src), "c" ((long) n)
diff -urN /usr/ports/games/xkoules/pkg-plist games/xkoules/pkg-plist
--- /usr/ports/games/xkoules/pkg-plist Mon Dec 24 11:15:19 2001
+++ games/xkoules/pkg-plist Sat Oct 25 20:54:22 2003
@@ -1,17 +1,17 @@
bin/xkoules
-%%PORTDOCS%%share/doc/xkoules/ANNOUNCE
-%%PORTDOCS%%share/doc/xkoules/BUGS
-%%PORTDOCS%%share/doc/xkoules/Card
-%%PORTDOCS%%share/doc/xkoules/ChangeLog
-%%PORTDOCS%%share/doc/xkoules/Koules.FAQ
-%%PORTDOCS%%share/doc/xkoules/TODO
-%%SNDSRV:%%libexec/koules.sndsrv.freebsd
-%%SNDSRV:%%share/xkoules/colize.raw
-%%SNDSRV:%%share/xkoules/creator1.raw
-%%SNDSRV:%%share/xkoules/creator2.raw
-%%SNDSRV:%%share/xkoules/destroy1.raw
-%%SNDSRV:%%share/xkoules/destroy2.raw
-%%SNDSRV:%%share/xkoules/end.raw
-%%SNDSRV:%%share/xkoules/start.raw
-%%SNDSRV:%%@dirrm share/xkoules
-%%PORTDOCS%%@dirrm share/doc/xkoules
+%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/Card
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/Koules.FAQ
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+libexec/koules.sndsrv.freebsd
+%%DATADIR%%/colize.raw
+%%DATADIR%%/creator1.raw
+%%DATADIR%%/creator2.raw
+%%DATADIR%%/destroy1.raw
+%%DATADIR%%/destroy2.raw
+%%DATADIR%%/end.raw
+%%DATADIR%%/start.raw
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list