OSEC

Neohapsis is currently accepting applications for employment. For more information, please visit our website www.neohapsis.com or email hr@neohapsis.com
Re: devel/quilt: maintainer update to v0.63

From: Kent R. Spillner (kspillneracm.org)
Date: Fri Jul 18 2014 - 12:58:09 CDT


Maintainer update. Passes portcheck. Tested on amd64-current. Removes
previous patches merged upstream. New patches already fed & merged
upstream for the next release, too.

On Wed, Jul 16, 2014 at 05:52:46PM -0500, Kent R. Spillner wrote:
> *Bump*
>
> > On Jul 10, 2014, at 12:34, "Kent R. Spillner" <kspillneracm.org> wrote:
> >
> > Ping.
> >
> >> On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote:
> >> This diff updates devel/quilt to v0.63. Our previous patches were
> >> merged upstream; one goes away completly. I also fed the new patches
> >> upstream as well.
> >>
> >> Passes portcheck. Ok?
> >>
> >>
> >> Index: Makefile
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
> >> retrieving revision 1.5
> >> diff -p -u -r1.5 Makefile
> >> --- Makefile 9 Jan 2014 14:55:42 -0000 1.5
> >> +++ Makefile 2 Jun 2014 21:09:53 -0000
> >> -2,7 +2,7
> >>
> >> COMMENT= manage large numbers of patches
> >>
> >> -DISTNAME= quilt-0.61
> >> +DISTNAME= quilt-0.63
> >> CATEGORIES= devel
> >>
> >> HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
> >> Index: distinfo
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
> >> retrieving revision 1.2
> >> diff -p -u -r1.2 distinfo
> >> --- distinfo 9 Jan 2014 14:55:42 -0000 1.2
> >> +++ distinfo 2 Jun 2014 22:24:44 -0000
> >> -1,2 +1,2
> >> -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
> >> -SIZE (quilt-0.61.tar.gz) = 450552
> >> +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
> >> +SIZE (quilt-0.63.tar.gz) = 389593
> >> Index: patches/patch-Makefile_in
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
> >> retrieving revision 1.2
> >> diff -p -u -r1.2 patch-Makefile_in
> >> --- patches/patch-Makefile_in 9 Jan 2014 14:55:42 -0000 1.2
> >> +++ patches/patch-Makefile_in 3 Jun 2014 18:12:39 -0000
> >> -1,6 +1,6
> >> $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $
> >> ---- Makefile.in.orig Sun Dec 8 10:40:42 2013
> >> -+++ Makefile.in Mon Dec 30 18:40:55 2013
> >> +--- Makefile.in.orig Wed May 7 13:41:15 2014
> >> ++++ Makefile.in Tue Jun 3 13:11:41 2014
> >> -13,7 +13,7 docdir := docdir
> >> mandir := mandir
> >> localedir := $(datadir)/locale
> >> -10,12 +10,34 $OpenBSD: patch-Makefile_in,v 1.2 2014/0
> >>
> >> INSTALL := INSTALL
> >> POD2MAN := POD2MAN
> >> - -42,6 +42,8 MSGCAT := MSGCAT
> >> + -42,7 +42,6 MSGCAT := MSGCAT
> >> DIFFSTAT := DIFFSTAT
> >> RPMBUILD := RPMBUILD
> >> SENDMAIL := SENDMAIL
> >> -+CP := CP
> >> -+MD5SUM := MD5SUM
> >> +-CP := CP
> >> + MD5SUM := MD5SUM
> >>
> >> USE_NLS := USE_NLS
> >> - STAT_HARDLINK := STAT_HARDLINK
> >> + -122,8 +121,10 GIT_DESC := $(shell ./git-desc | sed -e 's:^v::')
> >> +
> >> + TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
> >> + ifneq ($(PATCH_WRAPPER),)
> >> ++ifneq ($(PATCH_WRAPPER), no)
> >> + TESTS += test/patch-wrapper.test
> >> + endif
> >> ++endif
> >> + DIRT += test/.depend $(wildcard test/.*.ok)
> >> +
> >> + # Settings for running the uninstalled version of quilt in the source tree:
> >> + -316,9 +317,11 install-main :: scripts
> >> + $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \
> >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
> >> + ifneq ($(PATCH_WRAPPER),)
> >> ++ifneq ($(PATCH_WRAPPER), no)
> >> + $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper
> >> + $(INSTALL) -m 755 bin/patch-wrapper \
> >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch
> >> ++endif
> >> + endif
> >> +
> >> + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/
> >> Index: patches/patch-configure_ac
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v
> >> retrieving revision 1.1
> >> diff -p -u -r1.1 patch-configure_ac
> >> --- patches/patch-configure_ac 9 Jan 2014 14:55:42 -0000 1.1
> >> +++ patches/patch-configure_ac 3 Jun 2014 18:01:51 -0000
> >> -1,13 +1,11
> >> -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $
> >> ---- configure.ac.orig Sun Dec 8 21:51:39 2013
> >> -+++ configure.ac Mon Dec 30 18:28:26 2013
> >> - -367,6 +367,9 fi
> >> +$OpenBSD$
> >> +--- configure.ac.orig Tue Jun 3 13:01:15 2014
> >> ++++ configure.ac Tue Jun 3 13:01:33 2014
> >> + -367,7 +367,6 fi
> >>
> >> QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin])
> >>
> >> -+QUILT_COMPAT_PROG_PATH(CP, cp, gcp cp)
> >> -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum)
> >> -+
> >> +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
> >> + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
> >> +
> >> AC_PATH_PROG(MSGMERGE, [msgmerge])
> >> - AC_PATH_PROG(MSGFMT, [msgfmt])
> >> - AC_PATH_PROG(XGETTEXT, [xgettext])
> >> Index: patches/patch-test_delete_test
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
> >> retrieving revision 1.2
> >> diff -p -u -r1.2 patch-test_delete_test
> >> --- patches/patch-test_delete_test 9 Jan 2014 14:55:42 -0000 1.2
> >> +++ patches/patch-test_delete_test 3 Jun 2014 18:12:25 -0000
> >> -1,6 +1,6
> >> $OpenBSD: patch-test_delete_test,v 1.2 2014/01/09 14:55:42 jca Exp $
> >> ---- test/delete.test.orig Sun Dec 8 10:40:42 2013
> >> -+++ test/delete.test Mon Dec 30 18:34:19 2013
> >> +--- test/delete.test.orig Wed May 7 13:41:15 2014
> >> ++++ test/delete.test Tue Jun 3 13:02:44 2014
> >> -1,3 +1,4
> >> +# >~ .*find: [`']?\./dir'?: Permission denied
> >> Test the delete command.
> >> -11,7 +11,7 $OpenBSD: patch-test_delete_test,v 1.2 2
> >> $ quilt delete "test3"
> >> > Removing patch %{P}test3
> >> - >~ .*find: [`']?\./dir'?: Permission denied
> >> -+ >~ /usr/local/bin/gfind: [`']?\./dir'?: Permission denied
> >> ++ >~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
> >>
> >> $ chmod a+rx .pc/test3/dir
> >>
> >> Index: patches/patch-test_faildiff_test
> >> ===================================================================
> >> RCS file: patches/patch-test_faildiff_test
> >> diff -N patches/patch-test_faildiff_test
> >> --- /dev/null 1 Jan 1970 00:00:00 -0000
> >> +++ patches/patch-test_faildiff_test 2 Jun 2014 21:33:25 -0000
> >> -0,0 +1,12
> >> +$OpenBSD$
> >> +--- test/faildiff.test.orig Mon Jun 2 16:31:00 2014
> >> ++++ test/faildiff.test Mon Jun 2 16:32:18 2014
> >> + -13,7 +13,7 What happens when diff fails because of a permission e
> >> + $ chmod -r test.txt
> >> +
> >> + $ quilt refresh
> >> +- > diff: test.txt: Permission denied
> >> ++ >~ .*diff: test\.txt: Permission denied
> >> + > Diff failed on file 'test.txt', aborting
> >> + $ echo %{?}
> >> + > 1
> >> Index: patches/patch-test_remove-trailing-ws_test
> >> ===================================================================
> >> RCS file: patches/patch-test_remove-trailing-ws_test
> >> diff -N patches/patch-test_remove-trailing-ws_test
> >> --- patches/patch-test_remove-trailing-ws_test 9 Jan 2014 14:55:42 -0000 1.1
> >> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> >> -1,63 +0,0
> >> -$OpenBSD: patch-test_remove-trailing-ws_test,v 1.1 2014/01/09 14:55:42 jca Exp $
> >> ---- test/remove-trailing-ws.test.orig Fri Dec 13 17:38:41 2013
> >> -+++ test/remove-trailing-ws.test Fri Dec 13 17:50:26 2013
> >> - -134,21 +134,21 $ %{QUILT_DIR}/scripts/remove-trailing-ws < unified.di
> >> - > Removing trailing whitespace from lines 12,16 of files/complex
> >> - > Removing trailing whitespace from lines 1,2,3 of files/create
> >> - $ wc -l files/add
> >> --> 8 files/add
> >> -+>~ (\s+)?8 files/add
> >> - $ wc -l files/change
> >> --> 3 files/change
> >> -+>~ (\s+)?3 files/change
> >> - $ wc -l files/complex
> >> --> 21 files/complex
> >> -+>~ (\s+)?21 files/complex
> >> - $ wc -l files/create
> >> --> 3 files/create
> >> -+>~ (\s+)?3 files/create
> >> - $ wc -l files/remove
> >> --> 6 files/remove
> >> -+>~ (\s+)?6 files/remove
> >> - $ wc -l files/remove-at-end
> >> --> 8 files/remove-at-end
> >> -+>~ (\s+)?8 files/remove-at-end
> >> - $ wc -l unified.diff
> >> --> 85 unified.diff
> >> -+>~ (\s+)?85 unified.diff
> >> - $ wc -l unified-wsok.diff
> >> --> 85 unified-wsok.diff
> >> -+>~ (\s+)?85 unified-wsok.diff
> >> - $ diff -u unified.diff unified-wsok.diff | grep '^++[^+]'
> >> - > ++Line 4
> >> - > ++to
> >> - -167,21 +167,21 $ %{QUILT_DIR}/scripts/remove-trailing-ws < context.di
> >> - > Removing trailing whitespace from lines 12,16 of files/complex
> >> - > Removing trailing whitespace from lines 1,2,3 of files/create
> >> - $ wc -l files/add
> >> --> 8 files/add
> >> -+>~ (\s+)?8 files/add
> >> - $ wc -l files/change
> >> --> 3 files/change
> >> -+>~ (\s+)?3 files/change
> >> - $ wc -l files/complex
> >> --> 21 files/complex
> >> -+>~ (\s+)?21 files/complex
> >> - $ wc -l files/create
> >> --> 3 files/create
> >> -+>~ (\s+)?3 files/create
> >> - $ wc -l files/remove
> >> --> 6 files/remove
> >> -+>~ (\s+)?6 files/remove
> >> - $ wc -l files/remove-at-end
> >> --> 8 files/remove-at-end
> >> -+>~ (\s+)?8 files/remove-at-end
> >> - $ wc -l context.diff
> >> --> 104 context.diff
> >> -+>~ (\s+)?104 context.diff
> >> - $ wc -l context-wsok.diff
> >> --> 104 context-wsok.diff
> >> -+>~ (\s+)?104 context-wsok.diff
> >> - $ diff -u context.diff context-wsok.diff | grep '^+[+!] '
> >> - > ++ Line 4
> >> - > ++ create
> >> Index: pkg/PLIST
> >> ===================================================================
> >> RCS file: /work/cvsroot/ports/devel/quilt/pkg/PLIST,v
> >> retrieving revision 1.2
> >> diff -p -u -r1.2 PLIST
> >> --- pkg/PLIST 9 Jan 2014 14:55:42 -0000 1.2
> >> +++ pkg/PLIST 2 Jun 2014 22:33:53 -0000
> >> -70,5 +70,3 share/quilt/snapshot
> >> share/quilt/top
> >> share/quilt/unapplied
> >> share/quilt/upgrade
> >> -share/quilt/wrapper/
> >> -share/quilt/wrapper/patch
> >
>