4 files changed, 25 insertions, 74 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 93b932b89b5b..e3bb916d34e5 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.17.25
+PORTVERSION=	1.18.0
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	dpkg_${PORTVERSION}
@@ -18,11 +18,9 @@ RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
 		gmd5sum:${PORTSDIR}/sysutils/coreutils
 
 GNU_CONFIGURE=	yes
-USES=		cpe gmake iconv libtool perl5 pkgconfig shebangfix tar:xz
+USES=		cpe gmake iconv libtool perl5 pkgconfig tar:xz
 CPE_VENDOR=	debian
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}
-SHEBANG_FILES=	dselect/methods/ftp/update dselect/methods/ftp/install \
-		dselect/methods/ftp/setup
 
 DPKGDIR?=	/var/db/dpkg
 PLIST_SUB+=	DPKGDIR=${DPKGDIR}
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index ffa375ebaa5c..c5e98a845945 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.17.25.tar.xz) = 07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa
-SIZE (dpkg_1.17.25.tar.xz) = 4407792
+SHA256 (dpkg_1.18.0.tar.xz) = 7b156fbeed5bbfb8aa546a18badb46e471b65fa00777ccd8d7e3bbce002f225a
+SIZE (dpkg_1.18.0.tar.xz) = 4330304
diff --git a/archivers/dpkg/files/patch-cputable b/archivers/dpkg/files/patch-cputable
deleted file mode 100644
index d11109e4a53d..000000000000
--- a/archivers/dpkg/files/patch-cputable
+++ /dev/null
@@ -1,11 +0,0 @@
---- cputable.orig	2013-05-27 19:49:56.000000000 +0200
-+++ cputable	2013-05-27 19:50:22.000000000 +0200
-@@ -19,7 +19,7 @@
- i386		i486		(i[3456]86|pentium)	32	little
- ia64		ia64		ia64			64	little
- alpha		alpha		alpha.*			64	little
--amd64		x86_64		x86_64			64	little
-+amd64		x86_64		(x86_64|amd64)		64	little
- armeb		armeb		arm.*b			32	big
- arm		arm		arm.*			32	little
- arm64		aarch64		aarch64			64	little
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index 4f4635b70aa4..37d99f973fa6 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -29,6 +29,7 @@ include/dpkg/ar.h
 include/dpkg/arch.h
 include/dpkg/atomic-file.h
 include/dpkg/buffer.h
+include/dpkg/c-ctype.h
 include/dpkg/command.h
 include/dpkg/compress.h
 include/dpkg/deb-version.h
@@ -139,7 +140,6 @@ libexec/dpkg/methods/floppy/install
 libexec/dpkg/methods/floppy/names
 libexec/dpkg/methods/floppy/setup
 libexec/dpkg/methods/floppy/update
-libexec/dpkg/methods/ftp/README.mirrors.txt
 libexec/dpkg/methods/ftp/desc.ftp
 libexec/dpkg/methods/ftp/install
 libexec/dpkg/methods/ftp/names
@@ -161,6 +161,7 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/dpkg-checkbuilddeps.1.gz
 %%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
@@ -174,10 +175,12 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man1/dpkg-shlibdeps.1.gz
 %%NLS%%man/de/man1/dpkg-source.1.gz
 %%NLS%%man/de/man1/dpkg-split.1.gz
+%%NLS%%man/de/man1/dpkg-statoverride.1.gz
 %%NLS%%man/de/man1/dpkg-trigger.1.gz
 %%NLS%%man/de/man1/dpkg-vendor.1.gz
 %%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-control.5.gz
 %%NLS%%man/de/man5/deb-extra-override.5.gz
 %%NLS%%man/de/man5/deb-old.5.gz
@@ -193,67 +196,55 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/de/man5/deb.5.gz
 %%NLS%%man/de/man5/dpkg.cfg.5.gz
 %%NLS%%man/de/man5/dselect.cfg.5.gz
-%%NLS%%man/de/man8/dpkg-divert.8.gz
-%%NLS%%man/de/man8/dpkg-statoverride.8.gz
 %%NLS%%man/de/man8/start-stop-daemon.8.gz
-%%NLS%%man/de/man8/update-alternatives.8.gz
-%%NLS%%man/es/man1/dpkg-deb.1.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
 %%NLS%%man/es/man1/dpkg-name.1.gz
