Index: head/ports-mgmt/pkg-devel/Makefile =================================================================== --- head/ports-mgmt/pkg-devel/Makefile (revision 351335) +++ head/ports-mgmt/pkg-devel/Makefile (revision 351336) @@ -1,101 +1,100 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.3.0.a7 -PORTREVISION= 1 +DISTVERSION= 1.3.0.a8 CATEGORIES= ports-mgmt MASTER_SITES= \ http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ http://miwibox.org/distfiles/${PORTNAME}/ \ LOCAL/portmgr PKGNAMESUFFIX= -devel 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 WITH_DEBUG= yes CFLAGS+= -O0 -g USE_LDCONFIG= yes USES= tar:xz libtool GNU_CONFIGURE= yes # 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-pkg_pkg.8 .endif .include .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKGNG) .if ${WITH_PKGNG} != devel NO_LATEST_LINK= yes . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKGNG is not defined to 'devel', this version is the devel one . endif .else LATEST_LINK= pkg PKGNAMESUFFIX= .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 pkgng while you have ports/packages"; \ ${ECHO_CMD} "installed with the old pkg_install tools."; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} "You can choose to: "; \ ${ECHO_CMD} "- keep pkg_install as the package management system by adding this line to /etc/make.conf:"; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} " WITHOUT_PKGNG=yes" ; \ ${ECHO_CMD} ""; \ ${ECHO_CMD} "- switch to pkgng:"; \ ${ECHO_CMD} " 1) Add WITHOUT_PKGNG to /etc/make.conf"; \ ${ECHO_CMD} " 2) Install ports-mgmt/pkg"; \ ${ECHO_CMD} " 3) Convert your package database by running pkg2ng"; \ ${ECHO_CMD} " 4) Remove WITHOUT_PKGNG from /etc/make.conf"; \ ${ECHO_CMD} ""; \ exit 1 .endif .endif .else LATEST_LINK= pkg-devel .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) .if defined(WITH_PKGNG) PKG_DEPENDS= .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) PKG_BIN= ${WRKSRC}/src/pkg-static .endif .endif post-install: @${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la @${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \ ${STAGEDIR}${PREFIX}/lib/libpkg.a @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg.so.2 .include Index: head/ports-mgmt/pkg-devel/distinfo =================================================================== --- head/ports-mgmt/pkg-devel/distinfo (revision 351335) +++ head/ports-mgmt/pkg-devel/distinfo (revision 351336) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.3.0.a7.tar.xz) = 4d37890d17c902f21ee4cf0729e6d97cf69ae3aaabf91084b08059dc9abcb777 -SIZE (pkg-1.3.0.a7.tar.xz) = 1646552 +SHA256 (pkg-1.3.0.a8.tar.xz) = bf47424579f3247f5e212eb799f37eeaaeca14d6a9ef85cf7aee3730e1ef144e +SIZE (pkg-1.3.0.a8.tar.xz) = 1678324 Index: head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c =================================================================== --- head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c (revision 351335) +++ head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.c (nonexistent) @@ -1,25 +0,0 @@ -diff --git a/libpkg/pkg_elf.c b/libpkg/pkg_elf.c -index 507e09d..b404cc0 100644 ---- libpkg/pkg_elf.c -+++ libpkg/pkg_elf.c -@@ -640,6 +640,11 @@ - int ret = EPKG_OK; - int i; - const char *arch, *abi, *endian_corres_str, *wordsize_corres_str, *fpu; -+ const char *path; -+ -+ path = getenv("ABI_FILE"); -+ if (path == NULL) -+ path = _PATH_BSHELL; - - if (elf_version(EV_CURRENT) == EV_NONE) { - pkg_emit_error("ELF library initialization failed: %s", -@@ -647,7 +652,7 @@ - return (EPKG_FATAL); - } - -- if ((fd = open(_PATH_BSHELL, O_RDONLY)) < 0) { -+ if ((fd = open(path, O_RDONLY)) < 0) { - pkg_emit_errno("open", _PATH_BSHELL); - snprintf(dest, sz, "%s", "unknown"); - return (EPKG_FATAL); Property changes on: head/ports-mgmt/pkg-devel/files/patch-libpkg__pkg_elf.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