From owner-svn-ports-all@FreeBSD.ORG Sun Mar 30 01:16:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66E25BFF; Sun, 30 Mar 2014 01:16:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 529C4FF2; Sun, 30 Mar 2014 01:16:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2U1GpBj085599; Sun, 30 Mar 2014 01:16:51 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2U1GntZ085588; Sun, 30 Mar 2014 01:16:49 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403300116.s2U1GntZ085588@svn.freebsd.org> From: Rusmir Dusko Date: Sun, 30 Mar 2014 01:16:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349602 - in head/games/xkoules: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Mar 2014 01:16:51 -0000 Author: nemysis Date: Sun Mar 30 01:16:48 2014 New Revision: 349602 URL: http://svnweb.freebsd.org/changeset/ports/349602 QAT: https://qat.redports.org/buildarchive/r349602/ Log: - Bump PORTREVISION - Change master sites, add icon - Remove DEPRECATED, EXPIRATION_DATE - Add license (GPLv2) - Support STAGEDIR - Add Desktop entry file - Change DOCS, remove BUGS, Card and TODO - Recreate patches with make makepatch, add patch, fix bad C code - Change pkg-descr, add WWW - Change pkg-plist, remove DOCS Added: head/games/xkoules/files/patch-Iconfig (contents, props changed) head/games/xkoules/files/patch-Imakefile (contents, props changed) head/games/xkoules/files/patch-koules.sndsrv.freebsd.c (contents, props changed) head/games/xkoules/files/patch-xlib__inlstring.h (contents, props changed) head/games/xkoules/files/patch-xlib__shmbitmap.c (contents, props changed) head/games/xkoules/files/patch-xlib__text.c (contents, props changed) Deleted: head/games/xkoules/files/patch-aa head/games/xkoules/files/patch-ab head/games/xkoules/files/patch-ac head/games/xkoules/files/patch-ad head/games/xkoules/files/patch-xlib::inlstring.h Modified: head/games/xkoules/Makefile head/games/xkoules/distinfo head/games/xkoules/pkg-descr head/games/xkoules/pkg-plist Modified: head/games/xkoules/Makefile ============================================================================== --- head/games/xkoules/Makefile Sun Mar 30 00:46:52 2014 (r349601) +++ head/games/xkoules/Makefile Sun Mar 30 01:16:48 2014 (r349602) @@ -3,38 +3,40 @@ PORTNAME= xkoules PORTVERSION= 1.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= games/arcade/koules -DISTNAME= ${PORTNAME:S/^x//}${PORTVERSION} -EXTRACT_SUFX= -src.tar.gz +MASTER_SITES= http://www.ucw.cz/~hubicka/koules/packages/ \ + GENTOO/distfiles \ + SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons +DISTFILES= ${PORTNAME:S/x//}${PORTVERSION}-src${EXTRACT_SUFX} \ + ${PORTNAME:S/x//}.png:icons +EXTRACT_ONLY= ${PORTNAME:S/x//}${PORTVERSION}-src${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Fast action arcade-style game for X Window -DEPRECATED= Unmaintained since 2000 -EXPIRATION_DATE= 2014-04-11 +LICENSE= GPLv2 + +WRKSRC= ${WRKDIR}/${PORTNAME:S/x//}${PORTVERSION} + USES= imake USE_XORG= x11 xext -MAN6= xkoules.6 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes - +PORTDOCS= ANNOUNCE ChangeLog Koules.FAQ README OPTIONS_DEFINE= DOCS -.include +DESKTOP_ENTRIES="XKoules" "" "${PORTNAME}" \ + "${PORTNAME} -M" "Game;ArcadeGame;" "" post-extract: @${CP} ${WRKSRC}/xkoules.6 ${WRKSRC}/xkoules.man post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} -.for file in ANNOUNCE BUGS Card ChangeLog Koules.FAQ TODO - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME:S/x//}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/xkoules/distinfo ============================================================================== --- head/games/xkoules/distinfo Sun Mar 30 00:46:52 2014 (r349601) +++ head/games/xkoules/distinfo Sun Mar 30 01:16:48 2014 (r349602) @@ -1,2 +1,4 @@ SHA256 (koules1.4-src.tar.gz) = c36f93feafeebd59983bf44100240e67a84a8bacabd7ee528c93046defe4a21b SIZE (koules1.4-src.tar.gz) = 315386 +SHA256 (koules.png) = 35c61af80b724f6c0c5e67808813faae6396cce8af74055518c9aa649b967947 +SIZE (koules.png) = 626 Added: head/games/xkoules/files/patch-Iconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-Iconfig Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,15 @@ +--- ./Iconfig.orig 1998-03-04 21:29:05.000000000 +0100 ++++ ./Iconfig 2014-03-30 03:11:00.569385664 +0200 +@@ -34,9 +34,9 @@ + recomended for linux*/ + /*#define I386ASSEMBLY*/ + /* directories*/ +-KOULESDIR =/usr/bin/X11 +-SOUNDDIR =/usr/local/lib/koules +-MANDIR =/usr/local/man/man6 ++KOULESDIR =${DESTDIR}$(PREFIX)/libexec ++SOUNDDIR =${DESTDIR}$(PREFIX)/share/xkoules ++MANSUFFIX =6 + + /*You need some extra libraryes for BSD sockets compatibility?*/ + /* TOP_INCLUDES = /* Sun users with GCC need this */ Added: head/games/xkoules/files/patch-Imakefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-Imakefile Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,93 @@ +--- ./Imakefile.orig 1998-03-04 19:59:19.000000000 +0100 ++++ ./Imakefile 2014-03-30 03:11:00.569385664 +0200 +@@ -56,7 +56,7 @@ + + DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\ + $(NAMEDEF) $(ASMDEF)\ +- -DSOUNDSERVER=\"$(SOUNDDIR)/$(SOUNDSERVER)\" \ ++ -DSOUNDSERVER=\"$(KOULESDIR)/$(SOUNDSERVER)\" \ + -DSOUNDDIR=\"$(SOUNDDIR)\" \ + -DSOUNDDEV=\"$(SOUNDDEV)\" + #endif +@@ -84,9 +84,6 @@ + all::xkoules + #endif + +-BINDIR = $(KOULESDIR) +-DESTDIR = / +- + ComplexProgramTarget(xkoules) + + +@@ -97,19 +94,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ +@@ -125,19 +118,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ +@@ -155,19 +144,15 @@ + install:: $(PROGRAMS) $(SOUNDSERVER) + @echo "Koules directory is " $(KOULESDIR) + @: +- @echo "Instalin man page to " $(MANDIR) +- @mkdirhier $(MANDIR) +- $(INSTALL) -c $(INSTBINFLAGS) xkoules.6 $(MANDIR); +- @: + @echo "Creating directory " $(KOULESDIR) +- @if [ ! -d $(KOULESDIR) ]; then mkdirhier $(KOULESDIR); fi ++ @if [ ! -d $(KOULESDIR) ]; then $(MKDIRHIER) $(KOULESDIR); fi + @: + @if [ "$(INSTALLSOUND)" = "True" ]; \ + then \ + echo "Creating directory " $(SOUNDDIR); \ +- if [ ! -d $(SOUNDDIR) ]; then mkdirhier $(SOUNDDIR); fi; \ +- echo "Copying sound server to directory " $(SOUNDDIR); \ +- $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(SOUNDDIR); \ ++ if [ ! -d $(SOUNDDIR) ]; then $(MKDIRHIER) $(SOUNDDIR); fi; \ ++ echo "Copying sound server to directory " $(KOULESDIR); \ ++ $(INSTALL) -c -s $(INSTBINFLAGS) $(SOUNDSERVER) $(KOULESDIR); \ + echo "Copying sound files into directory " $(SOUNDDIR); \ + cd ./sounds; set -x; \ + for file in *.raw; do \ Added: head/games/xkoules/files/patch-koules.sndsrv.freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-koules.sndsrv.freebsd.c Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,11 @@ +--- ./koules.sndsrv.freebsd.c.orig 1998-03-04 19:59:19.000000000 +0100 ++++ ./koules.sndsrv.freebsd.c 2014-03-30 03:11:00.579428909 +0200 +@@ -14,7 +14,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include Added: head/games/xkoules/files/patch-xlib__inlstring.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-xlib__inlstring.h Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,63 @@ +--- ./xlib/inlstring.h.orig 1998-03-04 19:59:19.000000000 +0100 ++++ ./xlib/inlstring.h 2014-03-30 03:11:00.579428909 +0200 +@@ -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) Added: head/games/xkoules/files/patch-xlib__shmbitmap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-xlib__shmbitmap.c Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,47 @@ +--- ./xlib/shmbitmap.c.orig 1998-03-04 19:59:19.000000000 +0100 ++++ ./xlib/shmbitmap.c 2014-03-30 03:11:00.579428909 +0200 +@@ -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); Added: head/games/xkoules/files/patch-xlib__text.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-xlib__text.c Sun Mar 30 01:16:48 2014 (r349602) @@ -0,0 +1,10 @@ +--- ./xlib/text.c.orig 1998-03-04 19:59:19.000000000 +0100 ++++ ./xlib/text.c 2014-03-30 03:12:11.082033640 +0200 +@@ -4,6 +4,7 @@ + + #ifdef MITSHM + #include ++#include + #include "inlstring.h" /* include inline string operations */ + #include "interface.h" + Modified: head/games/xkoules/pkg-descr ============================================================================== --- head/games/xkoules/pkg-descr Sun Mar 30 00:46:52 2014 (r349601) +++ head/games/xkoules/pkg-descr Sun Mar 30 01:16:48 2014 (r349602) @@ -1,6 +1,8 @@ - Koules is a fast action arcade-style game for X. This version -works in fine (up to 900x620) resolution with cool 256 color -graphics, multiplayer mode up to 5 players, full sound and, of -course, network support. Koules is an original idea. First -version of Koules was developed from scratch by Jan Hubicka in +Koules is a fast action arcade-style game for X. This version +works in fine (up to 900x620) resolution with cool 256 color +graphics, multiplayer mode up to 5 players, full sound and, of +course, network support. Koules is an original idea. First +version of Koules was developed from scratch by Jan Hubicka in July 1995. + +WWW: http://www.ucw.cz/~hubicka/koules/English/koules.html Modified: head/games/xkoules/pkg-plist ============================================================================== --- head/games/xkoules/pkg-plist Sun Mar 30 00:46:52 2014 (r349601) +++ head/games/xkoules/pkg-plist Sun Mar 30 01:16:48 2014 (r349602) @@ -1,11 +1,7 @@ bin/xkoules -%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE -%%PORTDOCS%%%%DOCSDIR%%/BUGS -%%PORTDOCS%%%%DOCSDIR%%/Card -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/Koules.FAQ -%%PORTDOCS%%%%DOCSDIR%%/TODO libexec/koules.sndsrv.freebsd +man/man6/xkoules.6.gz +share/pixmaps/xkoules.png %%DATADIR%%/colize.raw %%DATADIR%%/creator1.raw %%DATADIR%%/creator2.raw @@ -14,4 +10,3 @@ libexec/koules.sndsrv.freebsd %%DATADIR%%/end.raw %%DATADIR%%/start.raw @dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%