Attachment 166068 Details for Bug 206539 – Patch v2

[patch] Patch v2

reptyr-fbsd9-bash_completion.patch (text/plain), 4.23 KB, created by Raphael Kubo da Costa on 2016-01-24 16:49:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2016-01-24 16:49:27 UTC

Size: 4.23 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 407049)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	reptyr
> PORTVERSION=	0.6.3a
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> 
> MAINTAINER=	andoriyu@gmail.com
>@@ -15,26 +15,13 @@
> GH_ACCOUNT=	nelhage
> GH_TAGNAME=	6fb15adb4552e170bcd5e648803da83dba57283b
> 
>+MAKE_ARGS=	BASHCOMPDIR=${PREFIX}/share/bash-completion/completions \
>+		MANDIR=${MANPREFIX}/man
> USES=		gmake
> 
>-OPTIONS_DEFINE=	BASH
>-OPTIONS_SUB=	yes
>-
> ONLY_FOR_ARCHS=	i386 amd64
> 
>-.include <bsd.port.pre.mk>
>-.if ${PORT_OPTIONS:MBASH}
>-BUILD_DEPENDS=	${LOCALBASE}/share/bash-completion/bash_completion:${PORTSDIR}/shells/bash-completion
>-.endif
>-
>-BROKEN_FreeBSD_9=	Not supported on FreeBSD older than 10.0
>-
> post-install:
>-.if ${PORT_OPTIONS:MBASH}
>-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
>-	${INSTALL_SCRIPT} ${WRKSRC}/reptyr.bash \
>-		${STAGEDIR}${PREFIX}/etc/bash_completion.d/reptyr
>-.endif
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/reptyr
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 405864)
>+++ files/patch-Makefile	(nonexistent)
>@@ -1,32 +0,0 @@
>---- Makefile.orig	2015-06-05 21:41:48 UTC
>-+++ Makefile
>-@@ -14,7 +14,7 @@ endif
>- # e.g. install to /usr with `make PREFIX=/usr`
>- PREFIX=/usr/local
>- BINDIR=$(PREFIX)/bin
>--MANDIR=$(PREFIX)/share/man
>-+MANDIR=$(PREFIX)/man
>- 
>- PKG_CONFIG ?= pkg-config
>- 
>-@@ -43,7 +43,7 @@ ptrace.o: ptrace.h platform/platform.h $
>- clean:
>- 	rm -f reptyr $(OBJS) test/victim.o test/victim
>- 
>--BASHCOMPDIR ?= $(shell $(PKG_CONFIG) --variable=completionsdir bash-completion 2>/dev/null)
>-+BASHCOMPDIR ?= $(PREFIX)/share/bash-completion/completions
>- 
>- install: reptyr
>- 	install -d -m 755 $(DESTDIR)$(BINDIR)
>-@@ -52,9 +52,7 @@ install: reptyr
>- 	install -m 644 reptyr.1 $(DESTDIR)$(MANDIR)/man1/reptyr.1
>- 	install -d -m 755 $(DESTDIR)$(MANDIR)/fr/man1
>- 	install -m 644 reptyr.fr.1 $(DESTDIR)$(MANDIR)/fr/man1/reptyr.1
>--	bashcompdir=$(BASHCOMPDIR) ; \
>--	test -z "$$bashcompdir" && bashcompdir=/etc/bash_completion.d ; \
>--	install -d -m 755 $(DESTDIR)$$bashcompdir ; \
>--	install -m 644 reptyr.bash $(DESTDIR)$$bashcompdir/reptyr
>-+	install -d -m 755 $(DESTDIR)$(BASHCOMPDIR)
>-+	install -m 644 reptyr.bash $(DESTDIR)$(BASHCOMPDIR)/reptyr
>- 
>- .PHONY: PHONY
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-platform_freebsd_freebsd.c
>===================================================================
>--- files/patch-platform_freebsd_freebsd.c	(nonexistent)
>+++ files/patch-platform_freebsd_freebsd.c	(working copy)
>@@ -0,0 +1,16 @@
>+Fix the build on FreeBSD 9:
>+
>+cc1: warnings being treated as errors
>+platform/freebsd/freebsd.c: In function 'check_proc_stopped':
>+platform/freebsd/freebsd.c:57: warning: 'state' may be used uninitialized in this function
>+--- platform/freebsd/freebsd.c.orig	2015-06-05 21:41:48 UTC
>++++ platform/freebsd/freebsd.c
>+@@ -54,7 +54,7 @@ int check_pgroup(pid_t target) {
>+ int check_proc_stopped(pid_t pid, int fd) {
>+     struct procstat *procstat;
>+     struct kinfo_proc *kp;
>+-    int state;
>++    int state = 0;
>+     unsigned int cnt;
>+ 
>+     procstat = procstat_open_sysctl();
>
>Property changes on: files/patch-platform_freebsd_freebsd.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 405864)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,4 @@
>-%%BASH%%etc/bash_completion.d/reptyr
>-%%BASH%%share/bash-completion/completions/reptyr
> bin/reptyr
> man/fr/man1/reptyr.1.gz
> man/man1/reptyr.1.gz
>+share/bash-completion/completions/reptyr

Actions: View | Diff

Attachments on bug 206539: 166024 | 166068