- Update to version 1.16.10

- Sort plist
- Trim Makefile header

7 files changed, 169 insertions, 128 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 9f9b8c953079..e144dd4c4aa9 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	dpkg
-# Date created:		1 April 2003
-# Whom:			Hye-Shik Chang <perky@FreeBSD.org>
-#
+# Created by: Hye-Shik Chang <perky@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dpkg
-PORTVERSION=	1.15.8.12
+PORTVERSION=	1.16.10
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	dpkg_${PORTVERSION}
@@ -19,8 +16,8 @@ BUILD_DEPENDS=	po4a:${PORTSDIR}/textproc/po4a
 RUN_DEPENDS=	gmd5sum:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch
 
-USES=	iconv
-USE_BZIP2=	yes
+USES=		iconv
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -52,7 +49,8 @@ PLIST_SUB+=	NLS="@comment "
 .include "Makefile.man"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|ncursesw/||g' ${WRKSRC}/dselect/main.cc
+	@${REINPLACE_CMD} 's|-t$$host|-t${ARCH}-freebsd|g' \
+		${WRKSRC}/configure
 
 post-install:
 	${MV} ${PREFIX}/sbin/install-info ${PREFIX}/sbin/dpkg-install-info
diff --git a/archivers/dpkg/Makefile.man b/archivers/dpkg/Makefile.man
index 97647a0ed701..4cebc39df5be 100644
--- a/archivers/dpkg/Makefile.man
+++ b/archivers/dpkg/Makefile.man
@@ -24,7 +24,8 @@ MAN1_EN=	dpkg-architecture.1 \
 		dpkg.1 \
 		dselect.1
 
-MAN3_EN=	Dpkg::BuildFlags.3 \
+MAN3_EN=	Dpkg::BuildEnv.3 \
+		Dpkg::BuildFlags.3 \
 		Dpkg::BuildOptions.3 \
 		Dpkg::Changelog.3 \
 		Dpkg::Changelog::Debian.3 \
@@ -47,6 +48,7 @@ MAN3_EN=	Dpkg::BuildFlags.3 \
 		Dpkg::Index.3 \
 		Dpkg::Interface::Storable.3 \
 		Dpkg::Path.3 \
+		Dpkg::Source::Package.3 \
 		Dpkg::Substvars.3 \
 		Dpkg::Vendor.3 \
 		Dpkg::Vendor::Debian.3 \
@@ -56,10 +58,12 @@ MAN3_EN=	Dpkg::BuildFlags.3 \
 
 MAN5_EN=	deb-control.5 \
 		deb-extra-override.5 \
+		deb-origin.5 \
 		deb-old.5 \
 		deb-override.5 \
 		deb-shlibs.5 \
 		deb-split.5 \
+		deb-src-control.5 \
 		deb-substvars.5 \
 		deb-symbols.5 \
 		deb-triggers.5 \
@@ -149,9 +153,43 @@ MAN8_FR=	dpkg-divert.8 \
 MAN5_HU=	dpkg.cfg.5 \
 		dselect.cfg.5
 
-MAN1_JA=	dselect.1
+MAN1_JA=	dpkg-architecture.1 \
+		dpkg-buildflags.1 \
+		dpkg-buildpackage.1 \
+		dpkg-deb.1 \
+		dpkg-distaddfile.1 \
+		dpkg-gensymbols.1 \
+		dpkg-mergechangelogs.1 \
+		dpkg-name.1 \
+		dpkg-scanpackages.1 \
+		dpkg-scansources.1 \
+		dpkg-source.1 \
+		dpkg-split.1 \
+		dpkg-trigger.1 \
+		dpkg-vendor.1 \
+		dpkg.1 \
+		dselect.1
 
