Attachment 147369 Details for Bug 193676 – Diff of changes

[patch] Diff of changes

diff.txt (text/plain), 3.22 KB, created by joshruehlig on 2014-09-16 03:30:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joshruehlig

Created: 2014-09-16 03:30:28 UTC

Size: 3.22 KB

patch

obsolete

>diff -ruN /usr/ports/net-p2p/btsync/Makefile btsync/Makefile
>--- /usr/ports/net-p2p/btsync/Makefile	2014-08-27 03:42:05.000000000 -0700
>+++ btsync/Makefile	2014-09-13 09:19:09.711915761 -0700
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-p2p/btsync/Makefile 366304 2014-08-27 10:42:05Z robak $
> 
> PORTNAME=	btsync
>-PORTVERSION=	1.3.109
>+PORTVERSION=	1.4.75
> CATEGORIES=	net-p2p
> MASTER_SITES=	http://syncapp.bittorrent.com/${PORTVERSION}/
> DISTNAME=	${PORTNAME}_freebsd_${CONFIG_ARCH}-${PORTVERSION}
>@@ -42,9 +42,10 @@
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/temp/btsync ${STAGEDIR}${PREFIX}/bin
> 	${WRKSRC}/temp/btsync --dump-sample-config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>-	${REINPLACE_CMD} -e 's;$^ *"storage_path" *: *$"/.*",;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>+	${REINPLACE_CMD} -e 's;^//$ *"storage_path" *: *$"/.*",;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
>+	${REINPLACE_CMD} -e 's;^//$ *"pid_file" *: *"/var/run/${PORTNAME}/${PORTNAME}.pid",$;\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 
> post-install:
>-	${MKDIR} ${STAGEDIR}/var/db/btsync
>+	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/net-p2p/btsync/distinfo btsync/distinfo
>--- /usr/ports/net-p2p/btsync/distinfo	2014-08-27 03:42:05.000000000 -0700
>+++ btsync/distinfo	2014-09-13 09:26:14.636916352 -0700
>@@ -1,4 +1,4 @@
>-SHA256 (btsync_freebsd_i386-1.3.109.tar.gz) = b451949b677d3aa006199164a7d7f9f799eb5b7758f96b0f2a5bbbb84a9a4aad
>-SIZE (btsync_freebsd_i386-1.3.109.tar.gz) = 3279348
>-SHA256 (btsync_freebsd_x64-1.3.109.tar.gz) = 31599871449dca3fbc464422fd31440d730cfb0ad11f05321e482ae7ed7f47df
>-SIZE (btsync_freebsd_x64-1.3.109.tar.gz) = 3374894
>+SHA256 (btsync_freebsd_i386-1.4.75.tar.gz) = 88262978b0c68406be93d0e98e9ffaff6fe73840195c63e43a846810eaa05e48
>+SIZE (btsync_freebsd_i386-1.4.75.tar.gz) = 3543603
>+SHA256 (btsync_freebsd_x64-1.4.75.tar.gz) = 3772d82c865a462ab47a8fad56e924a47eb0d0983aa23705d4a59ae3ad33c99b
>+SIZE (btsync_freebsd_x64-1.4.75.tar.gz) = 3688773
>diff -ruN /usr/ports/net-p2p/btsync/files/btsync.in btsync/files/btsync.in
>--- /usr/ports/net-p2p/btsync/files/btsync.in	2014-06-29 03:55:52.000000000 -0700
>+++ btsync/files/btsync.in	2014-09-14 08:30:52.684939197 -0700
>@@ -32,8 +32,15 @@
> : ${%%PORTNAME%%_group:="%%GROUP%%"}
> : ${%%PORTNAME%%_data_dir:="/var/db/%%PORTNAME%%"}
> 
>-pidfile="$btsync_data_dir/sync.pid"
>+pidfile="/var/run/%%PORTNAME%%/%%PORTNAME%%.pid"
> command="%%PREFIX%%/bin/btsync"
> command_args="--config %%PREFIX%%/etc/%%PORTNAME%%.conf"
> 
>+start_precmd=%%PORTNAME%%_prestart
>+%%PORTNAME%%_prestart(){
>+	if [ ! -d ${pidfile%/*} ]; then
>+		install -d -o $%%PORTNAME%%_user -g $%%PORTNAME%%_group ${pidfile%/*}
>+	fi
>+}
>+
> run_rc_command "$1"
>diff -ruN /usr/ports/net-p2p/btsync/pkg-plist btsync/pkg-plist
>--- /usr/ports/net-p2p/btsync/pkg-plist	2014-06-29 03:55:52.000000000 -0700
>+++ btsync/pkg-plist	2014-09-13 07:53:06.238915443 -0700
>@@ -1,5 +1,5 @@
> @unexec %D/etc/rc.d/%%PORTNAME%% forcestop 2>/dev/null || true
> bin/btsync
> @sample etc/%%PORTNAME%%.conf.sample
>-@unexec rmdir /var/db/btsync 2>/dev/null || true
>+@unexec rmdir /var/db/%%PORTNAME%% 2>/dev/null || true
> @exec install -d -o %%USER%% -g %%GROUP%% /var/db/%%PORTNAME%%

Flags:

joshruehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 193676: 147369 | 147386