aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/dpkg/Makefile6
-rw-r--r--archivers/dpkg/Makefile.man29
-rw-r--r--archivers/dpkg/distinfo4
-rw-r--r--archivers/dpkg/files/patch-dselect_Makefile.in16
-rw-r--r--archivers/dpkg/pkg-plist19
5 files changed, 30 insertions, 44 deletions
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index af9a407a8f29..2e67838ae066 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dpkg
-PORTVERSION= 1.16.10
-PORTREVISION= 1
+PORTVERSION= 1.17.1
CATEGORIES= archivers sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= dpkg_${PORTVERSION}
@@ -20,7 +19,7 @@ RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar \
USE_XZ= yes
GNU_CONFIGURE= yes
-USES= gmake iconv perl5
+USES= gmake iconv perl5 pkgconfig
WRKSRC= ${WRKDIR}/dpkg-${PORTVERSION}
DPKGDIR?= /var/db/dpkg
@@ -57,7 +56,6 @@ post-patch:
${WRKSRC}/scripts/Dpkg/Checksums.pm
post-install:
- ${MV} ${PREFIX}/sbin/install-info ${PREFIX}/sbin/dpkg-install-info
.for f in available diversions statoverride status
${TOUCH} ${DPKGDIR}/${f}
.endfor
diff --git a/archivers/dpkg/Makefile.man b/archivers/dpkg/Makefile.man
index 4cebc39df5be..ffa6909d939b 100644
--- a/archivers/dpkg/Makefile.man
+++ b/archivers/dpkg/Makefile.man
@@ -40,7 +40,9 @@ MAN3_EN= Dpkg::BuildEnv.3 \
Dpkg::Control.3 \
Dpkg::Control::Changelog.3 \
Dpkg::Control::Fields.3 \
+ Dpkg::Control::FieldsCore.3 \
Dpkg::Control::Hash.3 \
+ Dpkg::Control::HashCore.3 \
Dpkg::Control::Info.3 \
Dpkg::Control::Types.3 \
Dpkg::Deps.3 \
@@ -78,8 +80,7 @@ MAN8_EN= dpkg-divert.8 \
update-alternatives.8
.if ${PORT_OPTIONS:MNLS}
-MAN1_DE= dpkg-architecture.1 \
- dpkg-buildpackage.1 \
+MAN1_DE= dpkg-buildpackage.1 \
dpkg-checkbuilddeps.1 \
dpkg-deb.1 \
dpkg-distaddfile.1 \
@@ -110,12 +111,10 @@ MAN5_DE= deb-control.5 \
dselect.cfg.5
MAN8_DE= dpkg-divert.8 \
- dpkg-statoverride.8 \
start-stop-daemon.8 \
update-alternatives.8
-MAN1_FR= dpkg-architecture.1 \
- dpkg-buildpackage.1 \
+MAN1_FR= dpkg-buildpackage.1 \
dpkg-checkbuilddeps.1 \
dpkg-deb.1 \
dpkg-distaddfile.1 \
@@ -146,23 +145,26 @@ MAN5_FR= deb-control.5 \
dselect.cfg.5
MAN8_FR= dpkg-divert.8 \
- dpkg-statoverride.8 \
start-stop-daemon.8 \
update-alternatives.8
MAN5_HU= dpkg.cfg.5 \
dselect.cfg.5
-MAN1_JA= dpkg-architecture.1 \
- dpkg-buildflags.1 \
- dpkg-buildpackage.1 \
+MAN1_JA= dpkg-buildpackage.1 \
+ dpkg-checkbuilddeps.1 \
dpkg-deb.1 \
dpkg-distaddfile.1 \
+ dpkg-genchanges.1 \
+ dpkg-gencontrol.1 \
dpkg-gensymbols.1 \
dpkg-mergechangelogs.1 \
dpkg-name.1 \
+ dpkg-parsechangelog.1 \
+ dpkg-query.1 \
dpkg-scanpackages.1 \
dpkg-scansources.1 \
+ dpkg-shlibdeps.1 \
dpkg-source.1 \
dpkg-split.1 \
dpkg-trigger.1 \
@@ -187,12 +189,10 @@ MAN5_JA= deb-control.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 \
+MAN1_PL= dpkg-buildpackage.1 \
dpkg-checkbuilddeps.1 \
dpkg-deb.1 \
dpkg-distaddfile.1 \
@@ -222,12 +222,10 @@ MAN5_PL= deb-control.5 \
dselect.cfg.5
MAN8_PL= dpkg-divert.8 \
- dpkg-statoverride.8 \
start-stop-daemon.8 \
update-alternatives.8
-MAN1_SV= dpkg-architecture.1 \
- dpkg-buildpackage.1 \
+MAN1_SV= dpkg-buildpackage.1 \
dpkg-checkbuilddeps.1 \
dpkg-deb.1 \
dpkg-distaddfile.1 \
@@ -258,7 +256,6 @@ MAN5_SV= deb-control.5 \
dselect.cfg.5
MAN8_SV= dpkg-divert.8 \
- dpkg-statoverride.8 \
start-stop-daemon.8 \
update-alternatives.8
.endif
diff --git a/archivers/dpkg/distinfo b/archivers/dpkg/distinfo
index 521b80921a36..b3899b8676de 100644
--- a/archivers/dpkg/distinfo
+++ b/archivers/dpkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpkg_1.16.10.tar.xz) = aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2
-SIZE (dpkg_1.16.10.tar.xz) = 3703340
+SHA256 (dpkg_1.17.1.tar.xz) = 8912ea77bc9c14297c0a340f5f461fbd212582ce814e1805d1d0436ca885e3a1
+SIZE (dpkg_1.17.1.tar.xz) = 3785620
diff --git a/archivers/dpkg/files/patch-dselect_Makefile.in b/archivers/dpkg/files/patch-dselect_Makefile.in
index b6a429b94787..e32edfa208a9 100644
--- a/archivers/dpkg/files/patch-dselect_Makefile.in
+++ b/archivers/dpkg/files/patch-dselect_Makefile.in
@@ -1,16 +1,6 @@
---- dselect/Makefile.in.orig 2011-11-10 07:23:41.000000000 +0100
-+++ dselect/Makefile.in 2012-03-16 22:18:30.000000000 +0100
-@@ -67,8 +67,7 @@
- pkgsublist.$(OBJEXT) pkgtop.$(OBJEXT)
- dselect_OBJECTS = $(am_dselect_OBJECTS)
- am__DEPENDENCIES_1 =
--dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/dpkg/libdpkg.a \
-- ../lib/compat/libcompat.a $(am__DEPENDENCIES_1)
-+dselect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ../lib/dpkg/libdpkg.a ../lib/compat/libcompat.a
- DEFAULT_INCLUDES =
- depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
- am__depfiles_maybe = depfiles
-@@ -320,11 +319,7 @@
+--- dselect/Makefile.in.orig 2013-07-28 14:55:57.000000000 +0200
++++ dselect/Makefile.in 2013-09-07 13:26:28.000000000 +0200
+@@ -403,11 +403,7 @@
pkgsublist.cc \
pkgtop.cc
diff --git a/archivers/dpkg/pkg-plist b/archivers/dpkg/pkg-plist
index a0d4b00012d1..c8d1b3909495 100644
--- a/archivers/dpkg/pkg-plist
+++ b/archivers/dpkg/pkg-plist
@@ -63,7 +63,6 @@ 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
@@ -82,7 +81,9 @@ include/dpkg/version.h
%%SITE_PERL%%/Dpkg/Control.pm
%%SITE_PERL%%/Dpkg/Control/Changelog.pm
%%SITE_PERL%%/Dpkg/Control/Fields.pm
+%%SITE_PERL%%/Dpkg/Control/FieldsCore.pm
%%SITE_PERL%%/Dpkg/Control/Hash.pm
+%%SITE_PERL%%/Dpkg/Control/HashCore.pm
%%SITE_PERL%%/Dpkg/Control/Info.pm
%%SITE_PERL%%/Dpkg/Control/Types.pm
%%SITE_PERL%%/Dpkg/Deps.pm
@@ -105,20 +106,22 @@ include/dpkg/version.h
%%SITE_PERL%%/Dpkg/Source/Package.pm
%%SITE_PERL%%/Dpkg/Source/Package/V1.pm
%%SITE_PERL%%/Dpkg/Source/Package/V2.pm
-%%SITE_PERL%%/Dpkg/Source/Package/V3/bzr.pm
-%%SITE_PERL%%/Dpkg/Source/Package/V3/custom.pm
-%%SITE_PERL%%/Dpkg/Source/Package/V3/git.pm
-%%SITE_PERL%%/Dpkg/Source/Package/V3/native.pm
-%%SITE_PERL%%/Dpkg/Source/Package/V3/quilt.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/Bzr.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/Custom.pm
+%%SITE_PERL%%/Dpkg/Source/Package/V3/Git.pm
+%%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/Util.pm
%%SITE_PERL%%/Dpkg/Vars.pm
%%SITE_PERL%%/Dpkg/Vendor.pm
%%SITE_PERL%%/Dpkg/Vendor/Debian.pm
%%SITE_PERL%%/Dpkg/Vendor/Default.pm
%%SITE_PERL%%/Dpkg/Vendor/Ubuntu.pm
%%SITE_PERL%%/Dpkg/Version.pm
+%%SITE_PERL%%/Dselect/Ftp.pm
libexec/dpkg/methods/disk/desc.cdrom
libexec/dpkg/methods/disk/desc.harddisk
libexec/dpkg/methods/disk/desc.mounted
@@ -148,7 +151,6 @@ libexec/dpkg/methods/multicd/update
libexec/dpkg/parsechangelog/debian
libexec/libdpkg.a
libexec/pkgconfig/libdpkg.pc
-sbin/dpkg-install-info
sbin/start-stop-daemon
%%DATADIR%%/abitable
%%DATADIR%%/architecture.mk
@@ -283,6 +285,7 @@ sbin/start-stop-daemon
@dirrm libexec/dpkg/methods/disk
@dirrm libexec/dpkg/methods
@dirrm libexec/dpkg
+@dirrm %%SITE_PERL%%/Dselect
@dirrm %%SITE_PERL%%/Dpkg/Vendor
@dirrm %%SITE_PERL%%/Dpkg/Source/Package/V3
@dirrm %%SITE_PERL%%/Dpkg/Source/Package
@@ -294,8 +297,6 @@ sbin/start-stop-daemon
@dirrm %%SITE_PERL%%/Dpkg/Changelog/Entry
@dirrm %%SITE_PERL%%/Dpkg/Changelog
@dirrm %%SITE_PERL%%/Dpkg
-@dirrm %%SITE_PERL%%/Debian/Dselect
-@dirrm %%SITE_PERL%%/Debian
@dirrm include/dpkg
@dirrmtry etc/dpkg/dselect.cfg.d
@dirrmtry etc/dpkg/dpkg.cfg.d