-MAN5_JA=	deb-old.5
+MAN5_JA=	deb-control.5 \
+		deb-extra-override.5 \
+		deb-old.5 \
+		deb-origin.5 \
+		deb-override.5 \
+		deb-shlibs.5 \
+		deb-split.5 \
+		deb-src-control.5 \
+		deb-substvars.5 \
+		deb-symbols.5 \
+		deb-triggers.5 \
+		deb-version.5 \
+		deb.5 \
+		dpkg.cfg.5 \
+		dselect.cfg.5
+
+MAN8_JA=	dpkg-divert.8 \
+		dpkg-statoverride.8 \
+		start-stop-daemon.8 \
+		update-alternatives.8
 
 MAN1_PL=	dpkg-architecture.1 \
 		dpkg-buildpackage.1 \
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index 1c2571f77dcf..521b80921a36 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.15.8.12.tar.bz2) = 55f296929c35e1105e0d83bdcfe14f699f8acf30c30060d88869379706af482a
-SIZE (dpkg_1.15.8.12.tar.bz2) = 5257258
+SHA256 (dpkg_1.16.10.tar.xz) = aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2
+SIZE (dpkg_1.16.10.tar.xz) = 3703340
diff --git a/archivers/dpkg/files/patch-configure b/archivers/dpkg/files/patch-configure
index b25b9919e76b..e4ab16a634ed 100644
--- a/archivers/dpkg/files/patch-configure
+++ b/archivers/dpkg/files/patch-configure
@@ -1,12 +1,15 @@
---- configure.orig	2012-03-16 20:22:59.000000000 +0100
-+++ configure	2012-03-16 20:23:12.000000000 +0100
-@@ -8180,9 +8180,6 @@
- $as_echo "no" >&6; }
+--- configure.orig	2013-05-08 20:39:56.000000000 +0200
++++ configure	2013-05-08 20:41:01.000000000 +0200
+@@ -8271,12 +8271,6 @@
+ if test "$PERL" = "no" || test ! -x "$PERL"; then
+   as_fn_error $? "cannot find the Perl interpreter" "$LINENO" 5
  fi
- 
+-# Let the user override the variable.
+-if test -z "$PERL_LIBDIR"; then
 -PERL_LIBDIR=$($PERL -MConfig -e 'my $r = $Config{vendorlibexp};
 -                                 $r =~ s/$Config{vendorprefixexp}/\$(prefix)/;
 -                                 print $r')
+-fi
+ 
  
  for ac_prog in pod2man
- do
diff --git a/archivers/dpkg/files/patch-cputable b/archivers/dpkg/files/patch-cputable
new file mode 100644
index 000000000000..d11109e4a53d
--- /dev/null
+++ b/archivers/dpkg/files/patch-cputable
@@ -0,0 +1,11 @@
+--- 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/files/patch-utils_start-stop-daemon.c b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
index c67de394d63e..9077d4e2152c 100644
--- a/archivers/dpkg/files/patch-utils_start-stop-daemon.c
+++ b/archivers/dpkg/files/patch-utils_start-stop-daemon.c
@@ -1,6 +1,6 @@
---- utils/start-stop-daemon.c.orig	2011-11-10 07:17:51.000000000 +0100
-+++ utils/start-stop-daemon.c	2012-03-16 20:31:14.000000000 +0100
-@@ -59,6 +59,7 @@
+--- utils/start-stop-daemon.c.orig	2013-03-08 17:45:46.000000000 +0100
++++ utils/start-stop-daemon.c	2013-05-08 20:44:18.000000000 +0200
+@@ -55,6 +55,7 @@
  #endif
  
  #if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
@@ -8,16 +8,7 @@
  #include <sys/param.h>
  #include <sys/proc.h>
  
-@@ -989,7 +990,7 @@
- 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
- 	if (kp == NULL)
- 		errx(1, "%s", kvm_geterr(kd));
--	pidexec = (&kp->kp_proc)->p_comm;
-+	pidexec = kp->ki_paddr->p_comm;
- 	if (strlen(name) != strlen(pidexec))
- 		return false;
- 	return (strcmp(name, pidexec) == 0) ? 1 : 0;
-@@ -1043,8 +1044,8 @@
+@@ -1164,8 +1165,8 @@
  	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
  	if (kp == NULL)
  		errx(1, "%s", kvm_geterr(kd));
@@ -28,3 +19,12 @@
  		         &proc_uid, sizeof(uid_t));
  	else
  		return false;
