From owner-freebsd-ports@freebsd.org Fri Oct 28 02:07:54 2016 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE89CC23905 for ; Fri, 28 Oct 2016 02:07:54 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-lf0-x234.google.com (mail-lf0-x234.google.com [IPv6:2a00:1450:4010:c07::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61749C36 for ; Fri, 28 Oct 2016 02:07:54 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: by mail-lf0-x234.google.com with SMTP id b81so45857462lfe.1 for ; Thu, 27 Oct 2016 19:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=ZE/LAKqSmiqkNOf4i8c9DX/rZ2duKZtG3OXq6KsPX5E=; b=SrzRyJ2aoDcmIwa36Axxnsazl4R97/0BbgYMjHo/NvHoR3my7M9+TH1HoeFsejhNbm 7L7lao+mv2XiyMUMWmiBVYwzOQYA6qzj5bcWVFwzJl6oAf6bju0Pz5q78KwSBKy+umbX SKy/msuGJZ+vFE6KjYbOId4H8UcDq35YSiZPARhjJW4yqaYwk8x71bHMbUCDbmhB0ow9 YmsPh+hssbMnpCnrkLrxb+TtTEtRyicY/ZkXaPVAzWSeSn7RKV0I0uHFChZXVYXYTCtE oy0xV7hAKst/0RKEVGAr+qaSJkrmPxXASxti9sfhSIjhPHyQdGkYL6wyYysnD5cCaFPz fykg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=ZE/LAKqSmiqkNOf4i8c9DX/rZ2duKZtG3OXq6KsPX5E=; b=MvrYnP35IwT68RrHJHj8aCIMLPzYio8ugpfJIGQ/GbF9aDE+NasMMk2lHF5hFFRkgB wLsCF+niIVBbobuhH0ejIewb3/4aIk+wugjm7dkEm1OwwHvX+eDgV8amlo5v0wwa3z4T 8Ah8y9WIXLwKgaZnMDypSVb3g15wczurnEb55gaFuEbQjztXb1YiqcuIt2uNxOEP92L1 Uv1r8ESRRU6KUTrkp2LXTefQDI7MNjoWHaQL3af5tzmfa4hWG18atBFFAomlIWhWrqq9 KlJOPo0Weu9ZgWNm+GvAKaCHvOkyJy+UEQbJBUNLAQxqQUlkC36n04oMFMGbTemmHxvs dCug== X-Gm-Message-State: ABUngvfyMjiscnomz0+uitg4iaO4DT2H6puHYSbTCMfu0HXGwhwQm8FxrnAfz2BfoihpjncZjccIIJgosj9g3g== X-Received: by 10.25.160.206 with SMTP id j197mr7653533lfe.114.1477620471960; Thu, 27 Oct 2016 19:07:51 -0700 (PDT) MIME-Version: 1.0 Sender: bsdkaffee@gmail.com Received: by 10.25.201.215 with HTTP; Thu, 27 Oct 2016 19:07:51 -0700 (PDT) In-Reply-To: <61b51cd8-18d2-8f70-77c7-ed7dd92c4a0c@bsdproject.de> References: <730bd5a8-d6c2-7e8f-5240-b7d4b6209884@bsdproject.de> <6a431a63-7692-a667-5fa2-4de3d55d5189@bsdproject.de> <1FA8BED7-A46D-43B8-AE74-C99229350352@lastsummer.de> <61b51cd8-18d2-8f70-77c7-ed7dd92c4a0c@bsdproject.de> From: "Jason E. Hale" Date: Thu, 27 Oct 2016 22:07:51 -0400 X-Google-Sender-Auth: -L55YWZUn9_IpWbRUpZpnpq8cl8 Message-ID: Subject: Re: make makepatch To: Jochen Neumeister Cc: Franco Fichtner , "freebsd-ports@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Oct 2016 02:07:55 -0000 On Thu, Oct 27, 2016 at 2:28 AM, Jochen Neumeister wrote: > > > On 27.10.2016 08:08, Franco Fichtner wrote: >>> On 27 Oct 2016, at 7:53 AM, Jochen Neumeister wrote: >>> >>> No, make makepatch delete the patches into /files and: >> If there are no patches in files/ maybe you have no patches applied >> in the work/ dir? Does running "make patch" before makepatch help? >> >> > Hm that is interesting. > > make patch: there are 3 patches into /file > > make makepatch: now the 3 files are removed, but: > > make makepatch > Generated patch-wpagui.cpp > The previous patches have been placed here: > /usr/home/joneum/dev/ports/net/wpa_gui/work/.makepatch-tmp/archived-patches > > Now I'm confused. After "make patch" and "make makepatch", there is only > one "new" patch in files: > > /home/joneum/dev/ports/net/wpa_gui/files # ls > patch-wpagui.cpp pkg-message.in > > and in work/.makepatch-tmp/archived-patches: # ls > patch-os_unix.c patch-wpa_ctrl.c patch-wpagui.cpp > > Is this now right, that i can only use the new patch in /files? With > "make clean" i delete the work folder and the old patches. Here is the problem: The port redefines WRKSRC by setting WRKSRC_SUBDIR= wpa_supplicant/wpa_gui-qt4, but the two patches that did not get generated are outside of WRKSRC. The easiest thing to do is: 1) clean everything up 2) run "make patch" 3) add PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} to the port Makefile 4) run "make makepatch" That should regenerate the patches and subsequently rename them. Remind the committer to do "svn mv" to rename the patches instead of deleting and re-adding them. Cheers, Jason