From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 19 03:00:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B740D3F for ; Fri, 19 Oct 2012 03:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 0E7DF8FC12 for ; Fri, 19 Oct 2012 03:00:01 +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 q9J301hB048175 for ; Fri, 19 Oct 2012 03:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9J3015X048174; Fri, 19 Oct 2012 03:00:01 GMT (envelope-from gnats) Resent-Date: Fri, 19 Oct 2012 03:00:01 GMT Resent-Message-Id: <201210190300.q9J3015X048174@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 BAFA4D19 for ; Fri, 19 Oct 2012 02:58:34 +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 10D968FC14 for ; Fri, 19 Oct 2012 02:58:33 +0000 (UTC) Received: (qmail invoked by alias); 19 Oct 2012 02:58:31 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp070) with SMTP; 19 Oct 2012 04:58:31 +0200 Received: by something.email.com (sSMTP sendmail emulation); Fri, 19 Oct 2012 04:58:31 +0200 Message-Id: <20121019025834.BAFA4D19@hub.freebsd.org> Date: Fri, 19 Oct 2012 04:58:31 +0200 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/172866: [PATCH] games/icebreaker: update to 1.9.5, take maintainership, Makefile changed, OptionsNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Oct 2012 03:00:01 -0000 >Number: 172866 >Category: ports >Synopsis: [PATCH] games/icebreaker: update to 1.9.5, take maintainership, Makefile changed, OptionsNG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Oct 19 03:00:00 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: - Update to 1.9.5 - Take maintainership Added file(s): - files/patch-dialog.c - files/patch-hiscore.c - files/patch-line.c - files/patch-options.c - files/patch-penguin.c - files/patch-themes.c Removed file(s): - files/patch-aa - files/patch-options_c - pkg-plist Makefile changed: +LICENSE= GPLv2 +BUILD_DEPENDS= pnmtopng:${PORTSDIR}/graphics/netpbm +PLIST_FILES= +PLIST_DIRSTRY= +PORTDATA= * +PORTDOCS= +.include +post-patch: + ${WRKSRC}/Makefile + ${WRKSRC}/icebreaker.desktop +post-build: +post-install: Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports) >How-To-Repeat: portlint -A WARN: Makefile: [40]: use ${VARIABLE}, instead of $(VARIABLE). WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy. WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors. 0 fatal errors and 3 warnings found. WARN: Makefile: [40]: because is used + -e 's|mandir=$$(prefix)/share/man|mandir=$$(prefix)/man|' \ port test: clean Build log https://redports.org/buildarchive/20121019020651-45485/ >Fix: --- icebreaker-1.9.5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/icebreaker/Makefile ./Makefile --- /usr/ports/games/icebreaker/Makefile 2012-02-18 11:17:54.000000000 +0100 +++ ./Makefile 2012-10-19 04:50:12.000000000 +0200 @@ -6,24 +6,64 @@ # PORTNAME= icebreaker -PORTVERSION= 1.2.1 -PORTREVISION= 9 +PORTVERSION= 1.9.5 CATEGORIES= games -MASTER_SITES= http://mattdm.org/icebreaker/1.2.x/ +MASTER_SITES= http://mattdm.org/icebreaker/1.9.x/ EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org -COMMENT= A game similar to Jezzball or Barrack +MAINTAINER= nemysis@gmx.ch +COMMENT= Game similar to Jezzball or Barrack + +LICENSE= GPLv2 + +BUILD_DEPENDS= pnmtopng:${PORTSDIR}/graphics/netpbm USE_SDL= mixer sdl USE_GMAKE= yes -MAKE_ENV+= prefix="${PREFIX}" \ - highscoredir="${PREFIX}/share/icebreaker/scores" \ - mandir="${MANPREFIX}/man" \ - CHMOD="${CHMOD}" \ - CHOWN="${CHOWN}" \ - MKDIR="${MKDIR}" + +PLIST_FILES= bin/${PORTNAME} \ + share/pixmaps/${PORTNAME}.png \ + share/applications/${PORTNAME}.desktop +PLIST_DIRSTRY= share/applications + +PORTDATA= * +PORTDOCS= ChangeLog README README.SDL README.ifyoumakechanges README.themes TODO MAN6= ${PORTNAME}.6 +.include + +post-patch: + @${REINPLACE_CMD} \ + -e 's|CC=gcc|CC?=g++|' \ + -e 's|sdl-config|$(SDL_CONFIG)|' \ + -e 's|prefix=/usr/local|prefix=${PREFIX}|' \ + -e 's|mandir=$$(prefix)/share/man|mandir=$$(prefix)/man|' \ + -e 's|highscoredir=/var/local/lib/games|highscoredir=/var/games|' \ + -e 's|CFLAGS=|CFLAGS+=|' \ + -e 's|OPTIMIZE=-O3|OPTIMIZE=|' \ + -e 's|$$(CC) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|$$(CC) $$(LDFLAGS) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|' \ + -e 's|install -s -g games -m 2755 icebreaker $(bindir)|install -g games -m 2755 icebreaker $(bindir)|' \ + -e 's|install -s -m 755 icebreaker $(bindir)|install -m 755 icebreaker $(bindir)|' \ + -e 's|chown -f games:games|chown -f root:games|' \ + ${WRKSRC}/Makefile + @${REINPLACE_CMD} \ + -e 's|%{Summary}|Game similar to Jezzball or Barrack|' \ + -e 's|/usr/share/icebreaker/icebreaker_48.bmp|icebreaker|' \ + ${WRKSRC}/icebreaker.desktop + +post-build: + @(cd ${WRKSRC} && ${LOCALBASE}/bin/winicontoppm -bestqual icebreaker_32.ico | \ + ${LOCALBASE}/bin/pnmtopng > icebreaker.png) + +post-install: + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} +.endif + .include diff -ruN --exclude=CVS /usr/ports/games/icebreaker/distinfo ./distinfo --- /usr/ports/games/icebreaker/distinfo 2011-07-03 16:24:07.000000000 +0200 +++ ./distinfo 2012-10-19 02:58:36.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (icebreaker-1.2.1.tgz) = 95c6d70756f90facc92012549c25740d7432b31da7eafef9bf8fef208fa0ab58 -SIZE (icebreaker-1.2.1.tgz) = 56622 +SHA256 (icebreaker-1.9.5.tgz) = f283bc82df84b5f016efa6b1e6095914379cf2acac9c5692025275ff96102867 +SIZE (icebreaker-1.9.5.tgz) = 116012 diff -ruN --exclude=CVS /usr/ports/games/icebreaker/files/patch-aa ./files/patch-aa --- /usr/ports/games/icebreaker/files/patch-aa 2006-03-08 15:14:49.000000000 +0100 +++ ./files/patch-aa 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ ---- Makefile.orig Wed Mar 8 15:04:42 2006 -+++ Makefile Wed Mar 8 15:04:46 2006 -@@ -1,6 +1,6 @@ --CC=gcc - --SDLCONFIG=sdl-config -+SDLCONFIG=$(SDL_CONFIG) -+CC?=gcc - - ifndef prefix - prefix=/usr/local -@@ -21,16 +21,16 @@ - endif - - ifndef OPTIMIZE -- OPTIMIZE=-O3 -+ OPTIMIZE= - endif - --CFLAGS=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\" -+CFLAGS+=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(datadir)/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\" - - SRC=icebreaker.c cursor.c grid.c laundry.c line.c penguin.c sound.c \ - level.c intro.c text.c status.c transition.c hiscore.c dialog.c \ - options.c fullscreen.c - --SDL_MIXER=-lSDL_mixer -+SDL_MIXER=-lSDL_mixer -lsmpeg - SDL_LIB=$(SDL_LDFLAGS) $(SDL_MIXER) - SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags) - SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs) -@@ -103,17 +103,17 @@ - sed 's/\$$VERDATE/$(VERDATE)/' > $@ - - install: all -- mkdir -p $(prefix)/bin -- mkdir -p $(prefix)/share/icebreaker -- mkdir -p $(highscoredir) -- mkdir -p $(mandir)/man6 -- -- install -m 644 *.wav *.bmp $(prefix)/share/icebreaker -- install -g games -s -m 2755 icebreaker $(prefix)/bin -- install -m 644 icebreaker.6 $(mandir)/man6 -+ $(MKDIR) $(prefix)/share/icebreaker -+ $(MKDIR) $(highscoredir) -+ -+ $(BSD_INSTALL_DATA) *.wav *.bmp $(prefix)/share/icebreaker -+ $(BSD_INSTALL_PROGRAM) icebreaker $(prefix)/bin -+ $(BSD_INSTALL_MAN) icebreaker.6 $(mandir)/man6 - touch $(highscoredir)/icebreaker.scores -- chown games:games $(highscoredir)/icebreaker.scores -- chmod 664 $(highscoredir)/icebreaker.scores -+ $(CHOWN) root:games $(prefix)/bin/icebreaker -+ $(CHMOD) 2755 $(prefix)/bin/icebreaker -+ $(CHOWN) root:games $(highscoredir)/icebreaker.scores -+ $(CHMOD) 664 $(highscoredir)/icebreaker.scores - - - include $(SRC:.c=.d) diff -ruN --exclude=CVS /usr/ports/games/icebreaker/files/patch-dialog.c ./files/patch-dialog.c --- /usr/ports/games/icebreaker/files/patch-dialog.c 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-dialog.c 2012-10-19 03:42:15.000000000 +0200 @@ -0,0 +1,57 @@ +--- dialog.c.orig 2002-05-26 22:13:00.000000000 +0200 ++++ dialog.c 2012-10-19 03:27:46.000000000 +0200 +@@ -384,12 +384,12 @@ + + if (strlen(commandline.theme)>0) + { +- snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",commandline.theme); ++ snprintf(originaltheme,sizeof(originaltheme),"%s",commandline.theme); + originalthemecl=true; + } + else + { +- snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",options.theme); ++ snprintf(originaltheme,sizeof(originaltheme),"%s",options.theme); + originalthemecl=false; + } + +@@ -662,7 +662,7 @@ + { // "random", at the end of the list + + strncpy(val,"random",MAXMENUVALUELENGTH); +- snprintf(options.theme,MAXMENUVALUELENGTH,"random"); ++ strcpy(options.theme,"random"); + + settheme("linux"); // just for pretty + +@@ -676,7 +676,7 @@ + else + { + strncpy(val,themelist[(t+1)%themecount],MAXMENUVALUELENGTH); +- snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t+1)%themecount]); ++ snprintf(options.theme,sizeof(options.theme),"%s",themelist[(t+1)%themecount]); + + settheme(options.theme); + +@@ -729,10 +729,10 @@ + + for (i=0;iRelease-Note: >Audit-Trail: >Unformatted: