From b30128675909b8e1d06b9d2255415b0b3c17e184 Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Sat, 25 Oct 2003 15:13:35 +0000 Subject: - Fix build on -current - Use DOCSDIR PR: 58521 Submitted by: Ports Fury --- games/xkoules/Makefile | 15 +------ games/xkoules/files/patch-aa | 2 +- games/xkoules/files/patch-xlib::inlstring.h | 63 +++++++++++++++++++++++++++++ games/xkoules/pkg-plist | 32 +++++++-------- 4 files changed, 82 insertions(+), 30 deletions(-) create mode 100644 games/xkoules/files/patch-xlib::inlstring.h (limited to 'games') diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile index c3e8fb1a2715..37a3f56ecef3 100644 --- a/games/xkoules/Makefile +++ b/games/xkoules/Makefile @@ -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 @@ EXTRACT_SUFX= -src.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Fast action arcade-style game for X Window -.include - -.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 @@ post-install: .endfor .endif -.include +.include diff --git a/games/xkoules/files/patch-aa b/games/xkoules/files/patch-aa index e92cc2d12ec7..f5f665976b6e 100644 --- a/games/xkoules/files/patch-aa +++ b/games/xkoules/files/patch-aa @@ -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 --git a/games/xkoules/files/patch-xlib::inlstring.h b/games/xkoules/files/patch-xlib::inlstring.h new file mode 100644 index 000000000000..db7c7a597652 --- /dev/null +++ b/games/xkoules/files/patch-xlib::inlstring.h @@ -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 --git a/games/xkoules/pkg-plist b/games/xkoules/pkg-plist index 4522689c73a6..fbb220c46bf9 100644 --- a/games/xkoules/pkg-plist +++ b/games/xkoules/pkg-plist @@ -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 +@dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.2.3