From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 8 06:59:00 2010 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EECE0106566B; Mon, 8 Feb 2010 06:58:59 +0000 (UTC) (envelope-from beyert@cs.ucr.edu) Received: from new1.smtp.messagingengine.com (new1.smtp.messagingengine.com [66.111.4.221]) by mx1.freebsd.org (Postfix) with ESMTP id B621C8FC08; Mon, 8 Feb 2010 06:58:59 +0000 (UTC) Received: from compute1.internal (compute1.internal [10.202.2.41]) by gateway1.messagingengine.com (Postfix) with ESMTP id 8EE88DB3E2; Mon, 8 Feb 2010 01:41:17 -0500 (EST) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute1.internal (MEProxy); Mon, 08 Feb 2010 01:41:17 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=date:message-id:from:to:cc:subject:in-reply-to:references:mime-version:content-type; s=smtpout; bh=S1ZsBhJjcai4TJbtF4WpB1xjCnk=; b=edJJZQvBoHcQBboXLvauttsXT5m7Z4m+C/+J7sYac/TFQzF9YsnQX6Nv8T7ds8r1fyRCqGpqh4/sPxBM4l7QsujcLc0gyqYmrIBfPCwDX1RD0qzfYHuJjXcrA6aP03oyq8zQdJQxKqIDxmPn545ZRJDpSkRpqluID8DTMwhMzQg= X-Sasl-enc: gPyaoRIGqQw4s7BSBr02c2jnyEjdHSjuIPPyzSZqwU3R 1265611275 Received: from aeonserv.aeonnet (cpe-76-90-217-240.socal.res.rr.com [76.90.217.240]) by mail.messagingengine.com (Postfix) with ESMTPSA id 8EDFF4C022D; Mon, 8 Feb 2010 01:41:15 -0500 (EST) Date: Sun, 07 Feb 2010 22:45:19 -0800 Message-ID: <87vde8445c.wl@fastmail.fm> From: Timothy Beyer To: pav@FreeBSD.org In-Reply-To: <201002071514.o17FEa6u029283@freefall.freebsd.org> References: <201002071514.o17FEa6u029283@freefall.freebsd.org> User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.4 (patch 21) (Educational Television) (i386--freebsd) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: beyert@cs.ucr.edu, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/142161: update port: games/gemrb to version 0.6.0 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, 08 Feb 2010 06:59:00 -0000 At Sun, 7 Feb 2010 15:14:36 GMT, pav@FreeBSD.org wrote: > > Synopsis: update port: games/gemrb to version 0.6.0 > > State-Changed-From-To: open->feedback > State-Changed-By: pav > State-Changed-When: Sun Feb 7 15:10:38 UTC 2010 > State-Changed-Why: > This does not patch properly. Maybe you damaged the diffs while copying them > over to PR? Could you regenerate the diff and send it to me? > > > Responsible-Changed-From-To: freebsd-ports-bugs->pav > Responsible-Changed-By: pav > Responsible-Changed-When: Sun Feb 7 15:10:38 UTC 2010 > Responsible-Changed-Why: > This does not patch properly. Maybe you damaged the diffs while copying them > over to PR? Could you regenerate the diff and send it to me? > > http://www.freebsd.org/cgi/query-pr.cgi?pr=142161 Hi, I just tested the files.diff patch for the files/ directory, (downloading from my submission) and it seems that there is a discrepancy between the files.diff on my local machine and the one I submitted, maybe I pasted it improperly? I hope that this resubmission works.... --- files.diff begins here --- diff -urN files.orig/extra-patch-noportdocs-Makefile.in files/extra-patch-noportdocs-Makefile.in --- files.orig/extra-patch-noportdocs-Makefile.in 2009-07-13 16:24:17.000000000 -0700 +++ files/extra-patch-noportdocs-Makefile.in 2009-12-29 23:24:35.000000000 -0800 @@ -1,20 +1,20 @@ ---- Makefile.in.orig 2009-06-25 09:37:05.000000000 -0700 -+++ Makefile.in 2009-07-07 14:52:22.000000000 -0700 -@@ -178,7 +178,7 @@ +--- Makefile.in.orig 2009-11-03 07:31:16.000000000 -0800 ++++ Makefile.in 2009-12-29 23:24:29.000000000 -0800 +@@ -231,7 +231,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -docdir = @docdir@ -+ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ -@@ -751,8 +751,6 @@ +@@ -855,9 +854,6 @@ install-data-hook: rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so -docs: - doxygen +- # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN files.orig/extra-patch-noportdocs-configure files/extra-patch-noportdocs-configure --- files.orig/extra-patch-noportdocs-configure 2009-07-13 16:24:17.000000000 -0700 +++ files/extra-patch-noportdocs-configure 2009-12-29 23:30:08.000000000 -0800 @@ -1,6 +1,6 @@ ---- configure.orig 2009-06-25 09:36:53.000000000 -0700 -+++ configure 2009-07-07 14:58:31.000000000 -0700 -@@ -896,10 +896,7 @@ +--- configure.orig 2009-11-03 07:31:18.000000000 -0800 ++++ configure 2009-12-29 23:25:57.000000000 -0800 +@@ -851,10 +851,7 @@ libdir psdir pdfdir @@ -11,7 +11,7 @@ oldincludedir includedir localstatedir -@@ -993,12 +990,7 @@ +@@ -949,12 +946,7 @@ localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' @@ -24,7 +24,7 @@ libdir='${exec_prefix}/lib' localedir='${datarootdir}/locale' mandir='${datarootdir}/man' -@@ -1074,11 +1066,6 @@ +@@ -1029,11 +1021,6 @@ esac eval enable_$ac_useropt=no ;; @@ -36,7 +36,7 @@ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ac_prev=dvidir ;; -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -@@ -1384,7 +1371,7 @@ +@@ -1334,7 +1321,7 @@ # Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ @@ -45,7 +45,7 @@ libdir localedir mandir do eval ac_val=\$$ac_var -@@ -16386,10 +16373,6 @@ +@@ -15561,10 +15548,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -54,18 +54,9 @@ -fi - # Check whether --enable-subdirs was given. - if test "${enable_subdirs+set}" = set; then + if test "${enable_subdirs+set}" = set; then : enableval=$enable_subdirs; gemrb_use_subdirs=$enableval -@@ -25919,7 +25902,7 @@ - - - --ac_config_files="$ac_config_files Makefile gemrb/Makefile gemrb/includes/Makefile gemrb/override/Makefile gemrb/override/bg1/Makefile gemrb/override/bg2/Makefile gemrb/override/how/Makefile gemrb/override/iwd/Makefile gemrb/override/iwd2/Makefile gemrb/override/pst/Makefile gemrb/override/test1/Makefile gemrb/GUIScripts/Makefile gemrb/GUIScripts/bg1/Makefile gemrb/GUIScripts/bg2/Makefile gemrb/GUIScripts/iwd/Makefile gemrb/GUIScripts/iwd2/Makefile gemrb/GUIScripts/pst/Makefile gemrb/GUIScripts/test1/Makefile gemrb/plugins/Makefile gemrb/plugins/Core/Makefile gemrb/plugins/2DAImporter/Makefile gemrb/plugins/ACMImporter/Makefile gemrb/plugins/AREImporter/Makefile gemrb/plugins/BAMImporter/Makefile gemrb/plugins/BIFImporter/Makefile gemrb/plugins/BMPImporter/Makefile gemrb/plugins/PNGImporter/Makefile gemrb/plugins/CHUImporter/Makefile gemrb/plugins/CREImporter/Makefile gemrb/plugins/DLGImporter/Makefile gemrb/plugins/EFFImporter/Makefile gemrb/plugins/FXOpcodes/Makefile gemrb /plugins/IWDOpcodes/Makefile gemrb/plugins/PSTOpcodes/Makefile gemrb/plugins/GAMImporter/Makefile gemrb/plugins/GUIScript/Makefile gemrb/plugins/IDSImporter/Makefile gemrb/plugins/INIImporter/Makefile gemrb/plugins/ITMImporter/Makefile gemrb/plugins/KEYImporter/Makefile gemrb/plugins/MOSImporter/Makefile gemrb/plugins/MUSImporter/Makefile gemrb/plugins/MVEPlayer/Makefile gemrb/plugins/NullSound/Makefile gemrb/plugins/OpenALAudio/Makefile gemrb/plugins/PLTImporter/Makefile gemrb/plugins/PROImporter/Makefile gemrb/plugins/SDLVideo/Makefile gemrb/plugins/SPLImporter/Makefile gemrb/plugins/STOImporter/Makefile gemrb/plugins/TISImporter/Makefile gemrb/plugins/TLKImporter/Makefile gemrb/plugins/WEDImporter/Makefile gemrb/plugins/WMPImporter/Makefile gemrb/plugins/ZLibMgr/Makefile gemrb/docs/Makefile gemrb/docs/en/Makefile gemrb/docs/en/GUIScript/Makefile gemrb/docs/en/Tables/Makefile gemrb/docs/en/Engine/Makefile" -+ac_config_files="$ac_config_files Makefile gemrb/Makefile gemrb/includes/Makefile gemrb/override/Makefile gemrb/override/bg1/Makefile gemrb/override/bg2/Makefile gemrb/override/how/Makefile gemrb/override/iwd/Makefile gemrb/override/iwd2/Makefile gemrb/override/pst/Makefile gemrb/override/test1/Makefile gemrb/GUIScripts/Makefile gemrb/GUIScripts/bg1/Makefile gemrb/GUIScripts/bg2/Makefile gemrb/GUIScripts/iwd/Makefile gemrb/GUIScripts/iwd2/Makefile gemrb/GUIScripts/pst/Makefile gemrb/GUIScripts/test1/Makefile gemrb/plugins/Makefile gemrb/plugins/Core/Makefile gemrb/plugins/2DAImporter/Makefile gemrb/plugins/ACMImporter/Makefile gemrb/plugins/AREImporter/Makefile gemrb/plugins/BAMImporter/Makefile gemrb/plugins/BIFImporter/Makefile gemrb/plugins/BMPImporter/Makefile gemrb/plugins/PNGImporter/Makefile gemrb/plugins/CHUImporter/Makefile gemrb/plugins/CREImporter/Makefile gemrb/plugins/DLGImporter/Makefile gemrb/plugins/EFFImporter/Makefile gemrb/plugins/FXOpcodes/Makefile gemrb /plugins/IWDOpcodes/Makefile gemrb/plugins/PSTOpcodes/Makefile gemrb/plugins/GAMImporter/Makefile gemrb/plugins/GUIScript/Makefile gemrb/plugins/IDSImporter/Makefile gemrb/plugins/INIImporter/Makefile gemrb/plugins/ITMImporter/Makefile gemrb/plugins/KEYImporter/Makefile gemrb/plugins/MOSImporter/Makefile gemrb/plugins/MUSImporter/Makefile gemrb/plugins/MVEPlayer/Makefile gemrb/plugins/NullSound/Makefile gemrb/plugins/OpenALAudio/Makefile gemrb/plugins/PLTImporter/Makefile gemrb/plugins/PROImporter/Makefile gemrb/plugins/SDLVideo/Makefile gemrb/plugins/SPLImporter/Makefile gemrb/plugins/STOImporter/Makefile gemrb/plugins/TISImporter/Makefile gemrb/plugins/TLKImporter/Makefile gemrb/plugins/WEDImporter/Makefile gemrb/plugins/WMPImporter/Makefile gemrb/plugins/ZLibMgr/Makefile" - - ac_config_files="$ac_config_files gemrb.spec" - -@@ -26977,11 +26960,6 @@ +@@ -19890,11 +19873,6 @@ "gemrb/plugins/WEDImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WEDImporter/Makefile" ;; "gemrb/plugins/WMPImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WMPImporter/Makefile" ;; "gemrb/plugins/ZLibMgr/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/ZLibMgr/Makefile" ;; @@ -76,4 +67,4 @@ - "gemrb/docs/en/Engine/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Engine/Makefile" ;; "gemrb.spec") CONFIG_FILES="$CONFIG_FILES gemrb.spec" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff -urN files.orig/extra-patch-noportdocs-gemrb-Makefile.in files/extra-patch-noportdocs-gemrb-Makefile.in --- files.orig/extra-patch-noportdocs-gemrb-Makefile.in 2009-07-13 16:24:17.000000000 -0700 +++ files/extra-patch-noportdocs-gemrb-Makefile.in 2009-12-29 23:37:36.000000000 -0800 @@ -1,6 +1,6 @@ ---- gemrb/Makefile.in.orig 2009-06-25 09:36:56.000000000 -0700 -+++ gemrb/Makefile.in 2009-07-07 15:12:35.000000000 -0700 -@@ -189,7 +189,6 @@ +--- gemrb/Makefile.in.orig 2009-11-03 07:31:04.000000000 -0800 ++++ gemrb/Makefile.in 2009-12-29 23:33:24.000000000 -0800 +@@ -235,7 +235,6 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -8,12 +8,12 @@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ -@@ -230,7 +229,7 @@ +@@ -276,7 +275,7 @@ sysconf_DATA = GemRB.cfg.sample GemRB.cfg.subdir.sample gemrb_SOURCES = GemRB.cpp gemrb_LDADD = ./plugins/Core/libgemrb_core.la -SUBDIRS = plugins includes GUIScripts override docs +SUBDIRS = plugins includes GUIScripts override - EXTRA_DIST = GemRB.cfg* plugins-prepare.sh + EXTRA_DIST = GemRB.cfg* plugins-prepare.sh CMakeLists.txt INCLUDES = \ $(all_includes) \ --- files.diff ends here ---