From owner-svn-ports-head@FreeBSD.ORG Tue Jan 14 20:23:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA68CC2D; Tue, 14 Jan 2014 20:23:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA4DC1500; Tue, 14 Jan 2014 20:23:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EKNZIc047634; Tue, 14 Jan 2014 20:23:35 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EKNYJ2047628; Tue, 14 Jan 2014 20:23:34 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401142023.s0EKNYJ2047628@svn.freebsd.org> From: Antoine Brodin Date: Tue, 14 Jan 2014 20:23:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339712 - in head/misc/kcd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jan 2014 20:23:36 -0000 Author: antoine Date: Tue Jan 14 20:23:34 2014 New Revision: 339712 URL: http://svnweb.freebsd.org/changeset/ports/339712 QAT: https://qat.redports.org/buildarchive/r339712/ Log: - Fix build with clang - Stage support PR: ports/185692 Submitted by: KATO Tsuguru Added: head/misc/kcd/files/patch-gentree.cc (contents, props changed) head/misc/kcd/files/patch-scandir.cc (contents, props changed) Modified: head/misc/kcd/Makefile head/misc/kcd/files/patch-dirtree.cc head/misc/kcd/pkg-plist Modified: head/misc/kcd/Makefile ============================================================================== --- head/misc/kcd/Makefile Tue Jan 14 19:52:42 2014 (r339711) +++ head/misc/kcd/Makefile Tue Jan 14 20:23:34 2014 (r339712) @@ -12,33 +12,29 @@ COMMENT= Change directory in full-screen LICENSE= GPLv2 -USES= gettext perl5 +USES= gettext ncurses perl5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -MAN1= kcd.1 - -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS EXAMPLES do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/kcd.1 ${MANPREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/kcd-inst ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/kcdscr ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/kcdmain ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/kcd.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for i in en_GB en_GB.UTF-8 en_US.UTF-8 - @${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES + @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \ - ${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo + ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${EXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/kcd.csh.init ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/kcd.sh.init ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/misc/kcd/files/patch-dirtree.cc ============================================================================== --- head/misc/kcd/files/patch-dirtree.cc Tue Jan 14 19:52:42 2014 (r339711) +++ head/misc/kcd/files/patch-dirtree.cc Tue Jan 14 20:23:34 2014 (r339712) @@ -1,6 +1,17 @@ --- dirtree.cc.orig 2009-02-18 13:01:05.000000000 +0100 +++ dirtree.cc 2013-05-27 18:11:32.183060000 +0200 -@@ -170,12 +170,12 @@ +@@ -25,6 +25,10 @@ + #include "cstrlib.h" + #include "gentree.h" + ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ + sptr_list dirTree; + + const char uniqueTag[] = ""; // File ID +@@ -170,12 +174,12 @@ ReadSaveFile(dirTree, filegz); } catch(ErrorBadFileFormat &) { Added: head/misc/kcd/files/patch-gentree.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/kcd/files/patch-gentree.cc Tue Jan 14 20:23:34 2014 (r339712) @@ -0,0 +1,13 @@ +--- gentree.cc.orig ++++ gentree.cc +@@ -29,6 +29,10 @@ + #include "cstrlib.h" + #include "scandir.h" + ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ + //#define DUMP_HTML + #ifdef DUMP_HTML + # include Added: head/misc/kcd/files/patch-scandir.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/kcd/files/patch-scandir.cc Tue Jan 14 20:23:34 2014 (r339712) @@ -0,0 +1,13 @@ +--- scandir.cc.orig ++++ scandir.cc +@@ -32,6 +32,10 @@ + #include "cstrlib.h" + #include "dirtree.h" + ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ + /************************************************************************* + Log scan results to command line output + *************************************************************************/ Modified: head/misc/kcd/pkg-plist ============================================================================== --- head/misc/kcd/pkg-plist Tue Jan 14 19:52:42 2014 (r339711) +++ head/misc/kcd/pkg-plist Tue Jan 14 20:23:34 2014 (r339712) @@ -1,15 +1,16 @@ bin/kcd-inst bin/kcdmain bin/kcdscr +man/man1/kcd.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.csh.init +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kcd.sh.init share/locale/en_GB/LC_MESSAGES/kcd.mo share/locale/en_GB.UTF-8/LC_MESSAGES/kcd.mo share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.csh.init -%%PORTDOCS%%%%EXAMPLESDIR%%/kcd.sh.init -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES -@dirrmtry share/locale/en_GB.UTF-8 @dirrmtry share/locale/en_US.UTF-8/LC_MESSAGES @dirrmtry share/locale/en_US.UTF-8 +@dirrmtry share/locale/en_GB.UTF-8/LC_MESSAGES +@dirrmtry share/locale/en_GB.UTF-8 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%