diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-01-29 19:13:48 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-01-29 19:13:48 +0000 |
| commit | 4e1c0c0bae5779cecd8b452777af0324f78409d7 (patch) | |
| tree | cd9bb8737f97ce08cf5b8c116a815ffbc4f02fd4 /sysutils | |
| parent | 1275aa49f8a797fececb6006c1ef10c0c98904b9 (diff) | |
Update to 12.9
Notes
Notes:
svn path=/head/; revision=524569
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/debhelper/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/debhelper/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/debhelper/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | sysutils/debhelper/files/patch-dh_fixperms | 4 | ||||
| -rw-r--r-- | sysutils/debhelper/files/patch-dh_perl | 4 | ||||
| -rw-r--r-- | sysutils/debhelper/pkg-plist | 2 |
6 files changed, 18 insertions, 12 deletions
diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile index 2a2ee83ca9af..2cabe2648455 100644 --- a/sysutils/debhelper/Makefile +++ b/sysutils/debhelper/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= debhelper -PORTVERSION= 12.8 +PORTVERSION= 12.9 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo index 64437487d6d9..90f6ec55b523 100644 --- a/sysutils/debhelper/distinfo +++ b/sysutils/debhelper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579531338 -SHA256 (debhelper_12.8.tar.xz) = 8ef5c8eae677b98d826405d0c323df7f74eba7fe4716545abf507235a86e8b5d -SIZE (debhelper_12.8.tar.xz) = 517508 +TIMESTAMP = 1580232631 +SHA256 (debhelper_12.9.tar.xz) = d627404c45a9f4012624fd38f1dac22cb66bbae6c0d158abf01a9785d2154a97 +SIZE (debhelper_12.9.tar.xz) = 521116 diff --git a/sysutils/debhelper/files/patch-Makefile b/sysutils/debhelper/files/patch-Makefile index 4a204ea91f94..cd6aa9624ad9 100644 --- a/sysutils/debhelper/files/patch-Makefile +++ b/sysutils/debhelper/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2017-09-02 15:29:54 UTC +--- Makefile.orig 2020-01-27 20:31:46 UTC +++ Makefile @@ -3,7 +3,7 @@ PO4A ?= po4a POD2MAN ?= pod2man @@ -9,17 +9,19 @@ MANPAGES=$(COMMANDS:=.1) dh.1 # Find deprecated commands by looking at their synopsis. -@@ -118,17 +118,16 @@ endif +@@ -118,19 +118,18 @@ endif done; install: - install -d $(DESTDIR)$(PREFIX)/bin \ - $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts \ - $(DESTDIR)$(PERLLIBDIR)/Sequence \ -- $(DESTDIR)$(PERLLIBDIR)/Buildsystem +- $(DESTDIR)$(PERLLIBDIR)/Buildsystem \ +- $(DESTDIR)$(PERLLIBDIR)/DH + install -d \ + $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence \ -+ $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem ++ $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem \ ++ $(DESTDIR)${SITE_PERL}/DH install dh $(COMMANDS) $(DESTDIR)$(PREFIX)/bin - install -m 0644 autoscripts/* $(DESTDIR)$(PREFIX)/share/debhelper/autoscripts - install -m 0644 lib/Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR) @@ -29,9 +31,11 @@ - sed -i '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)$(PERLLIBDIR)/Dh_Lib.pm - install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence - install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem +- install -m 0644 lib/Debian/Debhelper/DH/*.pm $(DESTDIR)$(PERLLIBDIR)/DH + sed -i '' '/$$prefix=/s@/usr@$(PREFIX)@g' $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Dh_Lib.pm + install -m 0644 lib/Debian/Debhelper/Sequence/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Sequence + install -m 0644 lib/Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)${SITE_PERL}/Debian/Debhelper/Buildsystem ++ install -m 0644 lib/Debian/Debhelper/DH/*.pm $(DESTDIR)${SITE_PERL}/DH test: version MAKEFLAGS= HARNESS_OPTIONS=j$(TEST_JOBS) ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x && m/\.t$$/ } @ARGV' t/* t/*/* diff --git a/sysutils/debhelper/files/patch-dh_fixperms b/sysutils/debhelper/files/patch-dh_fixperms index c938a1eb7a93..05f3b3f530d4 100644 --- a/sysutils/debhelper/files/patch-dh_fixperms +++ b/sysutils/debhelper/files/patch-dh_fixperms @@ -1,6 +1,6 @@ ---- dh_fixperms.orig 2017-10-21 17:51:53 UTC +--- dh_fixperms.orig 2019-01-10 07:03:38 UTC +++ dh_fixperms -@@ -101,7 +101,7 @@ on_pkgs_in_parallel { +@@ -108,7 +108,7 @@ on_pkgs_in_parallel { # General permissions fixing. complex_doit("find $tmp ${find_exclude_options} -print0", diff --git a/sysutils/debhelper/files/patch-dh_perl b/sysutils/debhelper/files/patch-dh_perl index 28f6aeee69a2..bd740e8918cd 100644 --- a/sysutils/debhelper/files/patch-dh_perl +++ b/sysutils/debhelper/files/patch-dh_perl @@ -1,6 +1,6 @@ ---- dh_perl.orig 2015-09-19 09:06:22 UTC +--- dh_perl.orig 2020-01-14 20:45:22 UTC +++ dh_perl -@@ -143,8 +143,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) +@@ -165,8 +165,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # only one directory is installed into. foreach my $dir ("$tmp/$vendorlib", "$tmp/$vendorarch") { if (-d $dir) { diff --git a/sysutils/debhelper/pkg-plist b/sysutils/debhelper/pkg-plist index 007830335adb..9ac49bd643e8 100644 --- a/sysutils/debhelper/pkg-plist +++ b/sysutils/debhelper/pkg-plist @@ -105,6 +105,8 @@ bin/prerm-systemd bin/prerm-systemd-restart bin/prerm-usrlocal bin/prerm-wm +%%SITE_PERL%%/DH/AddonAPI.pm +%%SITE_PERL%%/DH/SequenceState.pm %%SITE_PERL%%/Debian/Debhelper/Buildsystem.pm %%SITE_PERL%%/Debian/Debhelper/Buildsystem/ant.pm %%SITE_PERL%%/Debian/Debhelper/Buildsystem/autoconf.pm |