Index: branches/2021Q1/ports-mgmt/pkg/Makefile =================================================================== --- branches/2021Q1/ports-mgmt/pkg/Makefile (revision 565959) +++ branches/2021Q1/ports-mgmt/pkg/Makefile (revision 565960) @@ -1,103 +1,103 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.16.1 +DISTVERSION= 1.16.3 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt #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= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 CONFIGURE_ARGS= --mandir=${PREFIX}/man --prefix="${PREFIX}" CONFIGURE_ENV= CC_FOR_BUILD="${CC}" # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes CFLAGS+= -Wno-error CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 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 .if !exists(/usr/libdata/pkgconfig/liblzma.pc) LIBLZMA_LIBS= -llzma .else LIBLZMA_PC!= ${EGREP} ^Libs /usr/libdata/pkgconfig/liblzma.pc LIBLZMA_LIBS= ${LIBLZMA_PC:M-l*} .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-patch: ${REINPLACE_CMD} -e "s|-llzma|${LIBLZMA_LIBS}|g" ${WRKSRC}/auto.def \ ${WRKSRC}/src/Makefile.autosetup ${WRKSRC}/tests/Makefile.autosetup post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .include Index: branches/2021Q1/ports-mgmt/pkg/distinfo =================================================================== --- branches/2021Q1/ports-mgmt/pkg/distinfo (revision 565959) +++ branches/2021Q1/ports-mgmt/pkg/distinfo (revision 565960) @@ -1,3 +1,3 @@ -TIMESTAMP = 1608997580 -SHA256 (freebsd-pkg-1.16.1_GH0.tar.gz) = 193f1b2ef2caf73425b9bd04e3da8b629d23e397e6d973ac4ae1baf982560193 -SIZE (freebsd-pkg-1.16.1_GH0.tar.gz) = 3833163 +TIMESTAMP = 1613671680 +SHA256 (freebsd-pkg-1.16.3_GH0.tar.gz) = db4bba12ba56521b21b01ac2e404a57ff12f631a4fb3363316f98fc1f189e883 +SIZE (freebsd-pkg-1.16.3_GH0.tar.gz) = 3834224 Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 565959) +++ branches/2021Q1 (revision 565960) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r562140,565958