Update to version 1.18.6

3 files changed, 60 insertions, 19 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index d90be3f70566..5762ba4f82ed 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.18.4
-PORTREVISION=	1
+PORTVERSION=	1.18.6
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	dpkg_${PORTVERSION}
@@ -12,6 +11,7 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Debian package maintenance system
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	po4a:textproc/po4a
 RUN_DEPENDS=	gtar:archivers/gtar \
@@ -27,7 +27,7 @@ PLIST_SUB+=	DPKGDIR=${DPKGDIR}
 
 CONFIGURE_ARGS+=--with-admindir=${DPKGDIR} --libdir=${PREFIX}/libexec \
 		--with-libintl-prefix=${LOCALBASE} \
-		--with-logdir=/var/log
+		--with-logdir=/var/log --with-libmd
 CONFIGURE_ENV+=	PERL_LIBDIR="${PREFIX}/${SITE_PERL_REL}"
 
 OPTIONS_DEFINE=	NLS
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index a8b9fdf9d6de..979669b11f2d 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.18.4.tar.xz) = fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da
-SIZE (dpkg_1.18.4.tar.xz) = 4377024
+SHA256 (dpkg_1.18.6.tar.xz) = dd0bc323baafe7aae1571a41d37ab92452171e7a2ce34429f77621fdc0e5dea2
+SIZE (dpkg_1.18.6.tar.xz) = 4617492
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index de90ce9834d4..9b785e5ad3d2 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -30,6 +30,7 @@ include/dpkg/arch.h
 include/dpkg/atomic-file.h
 include/dpkg/buffer.h
 include/dpkg/c-ctype.h
+include/dpkg/color.h
 include/dpkg/command.h
 include/dpkg/compress.h
 include/dpkg/deb-version.h
@@ -61,13 +62,15 @@ include/dpkg/report.h
 include/dpkg/string.h
 include/dpkg/subproc.h
 include/dpkg/tarfn.h
+include/dpkg/treewalk.h
 include/dpkg/trigdeferred.h
 include/dpkg/triglib.h
 include/dpkg/varbuf.h
 include/dpkg/version.h
 %%SITE_PERL%%/Dpkg.pm
 %%SITE_PERL%%/Dpkg/Arch.pm
-%%SITE_PERL%%/Dpkg/BuildEnv.pm
+%%SITE_PERL%%/Dpkg/Build/Env.pm
+%%SITE_PERL%%/Dpkg/Build/Types.pm
 %%SITE_PERL%%/Dpkg/BuildFlags.pm
 %%SITE_PERL%%/Dpkg/BuildOptions.pm
 %%SITE_PERL%%/Dpkg/BuildProfiles.pm
@@ -162,7 +165,6 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/dpkg-deb.1.gz
 %%NLS%%man/de/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/de/man1/dpkg-divert.1.gz
-%%NLS%%man/de/man1/dpkg-genchanges.1.gz
 %%NLS%%man/de/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/de/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/de/man1/dpkg-maintscript-helper.1.gz
@@ -181,6 +183,8 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/dpkg.1.gz
 %%NLS%%man/de/man1/dselect.1.gz
 %%NLS%%man/de/man1/update-alternatives.1.gz
+%%NLS%%man/de/man5/deb-changelog.5.gz
+%%NLS%%man/de/man5/deb-changes.5.gz
 %%NLS%%man/de/man5/deb-control.5.gz
 %%NLS%%man/de/man5/deb-extra-override.5.gz
 %%NLS%%man/de/man5/deb-old.5.gz
@@ -194,12 +198,13 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man5/deb-triggers.5.gz
 %%NLS%%man/de/man5/deb-version.5.gz
 %%NLS%%man/de/man5/deb.5.gz
+%%NLS%%man/de/man5/deb822.5.gz
 %%NLS%%man/de/man5/dpkg.cfg.5.gz
+%%NLS%%man/de/man5/dsc.5.gz
 %%NLS%%man/de/man5/dselect.cfg.5.gz
 %%NLS%%man/de/man8/start-stop-daemon.8.gz
 %%NLS%%man/es/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/es/man1/dpkg-divert.1.gz
-%%NLS%%man/es/man1/dpkg-genchanges.1.gz
 %%NLS%%man/es/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/es/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/es/man1/dpkg-mergechangelogs.1.gz