+@@ -1253,7 +1254,7 @@
+ 	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
+ 	if (kp == NULL)
+ 		errx(1, "%s", kvm_geterr(kd));
+-	process_name = (&kp->kp_proc)->p_comm;
++	process_name = kp->ki_paddr->p_comm;
+ 	if (strlen(name) != strlen(process_name))
+ 		return false;
+ 	return (strcmp(name, process_name) == 0);
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index 7e3ccb8f5681..a0d4b00012d1 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -1,15 +1,78 @@
-%%DATADIR%%/cputable
-%%DATADIR%%/ostable
-%%DATADIR%%/triplettable
+bin/dpkg
+bin/dpkg-architecture
+bin/dpkg-buildflags
+bin/dpkg-buildpackage
+bin/dpkg-checkbuilddeps
+bin/dpkg-deb
+bin/dpkg-distaddfile
+bin/dpkg-divert
+bin/dpkg-genchanges
+bin/dpkg-gencontrol
+bin/dpkg-gensymbols
+bin/dpkg-maintscript-helper
+bin/dpkg-mergechangelogs
+bin/dpkg-name
+bin/dpkg-parsechangelog
+bin/dpkg-query
+bin/dpkg-scanpackages
+bin/dpkg-scansources
+bin/dpkg-shlibdeps
+bin/dpkg-source
+bin/dpkg-split
+bin/dpkg-statoverride
+bin/dpkg-trigger
+bin/dpkg-vendor
+bin/dselect
+bin/update-alternatives
+etc/alternatives/README
+include/dpkg/ar.h
+include/dpkg/arch.h
+include/dpkg/atomic-file.h
+include/dpkg/buffer.h
+include/dpkg/command.h
+include/dpkg/compress.h
+include/dpkg/deb-version.h
+include/dpkg/debug.h
+include/dpkg/dir.h
+include/dpkg/dpkg-db.h
+include/dpkg/dpkg.h
+include/dpkg/ehandle.h
+include/dpkg/error.h
+include/dpkg/fdio.h
+include/dpkg/file.h
+include/dpkg/glob.h
+include/dpkg/macros.h
+include/dpkg/namevalue.h
+include/dpkg/options.h
+include/dpkg/parsedump.h
+include/dpkg/path.h
+include/dpkg/pkg-array.h
+include/dpkg/pkg-format.h
+include/dpkg/pkg-list.h
+include/dpkg/pkg-queue.h
+include/dpkg/pkg-show.h
+include/dpkg/pkg-spec.h
+include/dpkg/pkg.h
+include/dpkg/progname.h
+include/dpkg/progress.h
+include/dpkg/report.h
+include/dpkg/string.h
+include/dpkg/subproc.h
+include/dpkg/tarfn.h
+include/dpkg/trigdeferred.h
+include/dpkg/triglib.h
+include/dpkg/varbuf.h
+include/dpkg/version.h
 %%SITE_PERL%%/Debian/Dselect/Ftp.pm
 %%SITE_PERL%%/Dpkg.pm
 %%SITE_PERL%%/Dpkg/Arch.pm
+%%SITE_PERL%%/Dpkg/BuildEnv.pm
 %%SITE_PERL%%/Dpkg/BuildFlags.pm
 %%SITE_PERL%%/Dpkg/BuildOptions.pm
 %%SITE_PERL%%/Dpkg/Changelog.pm
 %%SITE_PERL%%/Dpkg/Changelog/Debian.pm
-%%SITE_PERL%%/Dpkg/Changelog/Entry/Debian.pm
 %%SITE_PERL%%/Dpkg/Changelog/Entry.pm
+%%SITE_PERL%%/Dpkg/Changelog/Entry/Debian.pm
 %%SITE_PERL%%/Dpkg/Changelog/Parse.pm
 %%SITE_PERL%%/Dpkg/Checksums.pm
 %%SITE_PERL%%/Dpkg/Compression.pm
@@ -25,10 +88,12 @@
 %%SITE_PERL%%/Dpkg/Deps.pm
 %%SITE_PERL%%/Dpkg/ErrorHandling.pm
 %%SITE_PERL%%/Dpkg/Exit.pm
+%%SITE_PERL%%/Dpkg/File.pm
 %%SITE_PERL%%/Dpkg/Gettext.pm
 %%SITE_PERL%%/Dpkg/IPC.pm
 %%SITE_PERL%%/Dpkg/Index.pm
 %%SITE_PERL%%/Dpkg/Interface/Storable.pm
