Date: Sun, 21 Dec 2003 23:00:14 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60463: Update port: games/glasteroids Message-ID: <20031221230014.3f652570.tkato@prontomail.com> Resent-Message-ID: <200312211410.hBLEADvf064527@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60463 >Category: ports >Synopsis: Update port: games/glasteroids >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: Sun Dec 21 06:10:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE-p1 i386 >Organization: >Environment: >Description: - Fix build on architecture other than i386/alpha >How-To-Repeat: >Fix: diff -urN /usr/ports/games/glasteroids/Makefile games/glasteroids/Makefile --- /usr/ports/games/glasteroids/Makefile Fri Nov 7 11:00:06 2003 +++ games/glasteroids/Makefile Sat Dec 20 18:55:30 2003 @@ -7,7 +7,7 @@ PORTNAME= glasteroids PORTVERSION= 1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.honors.montana.edu/~jjc/Glasteroids/ DISTNAME= Glasteriods @@ -15,32 +15,28 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D Asteroids game for X Window System -MAKEFILE= Makefile.FreeBSD +LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut WRKSRC= ${WRKDIR}/Glasteroids USE_X_PREFIX= yes -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" -USE_MESA= yes - -pre-build: - @ ${CP} ${FILESDIR}/Makefile.FreeBSD ${WRKSRC} +USE_GL= yes +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKEFILE= ${FILESDIR}/Makefile.FreeBSD do-install: - @ ${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/Glasteroids ${PREFIX}/bin/glasteroids - @ ${MKDIR} ${PREFIX}/share/glasteroids - @ ${INSTALL_DATA} ${WRKSRC}/gameText.txf ${PREFIX}/share/glasteroids - @ cd ${WRKSRC}; tar -cf - scores.txt textures | \ - ( cd ${PREFIX}/share/glasteroids; tar -xf - ) - @ ${CHMOD} a+rx ${PREFIX}/share/glasteroids/textures - @ ${CHMOD} g+rw,a-x ${PREFIX}/share/glasteroids/scores.txt - @ ${CHOWN} root:games ${PREFIX}/share/glasteroids/scores.txt - -post-install: + ${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/Glasteroids ${PREFIX}/bin/glasteroids + @${MKDIR} ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/gameText.txf ${DATADIR} + ${TAR} -C ${WRKSRC} -cf - scores.txt textures | \ + ${TAR} -C ${DATADIR} --unlink -xf - + @${CHMOD} a+rx ${DATADIR}/textures + @${CHMOD} g+rw,a-x ${DATADIR}/scores.txt + @${CHOWN} root:games ${DATADIR}/scores.txt .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/glasteroids - @ ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/glasteroids - @ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glasteroids + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff -urN /usr/ports/games/glasteroids/files/Makefile.FreeBSD games/glasteroids/files/Makefile.FreeBSD --- /usr/ports/games/glasteroids/files/Makefile.FreeBSD Fri Nov 7 11:00:06 2003 +++ games/glasteroids/files/Makefile.FreeBSD Sat Dec 20 21:14:33 2003 @@ -10,10 +10,11 @@ LIBS = -lglut -lGLU -lGL -lXmu -lX11 -lXext -lm -lXi ${PTHREAD_LIBS} -INCDIR = -I/usr/X11R6/include -LIBDIR = -L/usr/X11R6/lib +INCDIR = -I${X11BASE}/include +LIBDIR = -L${X11BASE}/lib PREFIX ?= /usr/X11R6 +X11BASE ?= /usr/X11R6 .SUFFIXES: .cxx .o diff -urN /usr/ports/games/glasteroids/files/patch-ac games/glasteroids/files/patch-ac --- /usr/ports/games/glasteroids/files/patch-ac Tue Aug 8 11:57:48 2000 +++ games/glasteroids/files/patch-ac Sat Dec 20 21:07:59 2003 @@ -3,7 +3,7 @@ @@ -1,5 +1,8 @@ #include <stdlib.h> #include <time.h> -+#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) && (defined(__i386__) || defined(__amd64__)) +#include <floatingpoint.h> +#endif #include "Bobcat.h" @@ -13,7 +13,7 @@ { BCworld *world; -+#if defined(__FreeBSD__) && !defined(__alpha__) ++#if defined(__FreeBSD__) && (defined(__i386__) || defined(__amd64__)) + fpsetmask(0); +#endif world = BCgetWorld ( ); diff -urN /usr/ports/games/glasteroids/pkg-plist games/glasteroids/pkg-plist --- /usr/ports/games/glasteroids/pkg-plist Fri Jun 15 21:55:18 2001 +++ games/glasteroids/pkg-plist Sat Dec 20 18:53:19 2003 @@ -1,12 +1,11 @@ bin/glasteroids -%%PORTDOCS%%share/doc/glasteroids/COPYING -%%PORTDOCS%%share/doc/glasteroids/README -share/glasteroids/gameText.txf +%%PORTDOCS%%%%DOCSDIR%%/README +%%DATADIR%%/gameText.txf @mode 666 -share/glasteroids/scores.txt +%%DATADIR%%/scores.txt @mode -share/glasteroids/textures/splash.raw -share/glasteroids/textures/splash_non.raw -@dirrm share/doc/glasteroids -@dirrm share/glasteroids/textures -@dirrm share/glasteroids +%%DATADIR%%/textures/splash.raw +%%DATADIR%%/textures/splash_non.raw +@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/textures +@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031221230014.3f652570.tkato>