@@ -223,11 +228,9 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/es/man8/start-stop-daemon.8.gz
 %%NLS%%man/fr/man1/dpkg-architecture.1.gz
 %%NLS%%man/fr/man1/dpkg-buildflags.1.gz
-%%NLS%%man/fr/man1/dpkg-buildpackage.1.gz
 %%NLS%%man/fr/man1/dpkg-deb.1.gz
 %%NLS%%man/fr/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/fr/man1/dpkg-divert.1.gz
-%%NLS%%man/fr/man1/dpkg-genchanges.1.gz
 %%NLS%%man/fr/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/fr/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/fr/man1/dpkg-maintscript-helper.1.gz
@@ -249,7 +252,6 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/fr/man5/deb-override.5.gz
 %%NLS%%man/fr/man5/deb-shlibs.5.gz
 %%NLS%%man/fr/man5/deb-split.5.gz
-%%NLS%%man/fr/man5/deb-src-control.5.gz
 %%NLS%%man/fr/man5/deb-substvars.5.gz
 %%NLS%%man/fr/man5/deb-symbols.5.gz
 %%NLS%%man/fr/man5/deb-triggers.5.gz
@@ -261,7 +263,6 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/hu/man5/dpkg.cfg.5.gz
 %%NLS%%man/hu/man5/dselect.cfg.5.gz
 %%NLS%%man/it/man1/dpkg-architecture.1.gz
-%%NLS%%man/it/man1/dpkg-buildpackage.1.gz
 %%NLS%%man/it/man1/dpkg-deb.1.gz
 %%NLS%%man/it/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/it/man1/dpkg-gencontrol.1.gz
@@ -281,7 +282,6 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/it/man5/deb-override.5.gz
 %%NLS%%man/it/man5/deb-shlibs.5.gz
 %%NLS%%man/it/man5/deb-split.5.gz
-%%NLS%%man/it/man5/deb-src-control.5.gz
 %%NLS%%man/it/man5/deb-substvars.5.gz
 %%NLS%%man/it/man5/deb-version.5.gz
 %%NLS%%man/it/man5/deb.5.gz
@@ -290,7 +290,6 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/it/man8/start-stop-daemon.8.gz
 %%NLS%%man/ja/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/ja/man1/dpkg-divert.1.gz
-%%NLS%%man/ja/man1/dpkg-genchanges.1.gz
 %%NLS%%man/ja/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/ja/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/ja/man1/dpkg-mergechangelogs.1.gz
@@ -340,7 +339,8 @@ man/man1/dselect.1.gz
 man/man1/update-alternatives.1.gz
 man/man3/Dpkg.3.gz
 man/man3/Dpkg::Arch.3.gz
-man/man3/Dpkg::BuildEnv.3.gz
+man/man3/Dpkg::Build::Env.3.gz
+man/man3/Dpkg::Build::Types.3.gz
 man/man3/Dpkg::BuildFlags.3.gz
 man/man3/Dpkg::BuildOptions.3.gz
 man/man3/Dpkg::BuildProfiles.3.gz
@@ -376,6 +376,8 @@ man/man3/Dpkg::Vendor::Debian.3.gz
 man/man3/Dpkg::Vendor::Default.3.gz
 man/man3/Dpkg::Vendor::Ubuntu.3.gz
 man/man3/Dpkg::Version.3.gz
+man/man5/deb-changelog.5.gz
+man/man5/deb-changes.5.gz
 man/man5/deb-control.5.gz
 man/man5/deb-extra-override.5.gz
 man/man5/deb-old.5.gz
@@ -389,12 +391,54 @@ man/man5/deb-symbols.5.gz
 man/man5/deb-triggers.5.gz
 man/man5/deb-version.5.gz
 man/man5/deb.5.gz
+man/man5/deb822.5.gz
 man/man5/dpkg.cfg.5.gz
+man/man5/dsc.5.gz
 man/man5/dselect.cfg.5.gz
 man/man8/start-stop-daemon.8.gz
