Attachment 220773 Details for Bug 244128 – pkg-1.15.10_1.patch

[patch] pkg-1.15.10_1.patch

pkg-1.15.10_1.patch (text/plain), 1.76 KB, created by takefu on 2020-12-21 07:48:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2020-12-21 07:48:19 UTC

Size: 1.76 KB

patch

obsolete

>diff -udprN /usr/ports/ports-mgmt/pkg/Makefile ./Makefile
>--- /usr/ports/ports-mgmt/pkg/Makefile	2020-10-11 22:00:43.000000000 +0900
>+++ ./Makefile	2020-12-21 16:30:00.906858000 +0900
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	pkg
> DISTVERSION=	1.15.10
>+PORTREVISION=	1
> _PKG_VERSION=	${DISTVERSION}
> CATEGORIES=	ports-mgmt
> #MASTER_SITES=	\
>@@ -90,8 +91,8 @@ 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
>+	@${REINPLACE_CMD} 's|-m 755 pkg|-m 755 -s pkg|g' ${WRKSRC}/src/Makefile.autosetup
>+	@${REINPLACE_CMD} 's|-m 644 lib$$(LIB)$$(LIB|-m 644 -s lib$$(LIB)$$(LIB|' ${WRKSRC}/libpkg/Makefile.autosetup
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
>diff -udprN /usr/ports/ports-mgmt/pkg/files/patch-scripts_periodic_400.status-pkg.in ./files/patch-scripts_periodic_400.status-pkg.in
>--- /usr/ports/ports-mgmt/pkg/files/patch-scripts_periodic_400.status-pkg.in	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-scripts_periodic_400.status-pkg.in	2020-12-21 16:30:00.905440000 +0900
>@@ -0,0 +1,19 @@
>+--- scripts/periodic/400.status-pkg.in.orig	2020-10-11 21:57:45 UTC
>++++ scripts/periodic/400.status-pkg.in
>+@@ -8,6 +8,7 @@ if [ -r /etc/defaults/periodic.conf ]; then
>+     source_periodic_confs
>+ fi
>+ pkgcmd=%prefix%/sbin/pkg
>++: ${pkg_version_flags:=-vI}
>+ 
>+ status_pkg() {
>+     local pkgargs
>+@@ -15,7 +16,7 @@ status_pkg() {
>+ 
>+     pkgargs="$1"
>+ 
>+-    rc=$(${pkgcmd} ${pkgargs} version -v ${pkg_version_index} |
>++    rc=$(${pkgcmd} ${pkgargs} version ${pkg_version_flags} ${pkg_version_index} |
>+ 	sed -n -e '/up-to-date/d' \
>+ 	    -e 's/^$[^[:space:]]*$[[:space:]]*[<>=!?][[:space:]]*$.*$$/\1 \2/p' |
>+ 	tee /dev/stderr |

Flags:

takefu: maintainer-approval+

Actions: View | Diff

Attachments on bug 244128: 211653 | 214033 | 220773 | 223315 | 223316