Index: head/ports-mgmt/pkg/Makefile =================================================================== --- head/ports-mgmt/pkg/Makefile (revision 374396) +++ head/ports-mgmt/pkg/Makefile (revision 374397) @@ -1,83 +1,82 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.3.8 -PORTREVISION= 3 +DISTVERSION= 1.4.0 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ - LOCAL/portmgr \ http://files.etoilebsd.net/${PORTNAME}/ \ + LOCAL/portmgr \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ MAINTAINER= portmgr@FreeBSD.org COMMENT= Package manager LICENSE= BSD2CLAUSE USES= tar:xz uidfix # Disable CCACHE support because of the chicken/egg problem pkg should always # With no dependency at all NO_CCACHE= yes USE_LDCONFIG= yes USES= libtool tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-maintainer-mode INSTALL_TARGET= install-strip # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKG) .if ${WITH_PKG} == devel NO_LATEST_LINK= yes 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 PKG_BIN= ${WRKSRC}/src/pkg-static post-install: @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ ${STAGEDIR}${PREFIX}/lib/libpkg.a .include Index: head/ports-mgmt/pkg/distinfo =================================================================== --- head/ports-mgmt/pkg/distinfo (revision 374396) +++ head/ports-mgmt/pkg/distinfo (revision 374397) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.3.8.tar.xz) = 06036f0bd0019d7a5b553272e665f060c44f6d8c1b61c5def67a5d9e24ead773 -SIZE (pkg-1.3.8.tar.xz) = 1786712 +SHA256 (pkg-1.4.0.tar.xz) = d65d8e16bce30db3397d8eb2979aad52bd770cc50a4afa55750f4b169a1f67da +SIZE (pkg-1.4.0.tar.xz) = 1802924 Index: head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c =================================================================== --- head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c (revision 374396) +++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c (nonexistent) @@ -1,28 +0,0 @@ -commit 67751707406b7da5ff85978f755d4e68bab3d38d -Author: Bryan Drewery -Date: Wed Sep 24 13:30:29 2014 -0500 - - Fix repo override crashing when URL is not defined. - - Only override URL if one is provided. - - Issue: #1024 - -diff --git libpkg/pkg_config.c libpkg/pkg_config.c -index ec96883..83e2f5d 100644 ---- libpkg/pkg_config.c -+++ libpkg/pkg_config.c -@@ -1065,9 +1065,11 @@ pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url, - { - - free(r->name); -- free(r->url); - r->name = strdup(name); -- r->url = strdup(url); -+ if (url != NULL) { -+ free(r->url); -+ r->url = strdup(url); -+ } - r->ops = pkg_repo_find_type(type); - HASH_DEL(repos, r); - HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r); Property changes on: head/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c ___________________________________________________________________ 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-libpkg__pkg_ports.c =================================================================== --- head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c (revision 374396) +++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c (nonexistent) @@ -1,14 +0,0 @@ -diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c -index 744ad4a..4308196 100644 ---- libpkg/pkg_ports.c -+++ libpkg/pkg_ports.c -@@ -1056,7 +1056,8 @@ plist_new(struct pkg *pkg, const char *stage) - - p->pkg = pkg; - pkg_get(pkg, PKG_PREFIX, &prefix); -- strlcpy(p->prefix, prefix, sizeof(p->prefix)); -+ if (prefix != NULL) -+ strlcpy(p->prefix, prefix, sizeof(p->prefix)); - p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/"; - p->stage = stage; - p->uname = strdup("root"); Property changes on: head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c ___________________________________________________________________ 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-plist-non-fatal =================================================================== --- head/ports-mgmt/pkg/files/patch-plist-non-fatal (revision 374396) +++ head/ports-mgmt/pkg/files/patch-plist-non-fatal (nonexistent) @@ -1,31 +0,0 @@ -diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c -index 33a29d0..21182b4 100644 ---- libpkg/pkg_ports.c -+++ libpkg/pkg_ports.c -@@ -1141,7 +1141,7 @@ int - ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) - { - char *line = NULL; -- int ret = EPKG_OK; -+ int ret, rc = EPKG_OK; - struct plist *pplist; - FILE *plist_f; - size_t linecap = 0; -@@ -1162,6 +1162,8 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) - if (line[linelen - 1] == '\n') - line[linelen - 1] = '\0'; - ret = plist_parse_line(pkg, pplist, line); -+ if (rc == EPKG_OK) -+ rc = ret; - } - - free(line); -@@ -1185,7 +1187,7 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage) - - plist_free(pplist); - -- return (ret); -+ return (rc); - } - - int Property changes on: head/ports-mgmt/pkg/files/patch-plist-non-fatal ___________________________________________________________________ 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-devel/Makefile =================================================================== --- head/ports-mgmt/pkg-devel/Makefile (revision 374396) +++ head/ports-mgmt/pkg-devel/Makefile (revision 374397) @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.4.0.rc3 +DISTVERSION= 1.4.99.0 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/pkg/ \ http://highsecure.ru/distfiles/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ http://pkg.semmy.ru/ PKGNAMESUFFIX= -devel MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager LICENSE= BSD2CLAUSE # Disable CCACHE support because of the chicken/egg problem pkg should always # With no dependency at all NO_CCACHE= yes WITH_DEBUG= yes CFLAGS+= -O0 -g USE_LDCONFIG= yes USES= libtool tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-maintainer-mode INSTALL_TARGET= install-strip # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_PKG) .if ${WITH_PKG} != devel NO_LATEST_LINK= yes . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one . endif .else LATEST_LINK= pkg PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .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 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} " 2) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} ""; \ exit 1 .endif .endif .else LATEST_LINK= pkg-devel .endif .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) PKG_BIN= ${WRKSRC}/src/pkg-static .endif post-install: @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ ${STAGEDIR}${PREFIX}/lib/libpkg.a .include Index: head/ports-mgmt/pkg-devel/distinfo =================================================================== --- head/ports-mgmt/pkg-devel/distinfo (revision 374396) +++ head/ports-mgmt/pkg-devel/distinfo (revision 374397) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.4.0.rc3.tar.xz) = c05b74d64662c0945cc6a8f9b6525dbdebf7afe9daa6408bcad7f93bc7c83ab4 -SIZE (pkg-1.4.0.rc3.tar.xz) = 1772412 +SHA256 (pkg-1.4.99.0.tar.xz) = bdc3cbaba90dfeacaea768a80a1975aad296d2ae4a00369d8e006b79a376b84c +SIZE (pkg-1.4.99.0.tar.xz) = 1783368