svn commit: r407349 - in head/sysutils/reptyr: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Wed Jan 27 10:30:44 UTC 2016
Author: rakuco
Date: Wed Jan 27 10:30:42 2016
New Revision: 407349
URL: https://svnweb.freebsd.org/changeset/ports/407349
Log:
Fix build on FreeBSD 9 and clean up.
- Add a small patch to fix the build on FreeBSD 9 and unmark it BROKEN there.
- Drop patch-Makefile, everything that it was changed can be set via MAKE_ARGS
instead.
- Unconditionally install the bash-completion file and stop build-depending on
shells/bash-completion: it is not needed at all, reptyr just installs a file
into a bash-completion directory and does not actually need it for that.
The BASH option was not even working before r407168 (see bug 206541).
PR: 206539
Approved by: Andrey Cherkashin <andoriyu at gmail.com> (maintainer)
MFH: 2016Q1
Added:
head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c (contents, props changed)
Deleted:
head/sysutils/reptyr/files/patch-Makefile
Modified:
head/sysutils/reptyr/Makefile
head/sysutils/reptyr/pkg-plist
Modified: head/sysutils/reptyr/Makefile
==============================================================================
--- head/sysutils/reptyr/Makefile Wed Jan 27 10:22:40 2016 (r407348)
+++ head/sysutils/reptyr/Makefile Wed Jan 27 10:30:42 2016 (r407349)
@@ -3,7 +3,7 @@
PORTNAME= reptyr
PORTVERSION= 0.6.3a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= andoriyu at gmail.com
@@ -15,26 +15,13 @@ USE_GITHUB= yes
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>
Added: head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c Wed Jan 27 10:30:42 2016 (r407349)
@@ -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();
Modified: head/sysutils/reptyr/pkg-plist
==============================================================================
--- head/sysutils/reptyr/pkg-plist Wed Jan 27 10:22:40 2016 (r407348)
+++ head/sysutils/reptyr/pkg-plist Wed Jan 27 10:30:42 2016 (r407349)
@@ -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
More information about the svn-ports-head
mailing list