Attachment 146283 Details for Bug 193003 – bsdadminscripts.diff

[patch] bsdadminscripts.diff

bsdadminscripts.diff (text/plain), 4.66 KB, created by Carlos J Puga Medina on 2014-08-26 01:02:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-08-26 01:02:04 UTC

Size: 4.66 KB

patch

obsolete

>diff -urN /usr/ports/sysutils/bsdadminscripts.old/Makefile /usr/ports/sysutils/bsdadminscripts/Makefile
>--- /usr/ports/sysutils/bsdadminscripts.old/Makefile	2014-08-26 02:49:52.000000000 +0200
>+++ /usr/ports/sysutils/bsdadminscripts/Makefile	2014-08-26 02:37:04.000000000 +0200
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bsdadminscripts
> PORTVERSION=	6.1.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	sysutils ports-mgmt
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
> 
>diff -urN /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_libchk /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_libchk
>--- /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_libchk	2014-08-26 02:50:01.000000000 +0200
>+++ /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_libchk	2014-08-26 02:14:27.000000000 +0200
>@@ -1,6 +1,6 @@
> --- src/pkg_libchk.orig	2009-04-19 17:57:16.000000000 +0200
>-+++ src/pkg_libchk	2013-06-26 22:01:57.000000000 +0200
>-@@ -23,6 +23,8 @@
>++++ src/pkg_libchk	2014-08-26 02:13:12.000000000 +0200
>+@@ -23,13 +23,15 @@
>  
>  readonly name=pkg_libchk
>  readonly version=1.6.1
>@@ -9,7 +9,15 @@
>  
>  # Use a line break as delimiter.
>  IFS='
>-@@ -206,7 +208,7 @@ dependencyMissing() {
>+ '
>+ 
>+ # Filename prefix for shared data
>+-sharedprefix="%%TMP%%/$$"
>++sharedprefix="/tmp/$$"
>+ shared="locks"
>+ 
>+ #
>+@@ -206,7 +208,7 @@
>  	# We cannot handle non-native binaries,
>  	# so assume everything is in order.
>  	if ! readelf -e "$1" 2>&1 | \
>@@ -18,7 +26,16 @@
>  		> /dev/null
>  	then
>  		return 2
>-@@ -405,10 +407,17 @@ statusSet 'Preparing ...'
>+@@ -390,7 +392,7 @@
>+ # Create the expression to match to find files linking against compat libraries.
>+ # This can be emptied by readParams to deactivate that feature.
>+ prefix="$(make -f /usr/share/mk/bsd.port.mk -VPREFIX 2> /dev/null || \
>+-	echo '%%PREFIX%%')"
>++	echo '/usr/local')"
>+ compat="=> $prefix/lib/compat|"
>+ 
>+ # Create the semaphore with CPU cores * 2 jobs.
>+@@ -405,10 +407,17 @@
>  
>  # Get the packages to work on.
>  test -z "$packages" && packages="-a"
>@@ -40,7 +57,7 @@
>  
>  # Create the regexp to match ldd output
>  match_expr="$compat=> not found|dependency .+ not found"
>-@@ -420,9 +429,15 @@ package_num=0
>+@@ -420,9 +429,15 @@
>  # Check each selected package.
>  for package in $packages; {
>  	package_num="$(($package_num + 1))"
>@@ -59,7 +76,7 @@
>  
>  	# Print what we're doing.
>  	statusSet "Starting job $package_num of $package_amount: $package_name"
>-@@ -432,7 +447,12 @@ for package in $packages; {
>+@@ -432,7 +447,12 @@
>  		# Remember freeing the semaphore.
>  		trap 'semaphoreFree jobs' EXIT
>  
>diff -urN /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_upgrade /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_upgrade
>--- /usr/ports/sysutils/bsdadminscripts.old/files/patch-pkg_upgrade	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/sysutils/bsdadminscripts/files/patch-pkg_upgrade	2014-08-26 02:23:03.000000000 +0200
>@@ -0,0 +1,24 @@
>+--- src/pkg_upgrade.orig	2014-08-26 02:16:35.000000000 +0200
>++++ src/pkg_upgrade	2014-08-26 02:20:50.000000000 +0200
>+@@ -39,7 +39,7 @@
>+ readonly ERR_CONFLICT=12
>+ 
>+ # Constant assignments.
>+-readonly logfile="%%VAR%%/log/$name.log"
>++readonly logfile="/var/log/$name.log"
>+ readonly pid=$$
>+ 
>+ # Get some environment variables from uma. This includes PACKAGESITE,
>+@@ -53,9 +53,9 @@
>+ 
>+ # Environment variables.
>+ : ${PACKAGES="$(make -V PACKAGES -f /usr/share/mk/bsd.port.mk 2> /dev/null)"}
>+-PACKAGES="${PACKAGES:-%%PORTS%%/packages}"
>+-: ${PKG_DBDIR=%%VAR%%/db/pkg}
>+-: ${TMPDIR=%%TMP%%}
>++PACKAGES="${PACKAGES:-/usr/ports/packages}"
>++: ${PKG_DBDIR=/var/db/pkg}
>++: ${TMPDIR=/tmp}
>+ : ${PKG_TMPDIR=$TMPDIR}
>+ 
>+ # This is where backup packages will be stored.
>diff -urN /usr/ports/sysutils/bsdadminscripts.old/files/patch-uma /usr/ports/sysutils/bsdadminscripts/files/patch-uma
>--- /usr/ports/sysutils/bsdadminscripts.old/files/patch-uma	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/sysutils/bsdadminscripts/files/patch-uma	2014-08-26 02:31:04.000000000 +0200
>@@ -0,0 +1,25 @@
>+--- src/uma.orig	2014-08-26 02:28:58.000000000 +0200
>++++ src/uma	2014-08-26 02:30:20.000000000 +0200
>+@@ -34,11 +34,11 @@
>+ # Will be set if files are locally available.
>+ local=
>+ 
>+-vardir="%%VAR%%"
>++vardir="/var"
>+ lock="$vardir/run/$name.lock"
>+ lockpid="$vardir/run/$name.pid"
>+ identpid="$vardir/run/$name.ident.pid"
>+-conf="%%PREFIX%%/etc/$name.conf"
>++conf="/usr/local/etc/$name.conf"
>+ 
>+ # Use line breaks as a delimiter.
>+ IFS='
>+@@ -126,7 +126,7 @@
>+ 
>+ # Determine portsdir
>+ portsdir=$(make -V PORTSDIR -f /usr/share/mk/bsd.port.mk 2> /dev/null)
>+-portsdir="${portsdir:-%%PORTS%%}"
>++portsdir="${portsdir:-/usr/ports}"
>+ 
>+ export ARCH BRANCH PKG_INDEX FTP_TIMEOUT PACKAGEROOT PACKAGESITE
>+ export PACKAGEROOT_MIRRORS PACKAGESITE_MIRRORS

Actions: View | Diff

Attachments on bug 193003: 146283 | 146299 | 146301 | 146302 | 146306