-%%NLS%%man/es/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/es/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/es/man1/dpkg-scansources.1.gz
-%%NLS%%man/es/man1/dpkg-shlibdeps.1.gz
-%%NLS%%man/es/man1/dpkg-source.1.gz
 %%NLS%%man/es/man1/dpkg-split.1.gz
 %%NLS%%man/es/man1/dpkg-trigger.1.gz
 %%NLS%%man/es/man1/dpkg-vendor.1.gz
-%%NLS%%man/es/man1/dpkg.1.gz
 %%NLS%%man/es/man1/dselect.1.gz
-%%NLS%%man/es/man5/deb-control.5.gz
+%%NLS%%man/es/man1/update-alternatives.1.gz
 %%NLS%%man/es/man5/deb-extra-override.5.gz
 %%NLS%%man/es/man5/deb-old.5.gz
 %%NLS%%man/es/man5/deb-origin.5.gz
 %%NLS%%man/es/man5/deb-override.5.gz
 %%NLS%%man/es/man5/deb-shlibs.5.gz
 %%NLS%%man/es/man5/deb-split.5.gz
-%%NLS%%man/es/man5/deb-src-control.5.gz
 %%NLS%%man/es/man5/deb-substvars.5.gz
-%%NLS%%man/es/man5/deb-symbols.5.gz
-%%NLS%%man/es/man5/deb-version.5.gz
 %%NLS%%man/es/man5/dpkg.cfg.5.gz
 %%NLS%%man/es/man5/dselect.cfg.5.gz
-%%NLS%%man/es/man8/dpkg-divert.8.gz
 %%NLS%%man/es/man8/start-stop-daemon.8.gz
-%%NLS%%man/es/man8/update-alternatives.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-checkbuilddeps.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
 %%NLS%%man/fr/man1/dpkg-mergechangelogs.1.gz
 %%NLS%%man/fr/man1/dpkg-name.1.gz
-%%NLS%%man/fr/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/fr/man1/dpkg-query.1.gz
 %%NLS%%man/fr/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/fr/man1/dpkg-scansources.1.gz
 %%NLS%%man/fr/man1/dpkg-shlibdeps.1.gz
-%%NLS%%man/fr/man1/dpkg-source.1.gz
 %%NLS%%man/fr/man1/dpkg-split.1.gz
+%%NLS%%man/fr/man1/dpkg-statoverride.1.gz
 %%NLS%%man/fr/man1/dpkg-trigger.1.gz
 %%NLS%%man/fr/man1/dpkg-vendor.1.gz
 %%NLS%%man/fr/man1/dpkg.1.gz
 %%NLS%%man/fr/man1/dselect.1.gz
-%%NLS%%man/fr/man5/deb-control.5.gz
+%%NLS%%man/fr/man1/update-alternatives.1.gz
 %%NLS%%man/fr/man5/deb-extra-override.5.gz
 %%NLS%%man/fr/man5/deb-old.5.gz
 %%NLS%%man/fr/man5/deb-origin.5.gz
@@ -268,10 +259,7 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/fr/man5/deb.5.gz
 %%NLS%%man/fr/man5/dpkg.cfg.5.gz
 %%NLS%%man/fr/man5/dselect.cfg.5.gz
-%%NLS%%man/fr/man8/dpkg-divert.8.gz
-%%NLS%%man/fr/man8/dpkg-statoverride.8.gz
 %%NLS%%man/fr/man8/start-stop-daemon.8.gz
-%%NLS%%man/fr/man8/update-alternatives.8.gz
 %%NLS%%man/hu/man5/dpkg.cfg.5.gz
 %%NLS%%man/hu/man5/dselect.cfg.5.gz
 %%NLS%%man/it/man1/dpkg-architecture.1.gz
@@ -282,16 +270,15 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/it/man1/dpkg-gencontrol.1.gz
 %%NLS%%man/it/man1/dpkg-maintscript-helper.1.gz
 %%NLS%%man/it/man1/dpkg-name.1.gz
-%%NLS%%man/it/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/it/man1/dpkg-query.1.gz
 %%NLS%%man/it/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/it/man1/dpkg-scansources.1.gz
-%%NLS%%man/it/man1/dpkg-source.1.gz
 %%NLS%%man/it/man1/dpkg-split.1.gz
