Index: head/ports-mgmt/pkg/Makefile =================================================================== --- head/ports-mgmt/pkg/Makefile (revision 503130) +++ head/ports-mgmt/pkg/Makefile (revision 503131) @@ -1,91 +1,87 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.10.5 -PORTREVISION= 5 +DISTVERSION= 1.11.0 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt -MASTER_SITES= \ - http://files.etoilebsd.net/${PORTNAME}/ \ - LOCAL/portmgr \ - http://mirror.shatow.net/freebsd/${PORTNAME}/ \ +#MASTER_SITES= \ +# http://files.etoilebsd.net/${PORTNAME}/ \ +# LOCAL/portmgr \ +# http://mirror.shatow.net/freebsd/${PORTNAME}/ \ MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager LICENSE= BSD2CLAUSE +USE_GITHUB= yes +GH_ACCOUNT= freebsd + USE_LDCONFIG= yes -USES= libtool tar:xz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-maintainer-mode -INSTALL_TARGET= install-strip +HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 +CONFIGURE_ARGS= --mandir=${PREFIX}/man # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes CFLAGS+= -Wno-error OPTIONS_DEFINE= DOCS .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l .if exists(${PKG_BIN}) NB_NEWPKGS!= ${PKG_INFO} -aq | wc -l .else NB_NEWPKGS= 0 .endif # Only show the pre-everything notice if they have not already # converted any packages .if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 && !defined(UPGRADEPKG) pre-everything:: @${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \ ${ECHO_CMD} "installed with the old pkg_install tools."; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} "To switch to pkg:"; \ ${ECHO_CMD} " 1) Install ports-mgmt/pkg"; \ ${ECHO_CMD} " cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \ ${ECHO_CMD} " 2) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} ""; \ exit 1 .endif .endif .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS # Use the internal pkg instead, generally, unless this is a cross-build, # in which case that won't work. Hope for the best then. .if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif - -post-install: - @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ - ${STAGEDIR}${PREFIX}/lib/libpkg.a post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .include Index: head/ports-mgmt/pkg/distinfo =================================================================== --- head/ports-mgmt/pkg/distinfo (revision 503130) +++ head/ports-mgmt/pkg/distinfo (revision 503131) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518650836 -SHA256 (pkg-1.10.5.tar.xz) = c2e5ff8505a7f859fd579dc3974822575de8178868fd2497cec0ec18f06da041 -SIZE (pkg-1.10.5.tar.xz) = 2216560 +TIMESTAMP = 1559295992 +SHA256 (freebsd-pkg-1.11.0_GH0.tar.gz) = 0b85372a4c820eb639d0fb95e6225f90a9f817cb8bed6bc5b0b2eccaeafdb32f +SIZE (freebsd-pkg-1.11.0_GH0.tar.gz) = 3560696 Index: head/ports-mgmt/pkg/files/patch-1663 =================================================================== --- head/ports-mgmt/pkg/files/patch-1663 (revision 503130) +++ head/ports-mgmt/pkg/files/patch-1663 (nonexistent) @@ -1,28 +0,0 @@ -diff --git a/libpkg/pkg_jobs_conflicts.c b/libpkg/pkg_jobs_conflicts.c -index 886e100c..141c69f9 100644 ---- libpkg/pkg_jobs_conflicts.c.orig -+++ libpkg/pkg_jobs_conflicts.c -@@ -477,7 +477,8 @@ pkg_conflicts_check_chain_conflict(struct pkg_job_universe_item *it, - it->pkg->uid); - - if (p != NULL) { -- pkg_jobs_universe_process_item(j->universe, p, &cun); -+ if (pkg_jobs_universe_process_item(j->universe, p, &cun)) -+ continue; - assert(cun != NULL); - pkg_conflicts_register_chain(j, it, cun, fcur->path); - } -diff --git a/libpkg/pkg_jobs_universe.c b/libpkg/pkg_jobs_universe.c -index 1a5a2c72..725825ac 100644 ---- libpkg/pkg_jobs_universe.c.orig -+++ libpkg/pkg_jobs_universe.c -@@ -570,6 +570,9 @@ pkg_jobs_universe_process_item(struct pkg_jobs_universe *universe, struct pkg *p - * flag that means that we have already tried to check our universe - */ - rc = pkg_jobs_universe_add_pkg(universe, pkg, false, &found); -+ if (rc == EPKG_CONFLICT) -+ return (rc); -+ - if (result) - *result = found; - Property changes on: head/ports-mgmt/pkg/files/patch-1663 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/pkg/files/patch-src_Makefile.in =================================================================== --- head/ports-mgmt/pkg/files/patch-src_Makefile.in (revision 503130) +++ head/ports-mgmt/pkg/files/patch-src_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig 2018-02-14 23:08:02 UTC -+++ src/Makefile.in -@@ -619,7 +619,7 @@ pkg_static_LDADD = @OS_LDFLAGS@ $(pkg_OBJECTS) \ - $(top_builddir)/libpkg/libpkg_static.la \ - $(top_builddir)/compat/libbsd_compat.la @LIBJAIL_LIB@ \ - @LDNS_LIBS@ @OS_LIBS@ -larchive -lz -lutil -lbz2 -llzma -lssl \ -- -lcrypto -lm $(am__append_2) $(am__append_3) $(am__append_4) -+ -lpthread -lcrypto -lm $(am__append_2) $(am__append_3) $(am__append_4) - DYNPROG = pkg - @BUILD_STATIC_TRUE@pkg_static_LDFLAGS = -all-static - dist_sysconf_DATA = pkg.conf.sample Property changes on: head/ports-mgmt/pkg/files/patch-src_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/pkg/files/patch-javavmwrapper =================================================================== --- head/ports-mgmt/pkg/files/patch-javavmwrapper (revision 503130) +++ head/ports-mgmt/pkg/files/patch-javavmwrapper (nonexistent) @@ -1,34 +0,0 @@ -diff --git libpkg/pkg_add.c libpkg/pkg_add.c -index 87fb248..778336c 100644 ---- libpkg/pkg_add.c -+++ libpkg/pkg_add.c -@@ -859,14 +859,21 @@ pkg_add_cleanup_old(struct pkgdb *db, struct pkg *old, struct pkg *new, int flag - * Execute pre deinstall scripts - */ - if ((flags & PKG_ADD_NOSCRIPT) == 0) { -- if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) -- ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); -- else -- ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); -- if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) -- return (ret); -- else -- ret = EPKG_OK; -+ bool buggydeinstall = false; -+ if (strcmp(old->name, "javavmwrapper") == 0 && -+ (strcmp(old->version, "2.5") == 0 || -+ strcmp(old->version, "2.5_1") == 0)) -+ buggydeinstall = true; -+ if (!buggydeinstall) { -+ if ((flags & PKG_ADD_USE_UPGRADE_SCRIPTS) == PKG_ADD_USE_UPGRADE_SCRIPTS) -+ ret = pkg_script_run(old, PKG_SCRIPT_PRE_UPGRADE); -+ else -+ ret = pkg_script_run(old, PKG_SCRIPT_PRE_DEINSTALL); -+ if (ret != EPKG_OK && pkg_object_bool(pkg_config_get("DEVELOPER_MODE"))) -+ return (ret); -+ else -+ ret = EPKG_OK; -+ } - } - - /* Now remove files that no longer exist in the new package */ Property changes on: head/ports-mgmt/pkg/files/patch-javavmwrapper ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/pkg/files/patch-1702 =================================================================== --- head/ports-mgmt/pkg/files/patch-1702 (revision 503130) +++ head/ports-mgmt/pkg/files/patch-1702 (nonexistent) @@ -1,13 +0,0 @@ -diff --git a/libpkg/pkg.c b/libpkg/pkg.c -index 0c472b39..b4ee9ec3 100644 ---- libpkg/pkg.c -+++ libpkg/pkg.c -@@ -1668,7 +1668,7 @@ pkg_is_config_file(struct pkg *p, const char *path, - return (false); - - kh_find(pkg_config_files, p->config_files, path, *cfile); -- if (cfile == NULL) { -+ if (*cfile == NULL) { - *file = NULL; - return (false); - } Property changes on: head/ports-mgmt/pkg/files/patch-1702 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/pkg/files/patch-60666a1 =================================================================== --- head/ports-mgmt/pkg/files/patch-60666a1 (revision 503130) +++ head/ports-mgmt/pkg/files/patch-60666a1 (nonexistent) @@ -1,16 +0,0 @@ ---- libpkg/pkg_ports.c -+++ libpkg/pkg_ports.c -@@ -353,13 +353,6 @@ meta_file(struct plist *p, char *line, struct file_attr *a, bool is_config) - pkg_addconfig_file(p->pkg, path, content); - free(content); - } -- } else { -- if (is_config) { -- pkg_emit_error("Plist error, @config %s: not a regular " -- "file", line); -- free(buf); -- return (EPKG_FATAL); -- } - } - - if (S_ISDIR(st.st_mode) && Property changes on: head/ports-mgmt/pkg/files/patch-60666a1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/ports-mgmt/pkg/pkg-plist =================================================================== --- head/ports-mgmt/pkg/pkg-plist (revision 503130) +++ head/ports-mgmt/pkg/pkg-plist (revision 503131) @@ -1,56 +1,53 @@ etc/bash_completion.d/_pkg.bash etc/periodic/daily/411.pkg-backup etc/periodic/daily/490.status-pkg-changes etc/periodic/security/410.pkg-audit etc/periodic/security/460.pkg-checksum etc/periodic/weekly/400.status-pkg @sample etc/pkg.conf.sample include/pkg.h lib/libpkg.a lib/libpkg.so lib/libpkg.so.4 -lib/libpkg.so.4.0.0 libdata/pkgconfig/pkg.pc man/man3/pkg_printf.3.gz man/man3/pkg_repos.3.gz man/man5/pkg-repository.5.gz man/man5/pkg.conf.5.gz man/man8/pkg-add.8.gz man/man8/pkg-alias.8.gz man/man8/pkg-annotate.8.gz man/man8/pkg-audit.8.gz man/man8/pkg-autoremove.8.gz man/man8/pkg-backup.8.gz man/man8/pkg-check.8.gz man/man8/pkg-clean.8.gz man/man8/pkg-config.8.gz -man/man8/pkg-convert.8.gz man/man8/pkg-create.8.gz man/man8/pkg-delete.8.gz man/man8/pkg-fetch.8.gz man/man8/pkg-info.8.gz man/man8/pkg-install.8.gz man/man8/pkg-lock.8.gz man/man8/pkg-query.8.gz man/man8/pkg-register.8.gz man/man8/pkg-remove.8.gz man/man8/pkg-repo.8.gz man/man8/pkg-rquery.8.gz man/man8/pkg-search.8.gz man/man8/pkg-set.8.gz man/man8/pkg-shell.8.gz man/man8/pkg-shlib.8.gz man/man8/pkg-ssh.8.gz man/man8/pkg-static.8.gz man/man8/pkg-stats.8.gz man/man8/pkg-unlock.8.gz man/man8/pkg-update.8.gz man/man8/pkg-updating.8.gz man/man8/pkg-upgrade.8.gz man/man8/pkg-version.8.gz man/man8/pkg-which.8.gz man/man8/pkg.8.gz sbin/pkg sbin/pkg-static -sbin/pkg2ng share/zsh/site-functions/_pkg