mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Avoid literal appearances of "$FreeBSD:...$" in patch-util_diff.in.

Browse Source 
- While we are here:
- Make the affected sed pattern more flexible with regard to the
  repository path from which the port was checked out.
- When handling -d <dir>, if the port's directory does not exist,
  fix the path used in the first check for an alternative path.
- Bump PORTREVISION.

PR:		ports/166593
Submitted by:	Johannes Joemann <joemann@beefree.free.de> (maintainer)
This commit is contained in:
Dennis Herrmann 2012-04-28 07:58:13 +00:00
parent 2f5f7c51db
commit f86a87c735
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295643
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/porttools/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= porttools
PORTVERSION= 0.99
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= ports-mgmt
MASTER_SITES= SF

4
ports-mgmt/porttools/files/patch-util_diff.in
View File

@ -90,7 +90,7 @@
else
# Non-CVS modes
+ DIRBASENAME=`basename \`pwd\``
+ PORTBASENAME_HEADER=`sed -n -E -e '1,/^($|[^#].*$)|\\$FreeBSD: /tmp/pcvs/ports/ports-mgmt/porttools/files/patch-util_diff.in,v 1.5 2012-03-03 13:31:02 crees Exp $FreeBSD:[[:space:]]*ports/([^/]+)/([^/]+)/Makefile.*$%\2%p' Makefile`
+ PORTBASENAME_HEADER=`sed -n -E -e '1,/^($|[^#].*$)|\\$FreeBSD\:/s%^#.*\\$FreeBSD\:[[:space:]]*([^/]+/)*([^/]+)/Makefile.*\\$%\2%p' Makefile`
+ if [ "${DIRBASENAME}" != "${PORTBASENAME_HEADER}" ]
+ then
+ echo "Warning: current directory name differs from Makefile header:"
@ -116,7 +116,7 @@
+ if [ ! -d ${ORIG_DIR} ]
+ then
+ echo "Original version does not exist at ${ORIG_DIR}"
+ if [ -d "${DIFF_MODE}/${CATEGORY}/${PORTBASENAME}" ]
+ if [ -d "${DIFF_MODE}/${CATEGORY}/${DIRBASENAME}" ]
+ then
+ PORTBASENAME=${DIRBASENAME}
+ ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PORTBASENAME}"