diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 2b2542928e3b..b9344afde480 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -1,88 +1,88 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.4.99.9 +DISTVERSION= 1.4.99.10 _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 -Wno-error 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 diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo index 7f0734fd3591..feeb55f4b7c3 100644 --- a/ports-mgmt/pkg-devel/distinfo +++ b/ports-mgmt/pkg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.4.99.9.tar.xz) = 6aee8dc9e8980d07a0e2b18e4fa35aefe089ad8cc2029bd828f4700cb717f623 -SIZE (pkg-1.4.99.9.tar.xz) = 1856452 +SHA256 (pkg-1.4.99.10.tar.xz) = 55104b9bb1e86b39052ed65170d1e4f48f57cbcf95485c0668d1d522ab06ec8b +SIZE (pkg-1.4.99.10.tar.xz) = 1862880 diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index a0389c2846b3..7f066192bbdd 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,81 +1,81 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.4.9 +DISTVERSION= 1.4.10 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/${PORTNAME}/ \ LOCAL/portmgr \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ MAINTAINER= portmgr@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 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 CFLAGS+= -Wno-error .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 diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index df095a3e4f93..531113f3cc39 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,2 +1,2 @@ -SHA256 (pkg-1.4.9.tar.xz) = fe5716b88aa4bea0a692d2f0c20cdfe7d51fb3cb33dff2feebd4627d952b9586 -SIZE (pkg-1.4.9.tar.xz) = 1824660 +SHA256 (pkg-1.4.10.tar.xz) = e14db1abd93a1f4a7f028cbe87d92542b5baeba36d968c364b2bc31aabdc86b6 +SIZE (pkg-1.4.10.tar.xz) = 1815796