Date: Wed, 27 Jan 2016 10:39:04 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407351 - in branches/2016Q1/sysutils/reptyr: . files Message-ID: <201601271039.u0RAd4W8008375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Jan 27 10:39:04 2016 New Revision: 407351 URL: https://svnweb.freebsd.org/changeset/ports/407351 Log: MFH: r407349 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@gmail.com> (maintainer) Approved by: portmgr (miwi) Added: branches/2016Q1/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c - copied unchanged from r407349, head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c Deleted: branches/2016Q1/sysutils/reptyr/files/patch-Makefile Modified: branches/2016Q1/sysutils/reptyr/Makefile branches/2016Q1/sysutils/reptyr/pkg-plist Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/sysutils/reptyr/Makefile ============================================================================== --- branches/2016Q1/sysutils/reptyr/Makefile Wed Jan 27 10:31:11 2016 (r407350) +++ branches/2016Q1/sysutils/reptyr/Makefile Wed Jan 27 10:39:04 2016 (r407351) @@ -3,7 +3,7 @@ PORTNAME= reptyr PORTVERSION= 0.6.3a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= andoriyu@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> Copied: branches/2016Q1/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c (from r407349, head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c Wed Jan 27 10:39:04 2016 (r407351, copy of r407349, head/sysutils/reptyr/files/patch-platform_freebsd_freebsd.c) @@ -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: branches/2016Q1/sysutils/reptyr/pkg-plist ============================================================================== --- branches/2016Q1/sysutils/reptyr/pkg-plist Wed Jan 27 10:31:11 2016 (r407350) +++ branches/2016Q1/sysutils/reptyr/pkg-plist Wed Jan 27 10:39:04 2016 (r407351) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601271039.u0RAd4W8008375>