Attachment 132813 Details for Bug 177180 – portshaker.diff

[patch] portshaker.diff

portshaker.diff (text/x-patch), 1.57 KB, created by David Shane Holden on 2014-01-04 00:03:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Shane Holden

Created: 2014-01-04 00:03:15 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile
>index 97e9dab..763c31d 100644
>--- a/ports-mgmt/portshaker/Makefile
>+++ b/ports-mgmt/portshaker/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME?=	portshaker
> PORTVERSION=	1.0.8
>-PORTREVISION?=	0
>+PORTREVISION=	1
> CATEGORIES?=	ports-mgmt
> MASTER_SITES=	http://bsd-sharp.googlecode.com/files/ \
> 		http://romain.blogreen.org/distfiles/
>diff --git a/ports-mgmt/portshaker/files/patch-portshaker.subr.in b/ports-mgmt/portshaker/files/patch-portshaker.subr.in
>new file mode 100644
>index 0000000..4f24ad4
>--- /dev/null
>+++ b/ports-mgmt/portshaker/files/patch-portshaker.subr.in
>@@ -0,0 +1,31 @@
>+--- portshaker.subr.in.orig	2014-01-02 19:45:50.000000000 -0500
>++++ portshaker.subr.in	2014-01-02 19:47:18.000000000 -0500
>+@@ -39,6 +39,14 @@
>+ PB="${PB:=/usr/local/tinderbox}"
>+ TC="${TC:=${PB}/tc}"
>+ 
>++# Use pkg(8) if WITH_PKGNG is defined in make.conf
>++if [ -f "/etc/make.conf" ]; then
>++	case `make -f "/etc/make.conf" -V WITH_PKGNG` in
>++	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
>++		PKG_VERSION="pkg version"
>++	esac
>++fi
>++PKG_VERSION="${PKG_VERSION:=pkg_version}"
>+ 
>+ # Convenient variables
>+ DIFF_IGNORE_FLAGS_MK="--ignore-matching-lines='\$$FreeBSD\|Id\|MCom$\$'"
>+@@ -252,11 +260,11 @@
>+ 		return 0 # Always update
>+ 	fi
>+ 
>+-	case $(pkg_version -t ${old_version} ${new_version}) in
>++	case $(${PKG_VERSION} -t ${old_version} ${new_version}) in
>+ 	    '<') return 0;;
>+ 	    '=') return 1;;
>+ 	    '>') return 2;;
>+-	    *) err 1 "Unsupported pkg_version reply";;
>++	    *) err 1 "Unsupported ${PKG_VERSION} reply";;
>+ 	esac
>+ }
>+

Actions: View | Diff

Attachments on bug 177180: 132813 | 132814 | 132815