Date: Mon, 12 Jun 2000 12:08:19 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19222: Update port: games/xkoules Message-ID: <20000612190819.5A76937B6BF@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19222
>Category: ports
>Synopsis: Update port: games/xkoules
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 12 12:10:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix new compiler error
- Exclude GPL doc from package
New file:
patches/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xkoules/Makefile games/xkoules/Makefile
--- /usr/ports/games/xkoules/Makefile Sat Apr 15 00:24:23 2000
+++ games/xkoules/Makefile Tue Jun 13 03:24:29 2000
@@ -24,19 +24,17 @@
MANCOMPRESSED= no
do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/xkoules ${PREFIX}/bin
- @ ${MKDIR} ${PREFIX}/share/xkoules
+ ${INSTALL_PROGRAM} ${WRKSRC}/xkoules ${PREFIX}/bin
+ @${MKDIR} ${PREFIX}/share/xkoules
.if ${MACHINE_ARCH} == "i386"
- @ ${INSTALL_PROGRAM} ${WRKSRC}/koules.sndsrv.freebsd ${PREFIX}/share/xkoules
+ ${INSTALL_PROGRAM} ${WRKSRC}/koules.sndsrv.freebsd ${PREFIX}/share/xkoules
.endif
- @ ${INSTALL_DATA} ${WRKSRC}/sounds/*.raw ${PREFIX}/share/xkoules
- @ ${INSTALL_MAN} ${WRKSRC}/xkoules.6 ${PREFIX}/man/man6
-
-post-install:
+ ${INSTALL_DATA} ${WRKSRC}/sounds/*.raw ${PREFIX}/share/xkoules
+ ${INSTALL_MAN} ${WRKSRC}/xkoules.6 ${PREFIX}/man/man6
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${PREFIX}/share/doc/xkoules
-.for file in ANNOUNCE BUGS COPYING Card ChangeLog Koules.FAQ TODO
- @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xkoules
+ @${MKDIR} ${PREFIX}/share/doc/xkoules
+.for file in ANNOUNCE BUGS Card ChangeLog Koules.FAQ TODO
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xkoules
.endfor
.endif
diff -urN /usr/ports/games/xkoules/patches/patch-ab games/xkoules/patches/patch-ab
--- /usr/ports/games/xkoules/patches/patch-ab Thu Jan 1 09:00:00 1970
+++ games/xkoules/patches/patch-ab Tue Jun 13 03:45:38 2000
@@ -0,0 +1,47 @@
+--- xlib/shmbitmap.c.orig Thu Mar 5 03:59:19 1998
++++ xlib/shmbitmap.c Tue Jun 13 03:45:28 2000
+@@ -237,7 +237,7 @@
+ #define __clipy1 0
+ #undef __clipy2
+ #define __clipy2 (MAPHEIGHT+19)
+-#ifdef __i386__
++#if defined(__i386__)&&defined(ASSEMBLY)
+ static INLINE int
+ muldiv64 (int CONST m1, int CONST m2, int CONST d)
+ {
+@@ -333,7 +333,7 @@
+ }
+ if (r1 & 1)
+ { /* left */
+-#ifdef __i386__
++#if defined(__i386__)&&defined(ASSEMBLY)
+ y1 += muldiv64 (__clipx1 - x1, y2 - y1, x2 - x1);
+ #else
+ y1 += (long) (__clipx1 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
+@@ -342,7 +342,7 @@
+ }
+ else if (r1 & 2)
+ { /* right */
+-#ifdef __i386__
++#if defined(__i386__)&&defined(ASSEMBLY)
+ y1 += muldiv64 (__clipx2 - x1, y2 - y1, x2 - x1);
+ #else
+ y1 += (long) (__clipx2 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
+@@ -351,7 +351,7 @@
+ }
+ else if (r1 & 4)
+ { /* top */
+-#ifdef __i386__
++#if defined(__i386__)&&defined(ASSEMBLY)
+ x1 += muldiv64 (__clipy1 - y1, x2 - x1, y2 - y1);
+ #else
+ x1 += (long) (__clipy1 - y1) * (long) (x2 - x1) / (long) (y2 - y1);
+@@ -360,7 +360,7 @@
+ }
+ else if (r1 & 8)
+ { /* bottom */
+-#ifdef __i386__
++#if defined(__i386__)&&defined(ASSEMBLY)
+ x1 += muldiv64 (__clipy2 - y1, x2 - x1, y2 - y1);
+ #else
+ x1 += (long) (__clipy2 - y1) * (long) (x2 - x1) / (long) (y2 - y1);
diff -urN /usr/ports/games/xkoules/pkg/PLIST games/xkoules/pkg/PLIST
--- /usr/ports/games/xkoules/pkg/PLIST Thu Aug 13 11:23:13 1998
+++ games/xkoules/pkg/PLIST Tue Jun 13 03:24:42 2000
@@ -1,7 +1,6 @@
bin/xkoules
share/doc/xkoules/ANNOUNCE
share/doc/xkoules/BUGS
-share/doc/xkoules/COPYING
share/doc/xkoules/Card
share/doc/xkoules/ChangeLog
share/doc/xkoules/Koules.FAQ
diff -urN /usr/ports/games/xkoules/pkg/PLIST.alpha games/xkoules/pkg/PLIST.alpha
--- /usr/ports/games/xkoules/pkg/PLIST.alpha Wed Jun 23 03:07:48 1999
+++ games/xkoules/pkg/PLIST.alpha Tue Jun 13 03:25:01 2000
@@ -1,7 +1,6 @@
bin/xkoules
share/doc/xkoules/ANNOUNCE
share/doc/xkoules/BUGS
-share/doc/xkoules/COPYING
share/doc/xkoules/Card
share/doc/xkoules/ChangeLog
share/doc/xkoules/Koules.FAQ
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000612190819.5A76937B6BF>