From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 3 01:10:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE28C106566C for ; Mon, 3 Sep 2012 01:10:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C692A8FC12 for ; Mon, 3 Sep 2012 01:10:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q831A9BF087010 for ; Mon, 3 Sep 2012 01:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q831A9Ym086997; Mon, 3 Sep 2012 01:10:09 GMT (envelope-from gnats) Resent-Date: Mon, 3 Sep 2012 01:10:09 GMT Resent-Message-Id: <201209030110.q831A9Ym086997@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4DFBF1065677 for ; Mon, 3 Sep 2012 01:00:31 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22]) by mx1.freebsd.org (Postfix) with SMTP id 252C08FC08 for ; Mon, 3 Sep 2012 01:00:21 +0000 (UTC) Received: (qmail invoked by alias); 03 Sep 2012 01:00:19 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp034) with SMTP; 03 Sep 2012 03:00:19 +0200 Received: by something.email.com (sSMTP sendmail emulation); Mon, 03 Sep 2012 03:00:19 +0200 Message-Id: <20120903010031.4DFBF1065677@hub.freebsd.org> Date: Mon, 03 Sep 2012 03:00:19 +0200 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jgh@FreeBSD.org Subject: ports/171270: [PATCH] games/gemdropx: Makefile changed, OptionsNG, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 01:10:10 -0000 >Number: 171270 >Category: ports >Synopsis: [PATCH] games/gemdropx: Makefile changed, OptionsNG, take maintainership >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: Mon Sep 03 01:10:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC >Description: Makefile changed: Added - MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/gemdropx/src/ - COMMENT= Interesting one-player puzzle game for X (SDL) - LICENSE= GPLv2 - USE_SDL= image mixer sdl - PLIST_FILES= - PORTDATA= * - PORTDOCS= - Pixmaps - OptionsNG - Take maintainership Removed file(s): - files/patch-aa - pkg-plist Generated and tested manually, tested with port test and with RedPorts (all RELEASES), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- gemdropx-0.9_9.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/gemdropx/Makefile ./Makefile --- /usr/ports/games/gemdropx/Makefile 2012-02-18 11:17:51.000000000 +0100 +++ ./Makefile 2012-09-03 02:54:53.000000000 +0200 @@ -1,32 +1,57 @@ -# New ports collection makefile for: gemdropx -# Date created: 9 March 1998 -# Whom: Andrey Zakhvatov -# # $FreeBSD: ports/games/gemdropx/Makefile,v 1.28 2012/02/18 10:17:51 mva Exp $ -# PORTNAME= gemdropx PORTVERSION= 0.9 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games -MASTER_SITES= ftp://ftp.billsgames.com/unix/x/gemdropx/src/ +MASTER_SITES= ftp://ftp.tuxpaint.org/unix/x/gemdropx/src/ \ + ftp://ftp.billsgames.com/unix/x/gemdropx/src/ -MAINTAINER= ports@FreeBSD.org -COMMENT= An interesting one-player puzzle game for X +MAINTAINER= nemysis@gmx.ch +COMMENT= Interesting one-player puzzle game for X (SDL) + +LICENSE= GPLv2 + +ALL_TARGET= ${PORTNAME} +USE_SDL= image mixer sdl -USE_SDL= mixer USE_GMAKE= yes -MAKE_ENV= JOY=NO + +PLIST_FILES= bin/${PORTNAME} \ + share/pixmaps/${PORTNAME}.xmp + +PORTDATA= * +PORTDOCS= AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt + +.include + +post-patch: +# Fix SDL, CFLAGS + @${REINPLACE_CMD} \ + -e 's|sdl-config|$(SDL_CONFIG)|' \ + -e 's|CC=gcc|CC?=g++|' \ + -e 's|CXX=gcc|CXX?=g++|' \ + -e 's|CFLAGS=-Wall $(SDL_CFLAGS)|CFLAGS+=$(SDL_CFLAGS)|' \ + ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin - @${MKDIR} ${DATADIR}/images - ${INSTALL_DATA} ${WRKSRC}/data/images/* ${DATADIR}/images - @${MKDIR} ${DATADIR}/sounds - ${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${DATADIR}/sounds -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} +# Executable + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + # ${DATADIR} + +# Data + ${MKDIR} ${DATADIR} + @(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "images sounds" ${DATADIR}) + +# Pixmaps + ${INSTALL_DATA} ${WRKSRC}/data/images/gemdropx-icon.xpm ${PREFIX}/share/pixmaps/${PORTNAME}.xmp + +# Documentation +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} +. for f in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +. endfor .endif .include diff -ruN --exclude=CVS /usr/ports/games/gemdropx/files/patch-aa ./files/patch-aa --- /usr/ports/games/gemdropx/files/patch-aa 2002-06-22 07:30:08.000000000 +0200 +++ ./files/patch-aa 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ ---- 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=/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=-lSDL_mixer -@@ -27,7 +27,7 @@ - EMBEDDEDFLAG=NOT_EMBEDDED - - --CFLAGS=-Wall $(SDL_CFLAGS) \ -+CFLAGS+=$(SDL_CFLAGS) \ - -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG) \ - -D$(EMBEDDEDFLAG) $(XTRA_FLAGS) - SDL_LIB=$(MIXER) $(SDL_LDFLAGS) diff -ruN --exclude=CVS /usr/ports/games/gemdropx/pkg-descr ./pkg-descr --- /usr/ports/games/gemdropx/pkg-descr 2000-04-02 02:58:27.000000000 +0200 +++ ./pkg-descr 2012-09-03 02:45:50.000000000 +0200 @@ -1,20 +1,18 @@ - Gem Drop X is an interesting one-player puzzle game for X-Window. +"Gem Drop X" is an interesting one-player puzzle game using the +Simple DirectMedia Layer (SDL) libraries. - Gem Drop X is a direct port of Gem Drop, an Atari 8-bit game -written in Action! (a very fast C and Pascal-like compiled language -for the Atari). The concept of the game Gem Drop is based directly -on an arcade game for the NeoGeo system called "Magical Drop III" -by SNK. +It is a direct port of "Gem Drop," an Atari 8-bit game written in Action! +(a very fast C- and Pascal-like compiled language for the Atari). - If you're familiar with games like Jewels, Klax, Bust-A-Move or -Tetris, this game is similar to them all. I consider it closest to -Klax. (Jewels is like a combination of Klax and Tetris. Bust-A-Move -is the least similar, in my opinion, but everyone seems to have -heard of it more than the others (except Tetris, of course!)) +It was originally ported to X11, using SDL for sound and music. +Eventually, the Xlib graphics calls were removed and replaced with +SDL calls. - The game is played with YOU at the bottom of the screen. At the -top is a random assortment of colored shapes ("gems"). As time goes -on, more gems appear at the very top of the screen, pushing the -rest downwards. The game is over when the gems reach the bottom. +The concept of the game "Gem Drop" is based on an arcade game for the +NeoGeo system called "Magical Drop III" by SNK. + +If you're familiar with games like Jewels, Klax, Bust-A-Move or Tetris, +this game is similar to them all. I consider it closest to Klax. +Some people have compared it to "Tetris meets Space Invaders." WWW: http://www.newbreedsoftware.com/gemdropx/ diff -ruN --exclude=CVS /usr/ports/games/gemdropx/pkg-plist ./pkg-plist --- /usr/ports/games/gemdropx/pkg-plist 2006-03-08 12:14:07.000000000 +0100 +++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -bin/gemdropx -%%PORTDOCS%%%%DOCSDIR%%/README.txt -%%DATADIR%%/images/README -%%DATADIR%%/images/action-mask.xbm -%%DATADIR%%/images/action.xbm -%%DATADIR%%/images/author.bmp -%%DATADIR%%/images/block.bmp -%%DATADIR%%/images/bluegem.bmp -%%DATADIR%%/images/bomb.bmp -%%DATADIR%%/images/brick.bmp -%%DATADIR%%/images/congratulations.bmp -%%DATADIR%%/images/credits.bmp -%%DATADIR%%/images/diamond.bmp -%%DATADIR%%/images/disc.bmp -%%DATADIR%%/images/dot.bmp -%%DATADIR%%/images/explode0.bmp -%%DATADIR%%/images/explode1.bmp -%%DATADIR%%/images/explode2.bmp -%%DATADIR%%/images/explode3.bmp -%%DATADIR%%/images/fuji.bmp -%%DATADIR%%/images/gemdropx-icon.xpm -%%DATADIR%%/images/happy.bmp -%%DATADIR%%/images/left-mask.xbm -%%DATADIR%%/images/left.xbm -%%DATADIR%%/images/level.bmp -%%DATADIR%%/images/lines.bmp -%%DATADIR%%/images/need.bmp -%%DATADIR%%/images/nothing-mask.xbm -%%DATADIR%%/images/nothing.xbm -%%DATADIR%%/images/numbers.bmp -%%DATADIR%%/images/patience.bmp -%%DATADIR%%/images/paused.bmp -%%DATADIR%%/images/right-mask.xbm -%%DATADIR%%/images/right.xbm -%%DATADIR%%/images/sad.bmp -%%DATADIR%%/images/score.bmp -%%DATADIR%%/images/stopwatch.bmp -%%DATADIR%%/images/title.bmp -%%DATADIR%%/images/triangle.bmp -%%DATADIR%%/images/uhoh.bmp -%%DATADIR%%/images/warning.bmp -%%DATADIR%%/images/warning1.bmp -%%DATADIR%%/images/warning2.bmp -%%DATADIR%%/images/warning3.bmp -%%DATADIR%%/images/warning4.bmp -%%DATADIR%%/images/wildcard.bmp -%%DATADIR%%/images/win1.bmp -%%DATADIR%%/images/win2.bmp -%%DATADIR%%/images/yellowgem.bmp -%%DATADIR%%/sounds/22drops.mod -%%DATADIR%%/sounds/2force.xm -%%DATADIR%%/sounds/README -%%DATADIR%%/sounds/applause.wav -%%DATADIR%%/sounds/begin.wav -%%DATADIR%%/sounds/bomb.wav -%%DATADIR%%/sounds/buzzer.wav -%%DATADIR%%/sounds/citron.mod -%%DATADIR%%/sounds/clock.wav -%%DATADIR%%/sounds/gameover.wav -%%DATADIR%%/sounds/got.wav -%%DATADIR%%/sounds/grab.wav -%%DATADIR%%/sounds/hr_suds.xm -%%DATADIR%%/sounds/levelselect.wav -%%DATADIR%%/sounds/throw.wav -%%DATADIR%%/sounds/wildcard.wav -%%DATADIR%%/sounds/win.wav -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- gemdropx-0.9_9.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: