Attachment #166068 for bug #206539





PORTNAME=	reptyr
PORTVERSION=	0.6.3a
PORTREVISION=	2
CATEGORIES=	sysutils

MAINTAINER=	andoriyu@gmail.com

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.mk>




--- 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




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();

Lines 1-5 Link Here

(-)pkg-plist (-2 / +1 lines)
1	%%BASH%%etc/bash_completion.d/reptyr
2	%%BASH%%share/bash-completion/completions/reptyr
3	bin/reptyr	1	bin/reptyr
4	man/fr/man1/reptyr.1.gz	2	man/fr/man1/reptyr.1.gz
5	man/man1/reptyr.1.gz	3	man/man1/reptyr.1.gz
		4	share/bash-completion/completions/reptyr

Return to bug 206539

Lines 3-9 Link Here

(-)Makefile (-17 / +4 lines)
3		3
4	PORTNAME= reptyr	4	PORTNAME= reptyr
5	PORTVERSION= 0.6.3a	5	PORTVERSION= 0.6.3a
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8		8
9	MAINTAINER= andoriyu@gmail.com	9	MAINTAINER= andoriyu@gmail.com
Lines 15-40 Link Here
15	GH_ACCOUNT= nelhage	15	GH_ACCOUNT= nelhage
16	GH_TAGNAME= 6fb15adb4552e170bcd5e648803da83dba57283b	16	GH_TAGNAME= 6fb15adb4552e170bcd5e648803da83dba57283b
17		17
		18	MAKE_ARGS= BASHCOMPDIR=${PREFIX}/share/bash-completion/completions \
		19	MANDIR=${MANPREFIX}/man
18	USES= gmake	20	USES= gmake
19		21
20	OPTIONS_DEFINE= BASH
21	OPTIONS_SUB= yes
22
23	ONLY_FOR_ARCHS= i386 amd64	22	ONLY_FOR_ARCHS= i386 amd64
24		23
25	.include <bsd.port.pre.mk>
26	.if ${PORT_OPTIONS:MBASH}
27	BUILD_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion:${PORTSDIR}/shells/bash-completion
28	.endif
29
30	BROKEN_FreeBSD_9= Not supported on FreeBSD older than 10.0
31
32	post-install:	24	post-install:
33	.if ${PORT_OPTIONS:MBASH}
34	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
35	${INSTALL_SCRIPT} ${WRKSRC}/reptyr.bash \
36	${STAGEDIR}${PREFIX}/etc/bash_completion.d/reptyr
37	.endif
38	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/reptyr	25	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/reptyr
39		26
40	.include <bsd.port.post.mk>	27	.include <bsd.port.mk>

Lines 1-32 Link Here

(-)files/patch-Makefile (-32 lines)
1	--- Makefile.orig 2015-06-05 21:41:48 UTC
2	+++ Makefile
3	@@ -14,7 +14,7 @@ endif
4	# e.g. install to /usr with `make PREFIX=/usr`
5	PREFIX=/usr/local
6	BINDIR=$(PREFIX)/bin
7	-MANDIR=$(PREFIX)/share/man
8	+MANDIR=$(PREFIX)/man
9
10	PKG_CONFIG ?= pkg-config
11
12	@@ -43,7 +43,7 @@ ptrace.o: ptrace.h platform/platform.h $
13	clean:
14	rm -f reptyr $(OBJS) test/victim.o test/victim
15
16	-BASHCOMPDIR ?= $(shell $(PKG_CONFIG) --variable=completionsdir bash-completion 2>/dev/null)
17	+BASHCOMPDIR ?= $(PREFIX)/share/bash-completion/completions
18
19	install: reptyr
20	install -d -m 755 $(DESTDIR)$(BINDIR)
21	@@ -52,9 +52,7 @@ install: reptyr
22	install -m 644 reptyr.1 $(DESTDIR)$(MANDIR)/man1/reptyr.1
23	install -d -m 755 $(DESTDIR)$(MANDIR)/fr/man1
24	install -m 644 reptyr.fr.1 $(DESTDIR)$(MANDIR)/fr/man1/reptyr.1
25	- bashcompdir=$(BASHCOMPDIR) ; \
26	- test -z "$$bashcompdir" && bashcompdir=/etc/bash_completion.d ; \
27	- install -d -m 755 $(DESTDIR)$$bashcompdir ; \
28	- install -m 644 reptyr.bash $(DESTDIR)$$bashcompdir/reptyr
29	+ install -d -m 755 $(DESTDIR)$(BASHCOMPDIR)
30	+ install -m 644 reptyr.bash $(DESTDIR)$(BASHCOMPDIR)/reptyr
31
32	.PHONY: PHONY

Line 0 Link Here

(-)files/patch-platform_freebsd_freebsd.c (+16 lines)
	1	Fix the build on FreeBSD 9:
	2
	3	cc1: warnings being treated as errors
	4	platform/freebsd/freebsd.c: In function 'check_proc_stopped':
	5	platform/freebsd/freebsd.c:57: warning: 'state' may be used uninitialized in this function
	6	--- platform/freebsd/freebsd.c.orig 2015-06-05 21:41:48 UTC
	7	+++ platform/freebsd/freebsd.c
	8	@@ -54,7 +54,7 @@ int check_pgroup(pid_t target) {
	9	int check_proc_stopped(pid_t pid, int fd) {
	10	struct procstat *procstat;
	11	struct kinfo_proc *kp;
	12	- int state;
	13	+ int state = 0;
	14	unsigned int cnt;
	15
	16	procstat = procstat_open_sysctl();