+%%SITE_PERL%%/Dpkg/Package.pm
 %%SITE_PERL%%/Dpkg/Path.pm
 %%SITE_PERL%%/Dpkg/Shlibs.pm
 %%SITE_PERL%%/Dpkg/Shlibs/Cppfilt.pm
@@ -46,6 +111,7 @@
 %%SITE_PERL%%/Dpkg/Source/Package/V3/native.pm
 %%SITE_PERL%%/Dpkg/Source/Package/V3/quilt.pm
 %%SITE_PERL%%/Dpkg/Source/Patch.pm
+%%SITE_PERL%%/Dpkg/Source/Quilt.pm
 %%SITE_PERL%%/Dpkg/Substvars.pm
 %%SITE_PERL%%/Dpkg/Vars.pm
 %%SITE_PERL%%/Dpkg/Vendor.pm
@@ -53,58 +119,6 @@
 %%SITE_PERL%%/Dpkg/Vendor/Default.pm
 %%SITE_PERL%%/Dpkg/Vendor/Ubuntu.pm
 %%SITE_PERL%%/Dpkg/Version.pm
-bin/dpkg
-bin/dpkg-architecture
-bin/dpkg-buildflags
-bin/dpkg-buildpackage
-bin/dpkg-checkbuilddeps
-bin/dpkg-deb
-bin/dpkg-distaddfile
-bin/dpkg-divert
-bin/dpkg-genchanges
-bin/dpkg-gencontrol
-bin/dpkg-gensymbols
-bin/dpkg-maintscript-helper
-bin/dpkg-mergechangelogs
-bin/dpkg-name
-bin/dpkg-parsechangelog
-bin/dpkg-query
-bin/dpkg-scanpackages
-bin/dpkg-scansources
-bin/dpkg-shlibdeps
-bin/dpkg-source
-bin/dpkg-split
-bin/dpkg-statoverride
-bin/dpkg-vendor
-bin/dpkg-trigger
-bin/dselect
-bin/update-alternatives
-etc/alternatives/README
-include/dpkg/ar.h
-include/dpkg/buffer.h
-include/dpkg/command.h
-include/dpkg/compress.h
-include/dpkg/dir.h
-include/dpkg/dpkg.h
-include/dpkg/dpkg-db.h
-include/dpkg/file.h
-include/dpkg/macros.h
-include/dpkg/myopt.h
-include/dpkg/parsedump.h
-include/dpkg/path.h
-include/dpkg/pkg.h
-include/dpkg/pkg-array.h
-include/dpkg/pkg-format.h
-include/dpkg/pkg-list.h
-include/dpkg/pkg-queue.h
-include/dpkg/pkg-show.h
-include/dpkg/progress.h
-include/dpkg/string.h
-include/dpkg/subproc.h
-include/dpkg/tarfn.h
-include/dpkg/trigdeferred.h
-include/dpkg/triglib.h
-include/dpkg/varbuf.h
 libexec/dpkg/methods/disk/desc.cdrom
 libexec/dpkg/methods/disk/desc.harddisk
 libexec/dpkg/methods/disk/desc.mounted
@@ -118,10 +132,10 @@ libexec/dpkg/methods/floppy/install
 libexec/dpkg/methods/floppy/names
 libexec/dpkg/methods/floppy/setup
 libexec/dpkg/methods/floppy/update
-libexec/dpkg/methods/ftp/names
 libexec/dpkg/methods/ftp/README.mirrors.txt
 libexec/dpkg/methods/ftp/desc.ftp
 libexec/dpkg/methods/ftp/install
+libexec/dpkg/methods/ftp/names
 libexec/dpkg/methods/ftp/setup
 libexec/dpkg/methods/ftp/update
 libexec/dpkg/methods/multicd/desc.multi_cd
@@ -134,40 +148,17 @@ libexec/dpkg/methods/multicd/update
 libexec/dpkg/parsechangelog/debian
 libexec/libdpkg.a
 libexec/pkgconfig/libdpkg.pc
