From owner-svn-ports-head@FreeBSD.ORG Wed Jan 8 12:01:39 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86518DDB; Wed, 8 Jan 2014 12:01:39 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC8811171; Wed, 8 Jan 2014 12:01:38 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 99BECBDC44; Wed, 8 Jan 2014 13:01:37 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 81FAFBDC30; Wed, 8 Jan 2014 13:01:37 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id C8D45613C; Wed, 8 Jan 2014 13:01:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 4D8C867940F6; Wed, 8 Jan 2014 13:01:36 +0100 (CET) Date: Wed, 08 Jan 2014 13:01:36 +0100 From: Mathieu Arnold To: gahr@FreeBSD.org Subject: Re: svn commit: r339078 - in head/net/jags: . files Message-ID: In-Reply-To: <20140108104303.GD8627@gahrfit.gahr.ch> References: <201401080919.s089JxRW083109@svn.freebsd.org> <20140108104303.GD8627@gahrfit.gahr.ch> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jan 2014 12:01:39 -0000 +--On 8 janvier 2014 11:43:05 +0100 Pietro Cerutti wrote: | On 2014-Jan-08, 11:15, Mathieu Arnold wrote: |> +--On 8 janvier 2014 09:19:59 +0000 Pietro Cerutti |> wrote: |> | Author: gahr |> | Date: Wed Jan 8 09:19:59 2014 |> | New Revision: 339078 |> | URL: http://svnweb.freebsd.org/changeset/ports/339078 |> | |> | Log: |> | - Fix build on 10 (clang) [1] |> | - STAGE-clean |> |> If this applies to the version of the port in branch/2014Q1, would you |> mind merging it there ? Just run /usr/ports/Tools/scripts/mfh 2014Q1 |> 339078, "Approved by: portmgr-lurker (mat)". | | Done. Please double-check it, as it's the first merge I do on ports. Ok, I ran it again, ended up with r339109, which looks way better than yours. I don't know what happened when you ran it, the output of the script as I ran it was : $ Tools/scripts/mfh 2014Q1 339078 U 2014Q1 Checked out revision 339107. A 2014Q1/net Updating '2014Q1/net/jags': A 2014Q1/net/jags A 2014Q1/net/jags/files A 2014Q1/net/jags/files/patch-src_mainwindow.cpp A 2014Q1/net/jags/pkg-plist A 2014Q1/net/jags/Makefile A 2014Q1/net/jags/distinfo A 2014Q1/net/jags/pkg-descr Updated to revision 339107. Updating '2014Q1/net/jags/files': At revision 339107. --- Merging r339078 into '2014Q1/net': A 2014Q1/net/jags/files/patch-src_jagsabout.h A 2014Q1/net/jags/files/patch-src_jagsmountwithcommand.h A 2014Q1/net/jags/files/patch-src_jagsmountwith.h A 2014Q1/net/jags/files/patch-src_jagsprefsdialog.h UU 2014Q1/net/jags/files/patch-src_mainwindow.cpp A 2014Q1/net/jags/files/patch-src_jagssearchdialog.h A 2014Q1/net/jags/files/patch-src_mainwindow.h A 2014Q1/net/jags/files/patch-src_jagsmenubar.h A 2014Q1/net/jags/files/patch-src_jagsmntswindow.h UU 2014Q1/net/jags/Makefile --- Recording mergeinfo for merge of r339078 into '2014Q1': U 2014Q1 --- Recording mergeinfo for merge of r339078 into '2014Q1/net': G 2014Q1/net --- Eliding mergeinfo from '2014Q1/net': U 2014Q1/net --- Recording mergeinfo for merge of r339078 into '2014Q1/net/jags': G 2014Q1/net/jags --- Eliding mergeinfo from '2014Q1/net/jags': U 2014Q1/net/jags Index: 2014Q1/net/jags/Makefile =================================================================== --- 2014Q1/net/jags/Makefile (revision 339108) +++ 2014Q1/net/jags/Makefile (working copy) @@ -16,16 +16,10 @@ CONFLICTS= jags-1.* -USE_GMAKE= yes +USES= gmake USE_XORG= xi xext x11 USE_GNOME= gtk12 GNU_CONFIGURE= yes - -NO_STAGE= yes -.include - -.if ${OSVERSION} >= 700042 CFLAGS+= -ffriend-injection -.endif -.include +.include Property changes on: 2014Q1/net/jags/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: 2014Q1/net/jags/files/patch-src_mainwindow.cpp =================================================================== --- 2014Q1/net/jags/files/patch-src_mainwindow.cpp (revision 339108) +++ 2014Q1/net/jags/files/patch-src_mainwindow.cpp (working copy) @@ -1,5 +1,5 @@ ---- src/mainwindow.cpp.orig 2008-09-16 14:27:01.000000000 +0200 -+++ src/mainwindow.cpp 2008-09-16 14:58:48.000000000 +0200 +--- ./src/mainwindow.cpp.orig 2003-09-04 23:14:54.000000000 +0200 ++++ ./src/mainwindow.cpp 2014-01-08 10:20:11.000000000 +0100 @@ -299,6 +299,8 @@ gchar *workgroup = NULL, *command = NULL, *comment = NULL, *comment2 = NULL; gint h; Property changes on: 2014Q1/net/jags/files/patch-src_mainwindow.cpp ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: 2014Q1 =================================================================== --- 2014Q1 (revision 339108) +++ 2014Q1 (working copy) Property changes on: 2014Q1 ___________________________________________________________________ Modified: svn:mergeinfo Reverse-merged /head:r339078* Merged /head:r339078 MFH: r339078 - Fix build on 10 (clang) [1] - STAGE-clean PR: 185419[1] Submitted by: Michael Gmelin Approved by: portmgr (implicit) Do you want to commit? [yn] y Sending 2014Q1 Sending 2014Q1/net/jags/Makefile Adding 2014Q1/net/jags/files/patch-src_jagsabout.h Adding 2014Q1/net/jags/files/patch-src_jagsmenubar.h Adding 2014Q1/net/jags/files/patch-src_jagsmntswindow.h Adding 2014Q1/net/jags/files/patch-src_jagsmountwith.h Adding 2014Q1/net/jags/files/patch-src_jagsmountwithcommand.h Adding 2014Q1/net/jags/files/patch-src_jagsprefsdialog.h Adding 2014Q1/net/jags/files/patch-src_jagssearchdialog.h Sending 2014Q1/net/jags/files/patch-src_mainwindow.cpp Adding 2014Q1/net/jags/files/patch-src_mainwindow.h Transmitting file data .. Committed revision 339109. -- Mathieu Arnold