+%%NLS%%man/it/man1/dpkg-statoverride.1.gz
 %%NLS%%man/it/man1/dpkg-vendor.1.gz
 %%NLS%%man/it/man1/dpkg.1.gz
 %%NLS%%man/it/man1/dselect.1.gz
-%%NLS%%man/it/man5/deb-control.5.gz
+%%NLS%%man/it/man1/update-alternatives.1.gz
 %%NLS%%man/it/man5/deb-extra-override.5.gz
 %%NLS%%man/it/man5/deb-old.5.gz
 %%NLS%%man/it/man5/deb-origin.5.gz
@@ -304,48 +291,38 @@ libexec/pkgconfig/libdpkg.pc
 %%NLS%%man/it/man5/deb.5.gz
 %%NLS%%man/it/man5/dpkg.cfg.5.gz
 %%NLS%%man/it/man5/dselect.cfg.5.gz
-%%NLS%%man/it/man8/dpkg-statoverride.8.gz
 %%NLS%%man/it/man8/start-stop-daemon.8.gz
-%%NLS%%man/it/man8/update-alternatives.8.gz
-%%NLS%%man/ja/man1/dpkg-deb.1.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
 %%NLS%%man/ja/man1/dpkg-name.1.gz
-%%NLS%%man/ja/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/ja/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/ja/man1/dpkg-scansources.1.gz
-%%NLS%%man/ja/man1/dpkg-shlibdeps.1.gz
-%%NLS%%man/ja/man1/dpkg-source.1.gz
 %%NLS%%man/ja/man1/dpkg-split.1.gz
 %%NLS%%man/ja/man1/dpkg-trigger.1.gz
 %%NLS%%man/ja/man1/dpkg-vendor.1.gz
-%%NLS%%man/ja/man1/dpkg.1.gz
 %%NLS%%man/ja/man1/dselect.1.gz
-%%NLS%%man/ja/man5/deb-control.5.gz
+%%NLS%%man/ja/man1/update-alternatives.1.gz
 %%NLS%%man/ja/man5/deb-extra-override.5.gz
 %%NLS%%man/ja/man5/deb-old.5.gz
 %%NLS%%man/ja/man5/deb-origin.5.gz
 %%NLS%%man/ja/man5/deb-override.5.gz
 %%NLS%%man/ja/man5/deb-shlibs.5.gz
 %%NLS%%man/ja/man5/deb-split.5.gz
-%%NLS%%man/ja/man5/deb-src-control.5.gz
 %%NLS%%man/ja/man5/deb-substvars.5.gz
-%%NLS%%man/ja/man5/deb-symbols.5.gz
-%%NLS%%man/ja/man5/deb-version.5.gz
 %%NLS%%man/ja/man5/dpkg.cfg.5.gz
 %%NLS%%man/ja/man5/dselect.cfg.5.gz
-%%NLS%%man/ja/man8/dpkg-divert.8.gz
 %%NLS%%man/ja/man8/start-stop-daemon.8.gz
-%%NLS%%man/ja/man8/update-alternatives.8.gz
 man/man1/dpkg-architecture.1.gz
 man/man1/dpkg-buildflags.1.gz
 man/man1/dpkg-buildpackage.1.gz
 man/man1/dpkg-checkbuilddeps.1.gz
 man/man1/dpkg-deb.1.gz
 man/man1/dpkg-distaddfile.1.gz
+man/man1/dpkg-divert.1.gz
 man/man1/dpkg-genchanges.1.gz
 man/man1/dpkg-gencontrol.1.gz
 man/man1/dpkg-gensymbols.1.gz
@@ -359,10 +336,12 @@ man/man1/dpkg-scansources.1.gz
 man/man1/dpkg-shlibdeps.1.gz
 man/man1/dpkg-source.1.gz
 man/man1/dpkg-split.1.gz
+man/man1/dpkg-statoverride.1.gz
 man/man1/dpkg-trigger.1.gz
 man/man1/dpkg-vendor.1.gz
 man/man1/dpkg.1.gz
 man/man1/dselect.1.gz
+man/man1/update-alternatives.1.gz
 man/man3/Dpkg.3.gz
 man/man3/Dpkg::BuildEnv.3.gz
 man/man3/Dpkg::BuildFlags.3.gz
@@ -415,67 +394,55 @@ man/man5/deb-version.5.gz
 man/man5/deb.5.gz
 man/man5/dpkg.cfg.5.gz
 man/man5/dselect.cfg.5.gz
