From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 17 23:40:04 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C683216A41F for ; Tue, 17 Jan 2006 23:40:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A60BE43D58 for ; Tue, 17 Jan 2006 23:40:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0HNe3cr041342 for ; Tue, 17 Jan 2006 23:40:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0HNe3Fh041339; Tue, 17 Jan 2006 23:40:03 GMT (envelope-from gnats) Resent-Date: Tue, 17 Jan 2006 23:40:03 GMT Resent-Message-Id: <200601172340.k0HNe3Fh041339@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, Dmitry Marakasov Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF5CE16A420 for ; Tue, 17 Jan 2006 23:30:55 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88C3043D60 for ; Tue, 17 Jan 2006 23:30:26 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=1834 helo=nexii.panopticon) by mx1.mail.ru with esmtp id 1Ez0HR-00091m-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 18 Jan 2006 02:30:25 +0300 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id F15FA1142B for ; Wed, 18 Jan 2006 02:34:48 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 0EC9D27F; Wed, 18 Jan 2006 02:34:35 +0300 (MSK) Message-Id: <20060117233435.0EC9D27F@hades.panopticon> Date: Wed, 18 Jan 2006 02:34:35 +0300 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91930: [MAINTAINER] games/glpuzzle Update to 0.1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Marakasov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2006 23:40:04 -0000 >Number: 91930 >Category: ports >Synopsis: [MAINTAINER] games/glpuzzle Update to 0.1.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 17 23:40:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD hades.panopticon 6.0-RELEASE FreeBSD 6.0-RELEASE #1: Sun Dec 18 08:07:07 MSK 2005 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386 >Description: Update to 0.1.4 >How-To-Repeat: >Fix: --- glpuzzle-0.1.4.patch begins here --- diff -ruN glpuzzle.orig/Makefile glpuzzle/Makefile --- glpuzzle.orig/Makefile Wed Jan 11 14:15:28 2006 +++ glpuzzle/Makefile Wed Jan 18 02:29:19 2006 @@ -6,7 +6,7 @@ # PORTNAME= glpuzzle -PORTVERSION= 0.1.2 +PORTVERSION= 0.1.4 CATEGORIES= games MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/glpuzzle/ EXTRACT_SUFX= .tgz @@ -30,6 +30,7 @@ post-patch: @${REINPLACE_CMD} -e "s|font/|${DATADIR}/font/|g" ${WRKSRC}/main.cxx @${REINPLACE_CMD} -e "s|puzzle-preview/|${DATADIR}/puzzle-preview/|g" ${WRKSRC}/main.cxx + @${REINPLACE_CMD} -e "s|terminate|terminate_|g" ${WRKSRC}/main.cxx @${REINPLACE_CMD} -e "s|puzzle-maps/|${DATADIR}/puzzle-maps/|g" ${WRKSRC}/puzzle-preview/preview.map @${RM} -f ${WRKSRC}/puzzle-preview/preview.map.bak diff -ruN glpuzzle.orig/distinfo glpuzzle/distinfo --- glpuzzle.orig/distinfo Wed Jan 11 14:15:28 2006 +++ glpuzzle/distinfo Wed Jan 18 02:05:18 2006 @@ -1,3 +1,3 @@ -MD5 (glpuzzle-0.1.2.tgz) = dda33d2b77a00b39bd3240cd65710d77 -SHA256 (glpuzzle-0.1.2.tgz) = 1dde2a5fefeb957358697d49054ef8043e7d7d0486b672647ccaa9a7ca3922c7 -SIZE (glpuzzle-0.1.2.tgz) = 3207022 +MD5 (glpuzzle-0.1.4.tgz) = 621df04274d61f2ee8bd43428971e063 +SHA256 (glpuzzle-0.1.4.tgz) = 0fcccd08e227175c7fb21740aa548cd0ded029de9401bfdcbb0136d85800bb61 +SIZE (glpuzzle-0.1.4.tgz) = 3206939 diff -ruN glpuzzle.orig/files/patch-Makefile glpuzzle/files/patch-Makefile --- glpuzzle.orig/files/patch-Makefile Wed Jan 11 14:15:28 2006 +++ glpuzzle/files/patch-Makefile Wed Jan 18 02:11:08 2006 @@ -1,10 +1,24 @@ ---- Makefile.orig Mon Jan 9 03:32:53 2006 -+++ Makefile Tue Jan 10 02:57:36 2006 -@@ -23,6 +23,6 @@ - chmod +x $(PREFIX)/bin/glpuzzle +--- Makefile.orig Sun Jan 15 12:25:30 2006 ++++ Makefile Wed Jan 18 02:10:53 2006 +@@ -9,8 +9,6 @@ + DEPENDS = $(SOURCES:.cxx=.d) + OBJECTS = $(SOURCES:.cxx=.o) + INCLFLAGS = -I/usr/include/SDL +-CXX = g++ +-CXXFLAGS = -O2 - glpuzzle: main.cxx version.h -- g++ -O2 -Wall -I/usr/include/SDL main.cxx -lpthread -lSDL -lGL -lpthread -lpng -ljpeg -o glpuzzle -+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -lGL -lpng -ljpeg -o glpuzzle main.cxx + clean: + rm -f $(OBJECTS) $(DEPENDS) $(PROGRAM) +@@ -22,10 +20,10 @@ + @rm $@.tmp + + %.o: %.cxx +- $(CXX) -c $(CXXFLAGS) $(INCLFLAGS) $< -o $@ ++ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $< -o $@ + $(PROGRAM): $(OBJECTS) +- $(CXX) $(OBJECTS) -lpthread -lSDL -lGL -lpthread -lpng -ljpeg -o $@ ++ $(CXX) $(OBJECTS) $(CXXFLAGS) $(LDFLAGS) -lGL -lpng -ljpeg -o $@ + install: $(PROGRAM) + @echo Installing in $(PREFIX) diff -ruN glpuzzle.orig/files/patch-main.cxx glpuzzle/files/patch-main.cxx --- glpuzzle.orig/files/patch-main.cxx Wed Jan 11 14:15:28 2006 +++ glpuzzle/files/patch-main.cxx Wed Jan 18 02:25:03 2006 @@ -1,10 +1,10 @@ ---- main.cxx.orig Wed Jan 11 04:42:54 2006 -+++ main.cxx Wed Jan 11 04:43:04 2006 +--- main.cxx.orig Sun Jan 15 12:24:51 2006 ++++ main.cxx Wed Jan 18 02:24:47 2006 @@ -24,6 +24,7 @@ * */ +#include #include - #include #include + #include --- glpuzzle-0.1.4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: