Update devel/quilt port to version 0.63. Also support stageing. Fix: Index: ports/devel/quilt/Makefile =================================================================== --- ports.orig/devel/quilt/Makefile +++ ports/devel/quilt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: tags/RELEASE_10_0_0/devel/quilt/Makefile 327726 2013-09-20 17:17:44Z bapt $ PORTNAME= quilt -PORTVERSION= 0.60 +PORTVERSION= 0.63 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= quilt @@ -31,10 +31,8 @@ CONFIGURE_ARGS= --with-sed=${LOCALBASE}/ --without-getopt \ --with-patch=${LOCALBASE}/bin/gpatch -MAN1= guards.1 quilt.1 PORTDOCS= README README.MAIL quilt.pdf -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRPMBUILD} Index: ports/devel/quilt/distinfo =================================================================== --- ports.orig/devel/quilt/distinfo +++ ports/devel/quilt/distinfo @@ -1,2 +1,2 @@ -SHA256 (quilt-0.60.tar.gz) = 3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b -SIZE (quilt-0.60.tar.gz) = 442369 +SHA256 (quilt-0.63.tar.gz) = 2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52 +SIZE (quilt-0.63.tar.gz) = 389593 Index: ports/devel/quilt/pkg-plist =================================================================== --- ports.orig/devel/quilt/pkg-plist +++ ports/devel/quilt/pkg-plist @@ -49,8 +49,11 @@ share/emacs/site-lisp/quilt.el %%DATADIR%%/compat/cp %%DATADIR%%/compat/date %%DATADIR%%/compat/getopt +%%DATADIR%%/compat/md5sum %%DATADIR%%/compat/patch %%DATADIR%%/compat/sed +man/man1/guards.1.gz +man/man1/quilt.1.gz %%SENDMAIL%%%%DATADIR%%/compat/sendmail %%RPMBUILD%%%%DATADIR%%/compat/rpmbuild @dirrmtry etc/bash_completion.d Index: ports/devel/quilt/files/patch-Makefile.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.bak ++++ Makefile.in +@@ -3,6 +3,7 @@ VERSION := @PACKAGE_VERSION@ + RELEASE := @PACKAGE_RELEASE@ + PACKAGE_TARNAME := @PACKAGE_TARNAME@ + PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@ ++BUILD_ROOT := $(DESTDIR)/ + + prefix := @prefix@ + exec_prefix := @exec_prefix@ Index: ports/devel/quilt/files/patch-dependency-graph.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-dependency-graph.in @@ -0,0 +1,8 @@ +--- quilt/scripts/dependency-graph.in.orig 2014-06-09 11:36:58.000000000 -0700 ++++ quilt/scripts/dependency-graph.in 2014-06-09 11:37:06.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!/usr/bin/env perl + + # This script is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as Index: ports/devel/quilt/files/patch-edmail.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-edmail.in @@ -0,0 +1,8 @@ +--- quilt/scripts/edmail.in.orig 2014-06-09 11:44:47.000000000 -0700 ++++ quilt/scripts/edmail.in 2014-06-09 11:45:02.000000000 -0700 +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#!/usr/bin/env perl -w + + # RFCs important for this script: + # Index: ports/devel/quilt/files/patch-getopt.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-getopt.in @@ -0,0 +1,8 @@ +--- compat/getopt.in.orig 2014-06-09 11:47:12.000000000 -0700 ++++ compat/getopt.in 2014-06-09 11:47:20.000000000 -0700 +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#!/usr/bin/env perl + + # This script is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as Index: ports/devel/quilt/files/patch-guards.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-guards.in @@ -0,0 +1,8 @@ +--- bin/guards.in.orig 2014-06-09 11:35:29.000000000 -0700 ++++ bin/guards.in 2014-06-09 11:35:38.000000000 -0700 +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!/usr/bin/env perl -w + + # This script is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License version 2 as Index: ports/devel/quilt/files/patch-remove-trailing-ws.in =================================================================== --- /dev/null +++ ports/devel/quilt/files/patch-remove-trailing-ws.in @@ -0,0 +1,8 @@ +--- quilt/scripts/remove-trailing-ws.in.orig 2014-06-09 11:45:57.000000000 -0700 ++++ quilt/scripts/remove-trailing-ws.in 2014-06-09 11:46:05.000000000 -0700 +@@ -1,4 +1,4 @@ +-#! @PERL@ -w ++#!/usr/bin/env perl + + # Remove trailing whitespace from modified lines in working files. + #
Notify maintainer.
the patch was submitted be me, the maintainer.
now I see, because I did this as work, it was not submitted with my private email address...
Please, create an attachment for update.\nThanks
Created attachment 144380 [details] update devel/quilt to version 0.63 and staging
The patch is no longer applying to the current version of the port. If you can upload working one, I can test it and then commit it.
Created attachment 154606 [details] update devel/quilt to version 0.64 update the devel/quilt port to the current version 0.64 The FreeBSD maintainers had already made the port stage aware, so this new patch is simply updating the version number and package list.
Unfortunately, the latest patch fails to apply cleanly to the latest version of the port in the ports tree.
so what output does patch give that fails? I tried this on a fresh FreeBSD 10.1 system with a freshly fetched ports tree yesterday.
Here's how it looks on my ports tree (mind, it is SVN one, not portsnap one): pd# svn info Path: . Working Copy Root Path: /pd/ports/default URL: svn+ssh://robak@svn.freebsd.org/ports/head/devel/quilt Relative URL: ^/head/devel/quilt Repository Root: svn+ssh://robak@svn.freebsd.org/ports Repository UUID: 35697150-7ecd-e111-bb59-0022644237b5 Revision: 381786 Node Kind: directory Schedule: normal Last Changed Author: bapt Last Changed Rev: 371552 Last Changed Date: 2014-10-27 12:07:19 +0100 (Mon, 27 Oct 2014) pd# patch --posix -E -p3 < /tmp/patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: ports/devel/quilt/Makefile |=================================================================== |--- ports.orig/devel/quilt/Makefile |+++ ports/devel/quilt/Makefile -------------------------- Patching file Makefile using Plan A... Hunk #1 failed at 1. 1 out of 1 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: ports/devel/quilt/distinfo |=================================================================== |--- ports.orig/devel/quilt/distinfo |+++ ports/devel/quilt/distinfo -------------------------- |Index: ports/devel/quilt/pkg-plist |=================================================================== |--- ports.orig/devel/quilt/pkg-plist |+++ ports/devel/quilt/pkg-plist -------------------------- Patching file pkg-plist using Plan A... No such line 58 in input file, ignoring Hunk #1 failed at 42. 1 out of 1 hunks failed--saving rejects to pkg-plist.rej Hmm... Ignoring the trailing garbage. done pd# ls -la total 597 drwxr-xr-x 3 root wheel 9 Mar 21 10:32 . drwxr-xr-x 4951 root wheel 4953 Mar 20 21:19 .. -rw-r--r-- 1 root wheel 1529 Mar 21 10:32 Makefile -rw-r--r-- 1 root wheel 282 Mar 21 10:32 Makefile.rej -rw-r--r-- 1 root wheel 128 Mar 21 10:32 distinfo drwxr-xr-x 2 root wheel 9 Mar 8 21:40 files -rw-r--r-- 1 root wheel 481 Jun 15 2014 pkg-descr -rw-r--r-- 1 root wheel 1337 Mar 21 10:32 pkg-plist -rw-r--r-- 1 root wheel 706 Mar 21 10:32 pkg-plist.rej pd# cat Makefile.rej @@ -1,8 +1,7 @@ # Created by: Dirk Jagdmann <doj@cubic.org> -# $FreeBSD: tags/RELEASE_10_1_0/devel/quilt/Makefile 360345 2014-07-03 09:13:35Z bapt $ PORTNAME= quilt -PORTVERSION= 0.61 +PORTVERSION= 0.64 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SAVANNAH} pd# cat pkg-plist.rej @@ -42,21 +42,20 @@ %%DATADIR%%/scripts/backup-files %%DATADIR%%/scripts/dependency-graph %%DATADIR%%/scripts/edmail -%%DATADIR%%/scripts/inspect +%%DATADIR%%/scripts/inspect-wrapper %%DATADIR%%/scripts/patchfns %%DATADIR%%/scripts/remove-trailing-ws %%DATADIR%%/scripts/utilfns -%%DATADIR%%/wrapper/patch %%DATADIR%%/compat/awk %%DATADIR%%/compat/cp %%DATADIR%%/compat/date %%DATADIR%%/compat/getopt +%%DATADIR%%/compat/md5sum %%DATADIR%%/compat/patch %%DATADIR%%/compat/sed %%SENDMAIL%%%%DATADIR%%/compat/sendmail %%RPMBUILD%%%%DATADIR%%/compat/rpmbuild @dirrmtry etc/bash_completion.d @dirrm %%DATADIR%%/compat -@dirrm %%DATADIR%%/wrapper @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%% You should send a diff that applies cleanly against the port in its latest SVN revision.
Re-assign to Bartek (robak@), I don't use anymore quilt.
Created attachment 154740 [details] update devel/quilt to version 0.64 created from SVN head.
It still doesnt build, currently pkg-plist issues, like that: http://pd.valinor.palantiri.org/data/84amd64-default/2015-03-24_12h15m38s/logs/errors/quilt-0.64_1.log
I just don't understand how to make the staging happy and how to write the pkg-plist. Does somebody know another port which successfully uses staging, that I can study?
You can find all required information in the Porter's Handbook: https://www.freebsd.org/doc/en/books/porters-handbook/ and in addition to that, you've very welcome to join #bsdports on IRC and/or to ask questions on the ports mailing list. Also, you should test your patches with Poudriere, that would save you a lot of time and straight away detect the issues I am pointing out for you. In a very shallow explanation, when you see in logs that something is 'missing' from the pkg-plist it means the port has not installed it, yet the pkg-plist references it, and when it says that something is 'orphaned' it means that port installed it, but pkg-plist has no reference to that.
A commit references this bug: Author: robak Date: Sun Nov 8 16:11:18 UTC 2015 New revision: 401063 URL: https://svnweb.freebsd.org/changeset/ports/401063 Log: devel/quilt: update 0.61 -> 0.64 PR: 190836 Submitted by: Dirk Jagdmann <doj@cubic.org> (maintainer) Changes: head/devel/quilt/Makefile head/devel/quilt/distinfo head/devel/quilt/pkg-plist
Committed, with minor changes, thanks!