Date: Thu, 26 Sep 2013 00:10:00 GMT From: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/182371: ports-mgmt/pkg_replace: fixup pattrn matching in pkg_glob() function Message-ID: <201309260010.r8Q0A0h2059431@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/182371; it has been noted by GNATS.
From: Ken DEGUCHI <kdeguchi@sz.tokoha-u.ac.jp>
To: <bug-followup@FreeBSD.org>, <ii@any.com.ru>
Cc:
Subject: Re: ports/182371: ports-mgmt/pkg_replace: fixup pattrn matching in
pkg_glob() function
Date: Thu, 26 Sep 2013 09:07:33 +0900
--Multipart=_Thu__26_Sep_2013_09_07_33_+0900_GB2+18knyZZWGN8h
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
Thanks for this patch. Then I made a patch as follows
- Fix pattern matching in pkg_glob function.
- Add support for staging.
- Download patch file from my web site.
--Multipart=_Thu__26_Sep_2013_09_07_33_+0900_GB2+18knyZZWGN8h
Content-Type: text/plain; name="patch-pkg_replace.txt"
Content-Disposition: attachment; filename="patch-pkg_replace.txt"
Content-Transfer-Encoding: 7bit
diff -ur /var/cache/portshaker/ports/ports-mgmt/pkg_replace/Makefile pkg_replace/Makefile
--- /var/cache/portshaker/ports/ports-mgmt/pkg_replace/Makefile 2013-09-23 07:03:25.927883718 +0900
+++ pkg_replace/Makefile 2013-09-26 06:34:01.775885132 +0900
@@ -3,11 +3,14 @@
PORTNAME= pkg_replace
PORTVERSION= 0.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR=portutil/22116
+PATCH_SITES= http://member.tokoha-u.ac.jp/~kdeguchi/download/
+PATCHFILES= patch-sbin-pkg_replace-pkg_replace.sh
+
MAINTAINER= kdeguchi@sz.tokoha-u.ac.jp
COMMENT= Utility for upgrading installed packages
@@ -15,8 +18,7 @@
MAKE_ARGS= PREFIX="${PREFIX}" \
PORTSDIR="${PORTSDIR}" PKG_DBDIR="${PKG_DBDIR}"
-MAN1= pkg_replace.1
-MANCOMPRESSED= maybe
+#MANCOMPRESSED= maybe
OPTIONS_DEFINE= ZSH
@@ -29,13 +31,8 @@
OPTIONS_SUB= yes
-NO_STAGE= yes
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MPKGDB_FIX}
-MAN1+= pkgdb_fix.1
-.endif
-
post-patch:
.if ${PORT_OPTIONS:MPKGDB_FIX}
@${REINPLACE_CMD} -e 's/pkg_replace/pkg_replace pkgdb_fix/;' ${WRKSRC}/sbin/Makefile
@@ -44,4 +41,9 @@
@${REINPLACE_CMD} -e 's/^ sbin \\$$/ sbin/;s/^ share$$//;' ${WRKSRC}/Makefile
.endif
+pre-install:
+.if ${PORT_OPTIONS:MZSH}
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}/share/zsh/site-functions
+.endif
+
.include <bsd.port.mk>
diff -ur /var/cache/portshaker/ports/ports-mgmt/pkg_replace/distinfo pkg_replace/distinfo
--- /var/cache/portshaker/ports/ports-mgmt/pkg_replace/distinfo 2012-08-23 06:57:58.000000000 +0900
+++ pkg_replace/distinfo 2013-09-26 06:02:20.736882949 +0900
@@ -1,2 +1,4 @@
SHA256 (pkg_replace-0.8.0.tar.bz2) = 3092f5fc0d18529eb5d38776941c0ee4d0073ecb524ab17671c81ca69c29e214
SIZE (pkg_replace-0.8.0.tar.bz2) = 17296
+SHA256 (patch-sbin-pkg_replace-pkg_replace.sh) = 30a4f9037c1d2ffbc3b8076bec9be47e67ea0beb9c85687597e8d36845bbcc56
+SIZE (patch-sbin-pkg_replace-pkg_replace.sh) = 11124
Only in /var/cache/portshaker/ports/ports-mgmt/pkg_replace/: files
diff -ur /var/cache/portshaker/ports/ports-mgmt/pkg_replace/pkg-plist pkg_replace/pkg-plist
--- /var/cache/portshaker/ports/ports-mgmt/pkg_replace/pkg-plist 2013-09-21 05:42:45.047884361 +0900
+++ pkg_replace/pkg-plist 2013-09-26 06:35:49.075884766 +0900
@@ -1,6 +1,9 @@
+etc/pkg_replace.conf.sample
+man/man1/pkg_replace.1.gz
+%%PKGDB_FIX%%man/man1/pkgdb_fix.1.gz
sbin/pkg_replace
%%PKGDB_FIX%%sbin/pkgdb_fix
-etc/pkg_replace.conf.sample
%%ZSH%%share/zsh/site-functions/_pkg_replace
%%ZSH%%@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
+%%ZSH%%@dirrmtry share/zsh/site-functions
%%ZSH%%@dirrmtry share/zsh
--Multipart=_Thu__26_Sep_2013_09_07_33_+0900_GB2+18knyZZWGN8h--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309260010.r8Q0A0h2059431>