diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-06-22 05:30:08 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-06-22 05:30:08 +0000 |
commit | 05dfd792d59143b41a3c3a5568df340ea34380bd (patch) | |
tree | 7794f22f54892e89a5a16a84d8cd385f1207e0a3 /games/gemdropx | |
parent | Update to 1.5.2 (diff) |
Update to 0.9
PR: 39642
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=61723
Diffstat (limited to 'games/gemdropx')
-rw-r--r-- | games/gemdropx/Makefile | 15 | ||||
-rw-r--r-- | games/gemdropx/distinfo | 2 | ||||
-rw-r--r-- | games/gemdropx/files/patch-aa | 28 | ||||
-rw-r--r-- | games/gemdropx/files/patch-ab | 43 |
4 files changed, 22 insertions, 66 deletions
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile index 1c97a80edcf3..33244642f11c 100644 --- a/games/gemdropx/Makefile +++ b/games/gemdropx/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gemdropx -PORTVERSION= 0.7 -PORTREVISION= 1 +PORTVERSION= 0.9 CATEGORIES= games MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/ @@ -24,13 +23,13 @@ MAKE_ENV= JOY=NO \ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin - @${MKDIR} ${PREFIX}/share/gemdropx/images - ${INSTALL_DATA} ${WRKSRC}/data/images/* ${PREFIX}/share/gemdropx/images - @${MKDIR} ${PREFIX}/share/gemdropx/sounds - ${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${PREFIX}/share/gemdropx/sounds + @${MKDIR} ${DATADIR}/images + ${INSTALL_DATA} ${WRKSRC}/data/images/* ${DATADIR}/images + @${MKDIR} ${DATADIR}/sounds + ${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/gemdropx - ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gemdropx + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/games/gemdropx/distinfo b/games/gemdropx/distinfo index 102fc26985d7..8b0bb237fcb9 100644 --- a/games/gemdropx/distinfo +++ b/games/gemdropx/distinfo @@ -1 +1 @@ -MD5 (gemdropx-0.7.tar.gz) = 9364e9da54939f95d3f5bd58119455a3 +MD5 (gemdropx-0.9.tar.gz) = fd0337e89778e2dba74461c555ea8e42 diff --git a/games/gemdropx/files/patch-aa b/games/gemdropx/files/patch-aa index cdadfe785f67..e529411858f9 100644 --- a/games/gemdropx/files/patch-aa +++ b/games/gemdropx/files/patch-aa @@ -1,28 +1,28 @@ - -$FreeBSD$ - ---- Makefile.orig Tue Dec 28 10:33:54 1999 -+++ Makefile Thu Feb 8 18:04:06 2001 -@@ -12,17 +12,17 @@ - # 100% SDL Version: December 27, 1999 +--- Makefile.orig Sat May 18 17:53:29 2002 ++++ Makefile Sat Jun 22 09:56:19 2002 +@@ -14,11 +14,11 @@ + # Added 'install' target (finally!): May 18, 2002 --DATA_PREFIX=data +-DATA_PREFIX=/usr/local/share/gemdropx -SDL_CFLAGS := $(shell sdl-config --cflags) -SDL_LDFLAGS := $(shell sdl-config --libs) +-CC=gcc +-CXX=gcc +DATA_PREFIX=$(PREFIX)/share/gemdropx +SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags) +SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs) ++CC?=gcc ++CXX?=gcc --MIXER=-lmixer -+MIXER=-lSDL_mixer - NOSOUNDFLAG=$(SOUND)SOUND - JOYFLAG=$(JOY)JOYSTICK + MIXER=-lSDL_mixer +@@ -27,7 +27,7 @@ + EMBEDDEDFLAG=NOT_EMBEDDED -CFLAGS=-Wall $(SDL_CFLAGS) \ +CFLAGS+=$(SDL_CFLAGS) \ - -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG) + -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG) \ + -D$(EMBEDDEDFLAG) $(XTRA_FLAGS) SDL_LIB=$(MIXER) $(SDL_LDFLAGS) - diff --git a/games/gemdropx/files/patch-ab b/games/gemdropx/files/patch-ab deleted file mode 100644 index 7f384d2e7cf4..000000000000 --- a/games/gemdropx/files/patch-ab +++ /dev/null @@ -1,43 +0,0 @@ - -$FreeBSD$ - ---- gemdropx.c.orig Tue Dec 28 11:54:17 1999 -+++ gemdropx.c Thu Feb 8 18:04:42 2001 -@@ -26,7 +26,7 @@ - #include <sys/types.h> - #include <sys/time.h> - #include <unistd.h> --#include <SDL/SDL.h> -+#include <SDL.h> - - #ifndef NOJOYSTICK - #include <sys/stat.h> -@@ -36,7 +36,7 @@ - #endif - - #ifndef NOSOUND --#include <mixer.h> -+#include <SDL_mixer.h> - #endif - - #include "data/images/nothing.xbm" -@@ -281,6 +281,7 @@ - SDL_GetError()); - exit(1); - } -+ atexit(SDL_Quit); - - - /* Set the size of the window: */ -@@ -2231,9 +2232,11 @@ - (JS_VERSION & 0x0000FF)); - #endif - -+#ifndef NOSOUND - SDL_VERSION(&sdlver); - printf("SDL version %d.%d.%d\n\n", sdlver.major, - sdlver.minor, sdlver.patch); -+#endif - - exit(0); - } |