-man/man8/dpkg-divert.8.gz
-man/man8/dpkg-statoverride.8.gz
 man/man8/start-stop-daemon.8.gz
-man/man8/update-alternatives.8.gz
-%%NLS%%man/pl/man1/dpkg-deb.1.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
 %%NLS%%man/pl/man1/dpkg-name.1.gz
-%%NLS%%man/pl/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/pl/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/pl/man1/dpkg-scansources.1.gz
-%%NLS%%man/pl/man1/dpkg-shlibdeps.1.gz
-%%NLS%%man/pl/man1/dpkg-source.1.gz
 %%NLS%%man/pl/man1/dpkg-split.1.gz
 %%NLS%%man/pl/man1/dpkg-trigger.1.gz
 %%NLS%%man/pl/man1/dpkg-vendor.1.gz
-%%NLS%%man/pl/man1/dpkg.1.gz
 %%NLS%%man/pl/man1/dselect.1.gz
-%%NLS%%man/pl/man5/deb-control.5.gz
+%%NLS%%man/pl/man1/update-alternatives.1.gz
 %%NLS%%man/pl/man5/deb-extra-override.5.gz
 %%NLS%%man/pl/man5/deb-old.5.gz
 %%NLS%%man/pl/man5/deb-origin.5.gz
 %%NLS%%man/pl/man5/deb-override.5.gz
 %%NLS%%man/pl/man5/deb-shlibs.5.gz
 %%NLS%%man/pl/man5/deb-split.5.gz
-%%NLS%%man/pl/man5/deb-src-control.5.gz
 %%NLS%%man/pl/man5/deb-substvars.5.gz
-%%NLS%%man/pl/man5/deb-symbols.5.gz
-%%NLS%%man/pl/man5/deb-version.5.gz
 %%NLS%%man/pl/man5/dpkg.cfg.5.gz
 %%NLS%%man/pl/man5/dselect.cfg.5.gz
-%%NLS%%man/pl/man8/dpkg-divert.8.gz
 %%NLS%%man/pl/man8/start-stop-daemon.8.gz
-%%NLS%%man/pl/man8/update-alternatives.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-checkbuilddeps.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
 %%NLS%%man/sv/man1/dpkg-mergechangelogs.1.gz
 %%NLS%%man/sv/man1/dpkg-name.1.gz
-%%NLS%%man/sv/man1/dpkg-parsechangelog.1.gz
 %%NLS%%man/sv/man1/dpkg-query.1.gz
 %%NLS%%man/sv/man1/dpkg-scanpackages.1.gz
 %%NLS%%man/sv/man1/dpkg-scansources.1.gz
 %%NLS%%man/sv/man1/dpkg-shlibdeps.1.gz
-%%NLS%%man/sv/man1/dpkg-source.1.gz
 %%NLS%%man/sv/man1/dpkg-split.1.gz
+%%NLS%%man/sv/man1/dpkg-statoverride.1.gz
 %%NLS%%man/sv/man1/dpkg-trigger.1.gz
 %%NLS%%man/sv/man1/dpkg-vendor.1.gz
 %%NLS%%man/sv/man1/dpkg.1.gz
 %%NLS%%man/sv/man1/dselect.1.gz
-%%NLS%%man/sv/man5/deb-control.5.gz
+%%NLS%%man/sv/man1/update-alternatives.1.gz
 %%NLS%%man/sv/man5/deb-extra-override.5.gz
 %%NLS%%man/sv/man5/deb-old.5.gz
 %%NLS%%man/sv/man5/deb-origin.5.gz
@@ -490,10 +457,7 @@ man/man8/update-alternatives.8.gz
 %%NLS%%man/sv/man5/deb.5.gz
 %%NLS%%man/sv/man5/dpkg.cfg.5.gz
 %%NLS%%man/sv/man5/dselect.cfg.5.gz
-%%NLS%%man/sv/man8/dpkg-divert.8.gz
-%%NLS%%man/sv/man8/dpkg-statoverride.8.gz
 %%NLS%%man/sv/man8/start-stop-daemon.8.gz
-%%NLS%%man/sv/man8/update-alternatives.8.gz
 sbin/start-stop-daemon
 %%DATADIR%%/abitable
 %%DATADIR%%/architecture.mk