+%%NLS%%man/nl/man1/dpkg-architecture.1.gz
+%%NLS%%man/nl/man1/dpkg-buildflags.1.gz
+%%NLS%%man/nl/man1/dpkg-buildpackage.1.gz
+%%NLS%%man/nl/man1/dpkg-checkbuilddeps.1.gz
+%%NLS%%man/nl/man1/dpkg-deb.1.gz
+%%NLS%%man/nl/man1/dpkg-distaddfile.1.gz
+%%NLS%%man/nl/man1/dpkg-divert.1.gz
+%%NLS%%man/nl/man1/dpkg-gencontrol.1.gz
+%%NLS%%man/nl/man1/dpkg-gensymbols.1.gz
+%%NLS%%man/nl/man1/dpkg-maintscript-helper.1.gz
+%%NLS%%man/nl/man1/dpkg-mergechangelogs.1.gz
+%%NLS%%man/nl/man1/dpkg-name.1.gz
+%%NLS%%man/nl/man1/dpkg-parsechangelog.1.gz
+%%NLS%%man/nl/man1/dpkg-query.1.gz
+%%NLS%%man/nl/man1/dpkg-scanpackages.1.gz
+%%NLS%%man/nl/man1/dpkg-scansources.1.gz
+%%NLS%%man/nl/man1/dpkg-shlibdeps.1.gz
+%%NLS%%man/nl/man1/dpkg-source.1.gz
+%%NLS%%man/nl/man1/dpkg-split.1.gz
+%%NLS%%man/nl/man1/dpkg-statoverride.1.gz
+%%NLS%%man/nl/man1/dpkg-trigger.1.gz
+%%NLS%%man/nl/man1/dpkg-vendor.1.gz
+%%NLS%%man/nl/man1/dpkg.1.gz
+%%NLS%%man/nl/man1/dselect.1.gz
+%%NLS%%man/nl/man1/update-alternatives.1.gz
+%%NLS%%man/nl/man5/deb-control.5.gz
+%%NLS%%man/nl/man5/deb-extra-override.5.gz
+%%NLS%%man/nl/man5/deb-old.5.gz
+%%NLS%%man/nl/man5/deb-origin.5.gz
+%%NLS%%man/nl/man5/deb-override.5.gz
+%%NLS%%man/nl/man5/deb-shlibs.5.gz
+%%NLS%%man/nl/man5/deb-split.5.gz
+%%NLS%%man/nl/man5/deb-src-control.5.gz
+%%NLS%%man/nl/man5/deb-substvars.5.gz
+%%NLS%%man/nl/man5/deb-symbols.5.gz
+%%NLS%%man/nl/man5/deb-triggers.5.gz
+%%NLS%%man/nl/man5/deb-version.5.gz
+%%NLS%%man/nl/man5/deb.5.gz
+%%NLS%%man/nl/man5/dpkg.cfg.5.gz
+%%NLS%%man/nl/man5/dselect.cfg.5.gz
+%%NLS%%man/nl/man8/start-stop-daemon.8.gz
 %%NLS%%man/pl/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/pl/man1/dpkg-divert.1.gz
-%%NLS%%man/pl/man1/dpkg-genchanges.1.gz
 %%NLS%%man/pl/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/pl/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/pl/man1/dpkg-mergechangelogs.1.gz
@@ -418,11 +462,9 @@ man/man8/start-stop-daemon.8.gz
 %%NLS%%man/pl/man8/start-stop-daemon.8.gz
 %%NLS%%man/sv/man1/dpkg-architecture.1.gz
 %%NLS%%man/sv/man1/dpkg-buildflags.1.gz
-%%NLS%%man/sv/man1/dpkg-buildpackage.1.gz
 %%NLS%%man/sv/man1/dpkg-deb.1.gz
 %%NLS%%man/sv/man1/dpkg-distaddfile.1.gz
 %%NLS%%man/sv/man1/dpkg-divert.1.gz
-%%NLS%%man/sv/man1/dpkg-genchanges.1.gz
 %%NLS%%man/sv/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/sv/man1/dpkg-gensymbols.1.gz
 %%NLS%%man/sv/man1/dpkg-maintscript-helper.1.gz
@@ -444,7 +486,6 @@ man/man8/start-stop-daemon.8.gz
 %%NLS%%man/sv/man5/deb-override.5.gz
 %%NLS%%man/sv/man5/deb-shlibs.5.gz
 %%NLS%%man/sv/man5/deb-split.5.gz
-%%NLS%%man/sv/man5/deb-src-control.5.gz
 %%NLS%%man/sv/man5/deb-substvars.5.gz
 %%NLS%%man/sv/man5/deb-symbols.5.gz
 %%NLS%%man/sv/man5/deb-triggers.5.gz