svn commit: r336972 - in branches/2014Q1/irc/minbif: . files
Baptiste Daroussin
bapt at FreeBSD.org
Fri Dec 20 07:53:54 UTC 2013
Author: bapt
Date: Fri Dec 20 07:53:52 2013
New Revision: 336972
URL: http://svnweb.freebsd.org/changeset/ports/336972
Log:
MFH: r336927
- 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 <tkato432 at yahoo.com>
Added:
branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__core__minbif.cpp
branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__im__account.cpp
branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp
branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__im__request.cpp
branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp
branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp
branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp
branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp
- copied unchanged from r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp
Modified:
branches/2014Q1/irc/minbif/Makefile
Directory Properties:
branches/2014Q1/ (props changed)
Modified: branches/2014Q1/irc/minbif/Makefile
==============================================================================
--- branches/2014Q1/irc/minbif/Makefile Fri Dec 20 06:23:20 2013 (r336971)
+++ branches/2014Q1/irc/minbif/Makefile Fri Dec 20 07:53:52 2013 (r336972)
@@ -8,11 +8,11 @@ CATEGORIES= irc net-im
MASTER_SITES= https://symlink.me/attachments/download/148/
MAINTAINER= ports at 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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
.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 <bsd.port.mk>
Copied: branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp (from r336927, head/irc/minbif/files/patch-src__core__minbif.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__core__minbif.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__core__minbif.cpp)
@@ -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);
+
Copied: branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp (from r336927, head/irc/minbif/files/patch-src__im__account.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__im__account.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__account.cpp)
@@ -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 */
Copied: branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp (from r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__im__auth_pam.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__auth_pam.cpp)
@@ -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"
Copied: branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp (from r336927, head/irc/minbif/files/patch-src__im__request.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__im__request.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__im__request.cpp)
@@ -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"
Copied: branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp (from r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__irc__dcc.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__irc__dcc.cpp)
@@ -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"
Copied: branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp (from r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__server_poll__daemon_fork.cpp)
@@ -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"
Copied: branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp (from r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__server_poll__inetd.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__server_poll__inetd.cpp)
@@ -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"
Copied: branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp (from r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2014Q1/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp Fri Dec 20 07:53:52 2013 (r336972, copy of r336927, head/irc/minbif/files/patch-src__sockwrap__sockwrap.cpp)
@@ -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
More information about the svn-ports-branches
mailing list