From owner-svn-ports-head@FreeBSD.ORG Thu Dec 19 15:34:15 2013 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 0BA39504; Thu, 19 Dec 2013 15:34:15 +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 E022D1B11; Thu, 19 Dec 2013 15:34:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJFYEPC083642; Thu, 19 Dec 2013 15:34:14 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJFYD36083633; Thu, 19 Dec 2013 15:34:13 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312191534.rBJFYD36083633@svn.freebsd.org> From: Pawel Pekala Date: Thu, 19 Dec 2013 15:34:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336927 - in head/irc/minbif: . 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: Thu, 19 Dec 2013 15:34:15 -0000 Author: pawel Date: Thu Dec 19 15:34:12 2013 New Revision: 336927 URL: http://svnweb.freebsd.org/changeset/ports/336927 Log: - Fix build with clang - Remove leading article from COMMENT - Convert to new LIB_DEPENDS format - Support staging While I'm here use option helpers where possible. PR: ports/184816 Submitted by: KATO Tsuguru Added: head/irc/minbif/files/patch-src__core__minbif.cpp (contents, props changed) head/irc/minbif/files/patch-src__im__account.cpp (contents, props changed) head/irc/minbif/files/patch-src__im__auth_pam.cpp (contents, props changed) head/irc/minbif/files/patch-src__im__request.cpp (contents, props changed) head/irc/minbif/files/patch-src__irc__dcc.cpp (contents, props changed) head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp (contents, props changed) head/irc/minbif/files/patch-src__server_poll__inetd.cpp (contents, props changed) head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp (contents, props changed) Modified: head/irc/minbif/Makefile Modified: head/irc/minbif/Makefile ============================================================================== --- head/irc/minbif/Makefile Thu Dec 19 15:30:51 2013 (r336926) +++ head/irc/minbif/Makefile Thu Dec 19 15:34:12 2013 (r336927) @@ -8,11 +8,11 @@ CATEGORIES= irc net-im 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 @@ VIDEO_DESC= Webcam display using libcaca 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 @@ -36,25 +37,30 @@ GROUPS= minbif SUB_FILES= pkg-message SUB_LIST= USERS="${USERS}" -MAN8= minbif.8 PORTDOCS= * PLIST_FILES= bin/minbif %%ETCDIR%%/minbif.conf-dist \ - %%ETCDIR%%/minbif.motd-dist + %%ETCDIR%%/minbif.motd-dist man/man8/minbif.8.gz PLIST_DIRS= %%ETCDIR%% -NO_STAGE= yes -.include +CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca +CACA_CMAKE_ON= -DENABLE_CACA:BOOL=ON +CACA_CMAKE_OFF= -DENABLE_CACA:BOOL=OFF + +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CMAKE_ON= -DENABLE_TLS:BOOL=ON +GNUTLS_CMAKE_OFF= -DENABLE_TLS:BOOL=OFF + +PLUGINS_USE= GNOME=libxml2 +PLUGINS_CMAKE_ON= -DENABLE_PLUGIN:BOOL=ON +PLUGINS_CMAKE_OFF= -DENABLE_PLUGIN:BOOL=OFF +PLUGINS_PLIST_FILES= lib/purple-2/libcoincoin.so \ + lib/purple-2/libgayattitude.so -.if ${PORT_OPTIONS:MCACA} -LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca -CMAKE_ARGS+= -DENABLE_CACA:BOOL=ON -.else -CMAKE_ARGS+= -DENABLE_CACA:BOOL=OFF -.endif +.include .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 @@ -65,46 +71,37 @@ IGNORE= if you want to enable webcam su also enable CACA. .endif -.if ${PORT_OPTIONS:MPLUGINS} -USE_GNOME+= libxml2 -CMAKE_ARGS+= -DENABLE_PLUGIN:BOOL=ON -PLIST_FILES+= lib/purple-2/libcoincoin.so \ - lib/purple-2/libgayattitude.so -.else -CMAKE_ARGS+= -DENABLE_PLUGIN:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -CMAKE_ARGS+= -DENABLE_TLS:BOOL=ON -.else -CMAKE_ARGS+= -DENABLE_TLS:BOOL=OFF -.endif - post-patch: @${REINPLACE_CMD} -e \ '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 Added: head/irc/minbif/files/patch-src__core__minbif.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__core__minbif.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,21 @@ +--- src/core/minbif.cpp.orig ++++ src/core/minbif.cpp +@@ -17,7 +17,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include +@@ -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); + Added: head/irc/minbif/files/patch-src__im__account.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__im__account.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,10 @@ +--- src/im/account.cpp.orig ++++ src/im/account.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + #ifdef HAVE_IMLIB + #include + #endif /* HAVE_IMLIB */ Added: head/irc/minbif/files/patch-src__im__auth_pam.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__im__auth_pam.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,10 @@ +--- src/im/auth_pam.cpp.orig ++++ src/im/auth_pam.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + #include "auth.h" Added: head/irc/minbif/files/patch-src__im__request.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__im__request.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -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 +-#include ++#include ++#include ++#include + + #include "request.h" + #include "buddy.h" Added: head/irc/minbif/files/patch-src__irc__dcc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__irc__dcc.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,19 @@ +--- src/irc/dcc.cpp.orig ++++ src/irc/dcc.cpp +@@ -17,12 +17,13 @@ + + #include + #include ++#include + #include + #include +-#include +-#include ++#include ++#include + #include +-#include ++#include + + #include "dcc.h" + #include "nick.h" Added: head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,17 @@ +--- src/server_poll/daemon_fork.cpp.orig ++++ src/server_poll/daemon_fork.cpp +@@ -20,10 +20,12 @@ + #include + #include + #include +-#include ++#include ++#include + #include +-#include ++#include + #include ++#include + + #include "daemon_fork.h" + #include "irc/irc.h" Added: head/irc/minbif/files/patch-src__server_poll__inetd.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__server_poll__inetd.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -0,0 +1,12 @@ +--- src/server_poll/inetd.cpp.orig ++++ src/server_poll/inetd.cpp +@@ -17,7 +17,8 @@ + */ + + #include +-#include ++#include ++#include + + #include "inetd.h" + #include "irc/irc.h" Added: head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp Thu Dec 19 15:34:12 2013 (r336927) @@ -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 ++ + #include "sockwrap.h" + #include "sockwrap_plain.h" + #ifdef HAVE_TLS