- 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

4 files changed, 56 insertions, 61 deletions

diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile
index 6c9286525e5f..15e15153aa23 100644
--- a/irc/minbif/Makefile
+++ b/irc/minbif/Makefile
@@ -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 gateway
 
 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=OFF
 PLUGINS_PLIST_FILES=	lib/purple-2/libcoincoin.so \
 			lib/purple-2/libgayattitude.so
 
-.include <bsd.port.options.mk>
-
-.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 <bsd.port.mk>
diff --git a/irc/minbif/files/patch-src__im__account.cpp b/irc/minbif/files/patch-src__im__account.cpp
index 77c79f62a991..457c421a9257 100644
--- a/irc/minbif/files/patch-src__im__account.cpp
+++ b/irc/minbif/files/patch-src__im__account.cpp
@@ -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 <Imlib2.h>
  #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. */
diff --git a/irc/minbif/pkg-descr b/irc/minbif/pkg-descr
index 586ef96b4bc2..53294961335e 100644
--- a/irc/minbif/pkg-descr
+++ b/irc/minbif/pkg-descr
@@ -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/
diff --git a/irc/minbif/pkg-plist b/irc/minbif/pkg-plist
new file mode 100644
index 000000000000..7d2f190671a9
--- /dev/null
+++ b/irc/minbif/pkg-plist
@@ -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