Date: Mon, 13 Jan 2014 03:19:49 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185692: misc/kcd: Fix build with clang Message-ID: <20140113031949.f415d1c2fb983cac4007831b@yahoo.com> Resent-Message-ID: <201401121840.s0CIe00O049265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185692
>Category: ports
>Synopsis: misc/kcd: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 12 18:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
New file:
files/patch-gentree.cc
files/patch-scandir.cc
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/kcd/Makefile misc/kcd/Makefile
--- /usr/ports/misc/kcd/Makefile 2013-11-06 21:59:56.000000000 +0900
+++ misc/kcd/Makefile 2014-01-13 00:00:00.000000000 +0900
@@ -12,33 +12,34 @@
LICENSE= GPLv2
-USES= gettext perl5
+OPTIONS_DEFINE= DOCS EXAMPLES
+
+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 <bsd.port.options.mk>
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
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} kcdmain \
+ ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC} && ${INSTALL_SCRIPT} kcd-inst kcdscr \
+ ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC} && ${INSTALL_MAN} 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
- ${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
- ${PREFIX}/share/locale/${i}/LC_MESSAGES/kcd.mo
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES
+ (cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.gmo \
+ ${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}
+ (cd ${WRKSRC} && ${INSTALL_DATA} README \
+ ${STAGEDIR}${DOCSDIR})
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} kcd.csh.init kcd.sh.init \
+ ${STAGEDIR}${EXAMPLESDIR})
.include <bsd.port.mk>
diff -urN /usr/ports/misc/kcd/files/patch-dirtree.cc misc/kcd/files/patch-dirtree.cc
--- /usr/ports/misc/kcd/files/patch-dirtree.cc 2013-11-06 21:59:56.000000000 +0900
+++ misc/kcd/files/patch-dirtree.cc 2014-01-13 00:00:00.000000000 +0900
@@ -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 <unistd.h>
++#endif
++
+ sptr_list<DirectoryEntry> dirTree;
+
+ const char uniqueTag[] = "<KCDID#9>"; // File ID
+@@ -170,12 +174,12 @@
ReadSaveFile(dirTree, filegz);
}
catch(ErrorBadFileFormat &) {
diff -urN /usr/ports/misc/kcd/files/patch-gentree.cc misc/kcd/files/patch-gentree.cc
--- /usr/ports/misc/kcd/files/patch-gentree.cc 1970-01-01 09:00:00.000000000 +0900
+++ misc/kcd/files/patch-gentree.cc 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,13 @@
+--- gentree.cc.orig
++++ gentree.cc
+@@ -29,6 +29,10 @@
+ #include "cstrlib.h"
+ #include "scandir.h"
+
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ //#define DUMP_HTML
+ #ifdef DUMP_HTML
+ # include <fcntl.h>
diff -urN /usr/ports/misc/kcd/files/patch-scandir.cc misc/kcd/files/patch-scandir.cc
--- /usr/ports/misc/kcd/files/patch-scandir.cc 1970-01-01 09:00:00.000000000 +0900
+++ misc/kcd/files/patch-scandir.cc 2014-01-13 00:00:00.000000000 +0900
@@ -0,0 +1,13 @@
+--- scandir.cc.orig
++++ scandir.cc
+@@ -32,6 +32,10 @@
+ #include "cstrlib.h"
+ #include "dirtree.h"
+
++#ifdef HAVE_UNISTD_H
++# include <unistd.h>
++#endif
++
+ /*************************************************************************
+ Log scan results to command line output
+ *************************************************************************/
diff -urN /usr/ports/misc/kcd/pkg-plist misc/kcd/pkg-plist
--- /usr/ports/misc/kcd/pkg-plist 2013-11-06 21:59:56.000000000 +0900
+++ misc/kcd/pkg-plist 2014-01-13 00:00:00.000000000 +0900
@@ -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%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140113031949.f415d1c2fb983cac4007831b>