Date: Tue, 17 Dec 2013 02:49:47 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184816: irc/minbif: Fix build with clang Message-ID: <20131217024947.97c6d68815aaa28e13ba2c48@yahoo.com> Resent-Message-ID: <201312161810.rBGIA2YY015825@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184816 >Category: ports >Synopsis: irc/minbif: 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: Mon Dec 16 18:10:02 UTC 2013 >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-src__core__minbif.cpp files/patch-src__im__account.cpp files/patch-src__im__auth_pam.cpp files/patch-src__im__request.cpp files/patch-src__irc__dcc.cpp files/patch-src__server_poll__daemon_fork.cpp files/patch-src__server_poll__inetd.cpp files/patch-src__sockwrap__sockwrap.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/irc/minbif/Makefile irc/minbif/Makefile --- /usr/ports/irc/minbif/Makefile 2013-11-06 21:47:48.000000000 +0900 +++ irc/minbif/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -8,11 +8,11 @@ MASTER_SITES= https://symlink.me/attachments/download/148/ MAINTAINER= ports@FreeBSD.org -COMMENT= An IRC to instant messaging gateway +COMMENT= IRC to instant messaging gateway LICENSE= GPLv2 -LIB_DEPENDS= purple:${PORTSDIR}/net-im/libpurple +LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple # right now PLUGINS installs prpl-coincoin and prpl-gayattitude OPTIONS_DEFINE= CACA GNUTLS VIDEO PLUGINS DOCS @@ -22,13 +22,14 @@ PLUGINS_DESC= Compile additional libpurple-plugins USE_RC_SUBR= minbif + +USES= cmake pkgconfig USE_GNOME= glib20 USE_EFL= imlib2 -USES= cmake pkgconfig CMAKE_ARGS= -DENABLE_IMLIB:BOOL=ON -CFLAGS+= ${PTHREAD_CFLAGS} -DX_DISPLAY_MISSING -LDFLAGS+= ${PTHREAD_LIBS} +CFLAGS+= -DX_DISPLAY_MISSING +LDFLAGS+= -pthread USERS= minbif GROUPS= minbif @@ -42,11 +43,10 @@ %%ETCDIR%%/minbif.motd-dist PLIST_DIRS= %%ETCDIR%% -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCACA} -LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca +LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca CMAKE_ARGS+= -DENABLE_CACA:BOOL=ON .else CMAKE_ARGS+= -DENABLE_CACA:BOOL=OFF @@ -54,7 +54,7 @@ .if ${PORT_OPTIONS:MVIDEO} && !empty(PORT_OPTIONS:MCACA) USE_GSTREAMER+= core good -LIB_DEPENDS+= gstfarsight-0.10:${PORTSDIR}/net-im/farsight2 +LIB_DEPENDS+= libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2 CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=ON .else CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=OFF @@ -75,7 +75,7 @@ .endif .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CMAKE_ARGS+= -DENABLE_TLS:BOOL=ON .else CMAKE_ARGS+= -DENABLE_TLS:BOOL=OFF @@ -86,25 +86,32 @@ 's|"-lpthread -lstdc++"||' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e \ '/pam_misc.h/d' ${WRKSRC}/src/im/auth_pam.h - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/src/server_poll/daemon_fork.cpp \ - ${WRKSRC}/src/server_poll/inetd.cpp + +post-build: + @${LN} -sf minbif.conf ${WRKSRC}/minbif.conf-dist + @${LN} -sf minbif.motd ${WRKSRC}/minbif.motd-dist do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/minbif.8 ${MAN8PREFIX}/man/man8 - ${MKDIR} ${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/minbif.conf ${ETCDIR}/minbif.conf-dist - ${INSTALL_DATA} ${WRKSRC}/minbif.motd ${ETCDIR}/minbif.motd-dist + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/man && ${INSTALL_MAN} minbif.8 \ + ${STAGEDIR}${MAN8PREFIX}/man/man8) + @${MKDIR} ${STAGEDIR}${ETCDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} minbif.conf-dist \ + ${STAGEDIR}${ETCDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} minbif.motd-dist \ + ${STAGEDIR}${ETCDIR}) .if ${PORT_OPTIONS:MPLUGINS} - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/coincoin/libcoincoin.so ${PREFIX}/lib/purple-2 - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/gayattitude/libgayattitude.so ${PREFIX}/lib/purple-2 -.endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/minbif.xinetd ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/purple-2 + (cd ${WRKSRC}/plugins/coincoin && ${INSTALL_LIB} libcoincoin.so \ + ${STAGEDIR}${PREFIX}/lib/purple-2) + (cd ${WRKSRC}/plugins/gayattitude && ${INSTALL_LIB} libgayattitude.so \ + ${STAGEDIR}${PREFIX}/lib/purple-2) +.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README \ + ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${INSTALL_DATA} minbif.xinetd \ + ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff -urN /usr/ports/irc/minbif/files/patch-src__core__minbif.cpp irc/minbif/files/patch-src__core__minbif.cpp --- /usr/ports/irc/minbif/files/patch-src__core__minbif.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__core__minbif.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,21 @@ +--- src/core/minbif.cpp.orig ++++ src/core/minbif.cpp +@@ -17,7 +17,7 @@ + */ + + #include <cerrno> +-#include <stdlib.h> ++#include <cstdlib> + #include <iostream> + #include <fstream> + #include <cstring> +@@ -239,7 +239,9 @@ + } + sighandler.setApplication(this); + ++#if ! GLIB_CHECK_VERSION(2, 32, 0) + g_thread_init(NULL); ++#endif + loop = g_main_new(FALSE); + g_main_run(loop); + diff -urN /usr/ports/irc/minbif/files/patch-src__im__account.cpp irc/minbif/files/patch-src__im__account.cpp --- /usr/ports/irc/minbif/files/patch-src__im__account.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__im__account.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- src/im/account.cpp.orig ++++ src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include <cassert> + #include <cstring> ++#include <unistd.h> + #ifdef HAVE_IMLIB + #include <Imlib2.h> + #endif /* HAVE_IMLIB */ diff -urN /usr/ports/irc/minbif/files/patch-src__im__auth_pam.cpp irc/minbif/files/patch-src__im__auth_pam.cpp --- /usr/ports/irc/minbif/files/patch-src__im__auth_pam.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__im__auth_pam.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,10 @@ +--- src/im/auth_pam.cpp.orig ++++ src/im/auth_pam.cpp +@@ -19,6 +19,7 @@ + #include <cstring> + #include <cerrno> + #include <sys/types.h> ++#include <unistd.h> + #include <pwd.h> + + #include "auth.h" diff -urN /usr/ports/irc/minbif/files/patch-src__im__request.cpp irc/minbif/files/patch-src__im__request.cpp --- /usr/ports/irc/minbif/files/patch-src__im__request.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__im__request.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,14 @@ +--- src/im/request.cpp.orig ++++ src/im/request.cpp +@@ -16,8 +16,9 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++#include <unistd.h> + + #include "request.h" + #include "buddy.h" diff -urN /usr/ports/irc/minbif/files/patch-src__irc__dcc.cpp irc/minbif/files/patch-src__irc__dcc.cpp --- /usr/ports/irc/minbif/files/patch-src__irc__dcc.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__irc__dcc.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,19 @@ +--- src/irc/dcc.cpp.orig ++++ src/irc/dcc.cpp +@@ -17,12 +17,13 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #include <fcntl.h> +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> + #include <sys/types.h> +-#include <netinet/in.h> ++#include <unistd.h> + + #include "dcc.h" + #include "nick.h" diff -urN /usr/ports/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp irc/minbif/files/patch-src__server_poll__daemon_fork.cpp --- /usr/ports/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__server_poll__daemon_fork.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,17 @@ +--- src/server_poll/daemon_fork.cpp.orig ++++ src/server_poll/daemon_fork.cpp +@@ -20,10 +20,12 @@ + #include <cassert> + #include <cstring> + #include <cerrno> +-#include <glib/gmain.h> ++#include <glib.h> ++#include <sys/types.h> + #include <sys/socket.h> +-#include <sys/stat.h> ++#include <netinet/in.h> + #include <arpa/inet.h> ++#include <sys/stat.h> + + #include "daemon_fork.h" + #include "irc/irc.h" diff -urN /usr/ports/irc/minbif/files/patch-src__server_poll__inetd.cpp irc/minbif/files/patch-src__server_poll__inetd.cpp --- /usr/ports/irc/minbif/files/patch-src__server_poll__inetd.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__server_poll__inetd.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,12 @@ +--- src/server_poll/inetd.cpp.orig ++++ src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include <cassert> +-#include <glib/gmain.h> ++#include <unistd.h> ++#include <glib.h> + + #include "inetd.h" + #include "irc/irc.h" diff -urN /usr/ports/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp irc/minbif/files/patch-src__sockwrap__sockwrap.cpp --- /usr/ports/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp 1970-01-01 09:00:00.000000000 +0900 +++ irc/minbif/files/patch-src__sockwrap__sockwrap.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,11 @@ +--- src/sockwrap/sockwrap.cpp.orig ++++ src/sockwrap/sockwrap.cpp +@@ -16,6 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + ++#include <unistd.h> ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024947.97c6d68815aaa28e13ba2c48>