-%%NLS%%@dirrmtry man/sv/man8
-%%NLS%%@dirrmtry man/sv/man5
-%%NLS%%@dirrmtry man/sv/man1
-%%NLS%%@dirrmtry man/sv
-%%NLS%%@dirrmtry man/ru/man8
-%%NLS%%@dirrmtry man/ru/man5
-%%NLS%%@dirrmtry man/ru/man1
-%%NLS%%@dirrmtry man/ru
-%%NLS%%@dirrmtry man/pt_BR/man1
-%%NLS%%@dirrmtry man/pt_BR/man5
-%%NLS%%@dirrmtry man/pt_BR/man8
-%%NLS%%@dirrmtry man/pt_BR
-%%NLS%%@dirrmtry man/pl/man8
-%%NLS%%@dirrmtry man/pl/man5
-%%NLS%%@dirrmtry man/pl/man1
-%%NLS%%@dirrmtry man/pl
-%%NLS%%@dirrmtry man/hu/man8
-%%NLS%%@dirrmtry man/hu/man5
-%%NLS%%@dirrmtry man/fr/man1
-%%NLS%%@dirrmtry man/fr/man8
-%%NLS%%@dirrmtry man/fr/man5
-%%NLS%%@dirrmtry man/fr
-%%NLS%%@dirrmtry man/es/man8
-%%NLS%%@dirrmtry man/es/man5
-%%NLS%%@dirrmtry man/es/man1
-%%NLS%%@dirrmtry man/es
-%%NLS%%@dirrmtry man/de/man8
-%%NLS%%@dirrmtry man/de/man5
-%%NLS%%@dirrmtry man/de/man1
-%%NLS%%@dirrmtry man/de
-%%NLS%%@dirrmtry man/hu/man1
-%%NLS%%@dirrmtry man/hu
 sbin/dpkg-install-info
 sbin/start-stop-daemon
+%%DATADIR%%/abitable
+%%DATADIR%%/architecture.mk
+%%DATADIR%%/buildflags.mk
+%%DATADIR%%/cputable
+%%DATADIR%%/default.mk
+%%DATADIR%%/ostable
+%%DATADIR%%/pkg-info.mk
+%%DATADIR%%/triplettable
+%%DATADIR%%/vendor.mk
 %%NLS%%share/locale/ast/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/dselect.mo
@@ -185,8 +176,8 @@ sbin/start-stop-daemon
 %%NLS%%share/locale/el/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/es/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dpkg-dev.mo
+%%NLS%%share/locale/es/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dselect.mo
 %%NLS%%share/locale/et/LC_MESSAGES/dpkg.mo
 %%NLS%%share/locale/et/LC_MESSAGES/dselect.mo
@@ -283,6 +274,7 @@ sbin/start-stop-daemon
 %%NLS%%@dirrmtry share/locale/ca
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
+@dirrm %%DATADIR%%
 @dirrm libexec/pkgconfig
 @dirrm libexec/dpkg/parsechangelog
 @dirrm libexec/dpkg/methods/multicd
@@ -291,11 +283,6 @@ sbin/start-stop-daemon
 @dirrm libexec/dpkg/methods/disk
 @dirrm libexec/dpkg/methods
 @dirrm libexec/dpkg
-@dirrm include/dpkg
-@dirrmtry etc/dpkg/dselect.cfg.d
-@dirrmtry etc/dpkg/dpkg.cfg.d
-@dirrmtry etc/dpkg
-@dirrmtry etc/alternatives
 @dirrm %%SITE_PERL%%/Dpkg/Vendor
 @dirrm %%SITE_PERL%%/Dpkg/Source/Package/V3
 @dirrm %%SITE_PERL%%/Dpkg/Source/Package
@@ -309,7 +296,11 @@ sbin/start-stop-daemon
 @dirrm %%SITE_PERL%%/Dpkg
 @dirrm %%SITE_PERL%%/Debian/Dselect
 @dirrm %%SITE_PERL%%/Debian
-@dirrm %%DATADIR%%
+@dirrm include/dpkg
+@dirrmtry etc/dpkg/dselect.cfg.d
+@dirrmtry etc/dpkg/dpkg.cfg.d
+@dirrmtry etc/dpkg
+@dirrmtry etc/alternatives
 @cwd /
 @dirrmtry %%DPKGDIR%%/updates
 @dirrmtry %%DPKGDIR%%/parts