From owner-svn-ports-head@freebsd.org Mon Jan 25 15:13:25 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF670A45902; Mon, 25 Jan 2016 15:13:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 80181A24; Mon, 25 Jan 2016 15:13:25 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PFDOZu034175; Mon, 25 Jan 2016 15:13:24 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PFDOwV034171; Mon, 25 Jan 2016 15:13:24 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201601251513.u0PFDOwV034171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 25 Jan 2016 15:13:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407220 - 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.20 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: Mon, 25 Jan 2016 15:13:25 -0000 Author: danfe Date: Mon Jan 25 15:13:23 2016 New Revision: 407220 URL: https://svnweb.freebsd.org/changeset/ports/407220 Log: - Unbreak the build against new Imlib2: previous versions (e.g. 1.4.6) had two typedefs (apparently, the latter was deprecated and finally removed in 1.4.7): typedef enum _imlib_load_error Imlib_Load_Error; typedef enum _imlib_load_error ImlibLoadError; - Instead of handling of VIDEO and CACA options interdependency manually, define VIDEO_IMPLIES=CACA (available since r394573) and thus consummate conversion to option helpers - Install sample configuration files as @sample in pkg-plist (and convert PLIST_FILES to separate file due to better readability thereof) - Restore sane installation routine broken in r336927 and install couple of extra documentation files while here - Augment port description text and update WWW line to avoid redirect Added: head/irc/minbif/pkg-plist (contents, props changed) Modified: head/irc/minbif/Makefile head/irc/minbif/files/patch-src__im__account.cpp head/irc/minbif/pkg-descr Modified: head/irc/minbif/Makefile ============================================================================== --- head/irc/minbif/Makefile Mon Jan 25 15:11:23 2016 (r407219) +++ head/irc/minbif/Makefile Mon Jan 25 15:13:23 2016 (r407220) @@ -3,7 +3,7 @@ PORTNAME= minbif PORTVERSION= 1.0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= irc net-im MASTER_SITES= https://symlink.me/attachments/download/148/ @@ -12,21 +12,11 @@ COMMENT= IRC to instant messaging gatewa LICENSE= GPLv2 -BROKEN= fails to build - LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple -# right now PLUGINS installs prpl-coincoin and prpl-gayattitude -OPTIONS_DEFINE= CACA GNUTLS VIDEO PLUGINS DOCS -OPTIONS_DEFAULT= CACA -CACA_DESC= Buddy icon display using libcaca -VIDEO_DESC= Webcam display using libcaca (depends on CACA) -PLUGINS_DESC= Compile additional libpurple-plugins - -USE_RC_SUBR= minbif - USES= cmake pkgconfig USE_GNOME= glib20 +USE_RC_SUBR= ${PORTNAME} CFLAGS+= -DX_DISPLAY_MISSING LDFLAGS+= -pthread @@ -37,11 +27,16 @@ GROUPS= minbif SUB_FILES= pkg-message SUB_LIST= USERS="${USERS}" -PORTDOCS= * -PLIST_FILES= bin/minbif %%ETCDIR%%/minbif.conf-dist \ - %%ETCDIR%%/minbif.motd-dist man/man8/minbif.8.gz +OPTIONS_DEFINE= CACA GNUTLS VIDEO PLUGINS DOCS +OPTIONS_DEFAULT= CACA +VIDEO_IMPLIES= CACA -CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca +CACA_DESC= Buddy icon display using libcaca +VIDEO_DESC= Webcam display using libcaca (implies CACA) +PLUGINS_DESC= Compile additional libpurple-plugins + +CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca \ + libImlib2.so:${PORTSDIR}/graphics/imlib2 CACA_CMAKE_ON= -DENABLE_CACA:BOOL=ON -DENABLE_IMLIB:BOOL=ON CACA_CMAKE_OFF= -DENABLE_CACA:BOOL=OFF -DENABLE_IMLIB:BOOL=OFF @@ -55,55 +50,35 @@ PLUGINS_CMAKE_OFF= -DENABLE_PLUGIN:BOOL= PLUGINS_PLIST_FILES= lib/purple-2/libcoincoin.so \ lib/purple-2/libgayattitude.so -.include - -.if ${PORT_OPTIONS:MVIDEO} && !empty(PORT_OPTIONS:MCACA) -USE_GSTREAMER+= core good -LIB_DEPENDS+= libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2 -CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=ON -.else -CMAKE_ARGS+= -DENABLE_VIDEO:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MCACA} -LIB_DEPENDS+= libImlib2.so:${PORTSDIR}/graphics/imlib2 -.endif - -.if ${PORT_OPTIONS:MVIDEO} && empty(PORT_OPTIONS:MCACA) -IGNORE= if you want to enable webcam support, you must also enable CACA -.endif +VIDEO_USE= GSTREAMER=core,good +VIDEO_CMAKE_ON= -DENABLE_VIDEO:BOOL=ON +VIDEO_CMAKE_OFF= -DENABLE_VIDEO:BOOL=OFF +VIDEO_LIB_DEPENDS= libgstfarsight-0.10.so:${PORTSDIR}/net-im/farsight2 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 - -post-build: - @${LN} -sf minbif.conf ${WRKSRC}/minbif.conf-dist - @${LN} -sf minbif.motd ${WRKSRC}/minbif.motd-dist + @${REINPLACE_CMD} -e '/pam_misc\.h/d' ${WRKSRC}/src/im/auth_pam.h do-install: - (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/man && ${INSTALL_MAN} minbif.8 \ - ${STAGEDIR}${MAN8PREFIX}/man/man8) + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/minbif.8 ${STAGEDIR}${MANPREFIX}/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_DATA} ${WRKSRC}/minbif.conf \ + ${STAGEDIR}${ETCDIR}/minbif.conf.sample + ${INSTALL_DATA} ${WRKSRC}/minbif.motd \ + ${STAGEDIR}${ETCDIR}/minbif.motd.sample + +do-install-PLUGINS-on: @${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 + ${INSTALL_LIB} ${WRKSRC}/plugins/coincoin/libcoincoin.so \ + ${WRKSRC}/plugins/gayattitude/libgayattitude.so \ + ${STAGEDIR}${PREFIX}/lib/purple-2 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} README \ - ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC}/doc && ${INSTALL_DATA} minbif.xinetd \ - ${STAGEDIR}${DOCSDIR}) +.for f in AUTHORS ChangeLog README doc/minbif.xinetd + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} +.endfor .include Modified: head/irc/minbif/files/patch-src__im__account.cpp ============================================================================== --- head/irc/minbif/files/patch-src__im__account.cpp Mon Jan 25 15:11:23 2016 (r407219) +++ head/irc/minbif/files/patch-src__im__account.cpp Mon Jan 25 15:13:23 2016 (r407220) @@ -1,4 +1,4 @@ ---- src/im/account.cpp.orig +--- src/im/account.cpp.orig 2011-12-04 14:24:51 UTC +++ src/im/account.cpp @@ -18,6 +18,7 @@ @@ -8,3 +8,12 @@ #ifdef HAVE_IMLIB #include #endif /* HAVE_IMLIB */ +@@ -272,7 +273,7 @@ void Account::setBuddyIcon(string filena + else + { + char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); +- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; ++ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; + + close(temp_fd); + /* Try to encode in a supported format. */ Modified: head/irc/minbif/pkg-descr ============================================================================== --- head/irc/minbif/pkg-descr Mon Jan 25 15:11:23 2016 (r407219) +++ head/irc/minbif/pkg-descr Mon Jan 25 15:13:23 2016 (r407220) @@ -1,4 +1,7 @@ -Minbif aims to use the libpurple library from the Pidgin project -to provide an IRC-friendly instant messaging client. +Minbif aims to use the libpurple library from the Pidgin project to provide +an IRC-friendly instant messaging client. -WWW: http://minbif.im +It is very easy to setup, does not require any non-standard authentication, +and just uses the server password feature of IRC clients. + +https://symlink.me/projects/minbif/wiki/ Added: head/irc/minbif/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/minbif/pkg-plist Mon Jan 25 15:13:23 2016 (r407220) @@ -0,0 +1,8 @@ +bin/minbif +@sample %%ETCDIR%%/minbif.conf.sample +@sample %%ETCDIR%%/minbif.motd.sample +man/man8/minbif.8.gz +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/minbif.xinetd