- Fix build on 10.x

- Support staging
- Use new LIB_DEPENDS syntax
- Convert USE_GMAKE to USES
- Use new OPTIONS features

PR:		185981
Submitted by:	amdmi3
Approved by:	maintainer timeout

4 files changed, 104 insertions, 69 deletions

diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 92ce5f309b1a..288ad066b3f4 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Text mode menu- and window-driven IM interface
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_PYTHON_RUN=	yes
 USES=		iconv gmake perl5 pkgconfig
@@ -25,6 +25,7 @@ CONFIGURE_ARGS=	--with-ssl --with-openssl
 CONFLICTS=	centericq-[0-9]* centerim-[0-9]*
 
 OPTIONS_DEFINE=	NLS MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
+
 FRIBIDI_DESC=	Fribidi Support
 MSN_DESC=	MSN Protocol
 YAHOO_DESC=	Yahoo! Messenger Protocol
@@ -37,82 +38,33 @@ GG_DESC=	Gadu-Gadu Protocol Support
 
 OPTIONS_DEFAULT=	MULTIBYTE FRIBIDI MSN YAHOO AIM IRC JABBER GPGME RSS LJ GG
 
-MAN1=	cimconv.1 centerim.1
+OPTIONS_SUB=	yes
 
 PORTDOCS=	FAQ README
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMULTIBYTE}
-CONFIGURE_ARGS+=	--enable-locales-fix
-.endif
-
-.if ${PORT_OPTIONS:MFRIBIDI}
-LIB_DEPENDS+=		fribidi.3:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+=	--with-fribidi
-.endif
-
-.if ! ${PORT_OPTIONS:MMSN}
-CONFIGURE_ARGS+=	--disable-msn
-.endif
-
-.if ! ${PORT_OPTIONS:MYAHOO}
-CONFIGURE_ARGS+=	--disable-yahoo
-.endif
-
-.if ! ${PORT_OPTIONS:MAIM}
-CONFIGURE_ARGS+=	--disable-aim
-.endif
-
-.if ! ${PORT_OPTIONS:MIRC}
-CONFIGURE_ARGS+=	--disable-irc
-.endif
-
-.if ! ${PORT_OPTIONS:MJABBER}
-CONFIGURE_ARGS+=	--disable-jabber
-.else
-.endif
-
-.if ! ${PORT_OPTIONS:MGPGME}
-CONFIGURE_ARGS+=	--without-gpgme
-.else
-LIB_DEPENDS+=		libgpgme.so:${PORTSDIR}/security/gpgme
-#CONFIGURE_ARGS+=	--with-gpgme=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-ssl
-.endif
-
-.if ! ${PORT_OPTIONS:MRSS}
-CONFIGURE_ARGS+=	--disable-rss
-.endif
-
-.if ! ${PORT_OPTIONS:MLJ}
-CONFIGURE_ARGS+=	--disable-lj
-.endif
-
-.if ! ${PORT_OPTIONS:MGG}
-CONFIGURE_ARGS+=	--disable-gg
-.else
-LIB_DEPENDS+=		gadu.3:${PORTSDIR}/polish/ekg
-LIBGADU=		-lgadu
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+MULTIBYTE_CONFIGURE_ENABLE=locales-fix
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_CONFIGURE_WITH=	fribidi
+MSN_CONFIGURE_ENABLE=	msn
+YAHOO_CONFIGURE_ENABLE=	yahoo
+AIM_CONFIGURE_ENABLE=	aim
+IRC_CONFIGURE_ENABLE=	irc
+JABBER_CONFIGURE_ENABLE=jabber
+RSS_CONFIGURE_ENABLE=	rss
+LJ_CONFIGURE_ENABLE=	lj
+GG_LIB_DEPENDS=		libgadu.so:${PORTSDIR}/polish/ekg
+GG_CONFIGURE_ENABLE=	gg
+GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_CONFIGURE_OFF=	--with-gpgme-prefix=/nonexistent
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/run/screen|/tmp/screens|' \
 		${WRKSRC}/src/icqconf.cc
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
 
 .include <bsd.port.mk>
diff --git a/net-im/centerim-devel/files/patch-libjabber-jconn.c b/net-im/centerim-devel/files/patch-libjabber-jconn.c
new file mode 100644
index 000000000000..7f019ce5659e
--- /dev/null
+++ b/net-im/centerim-devel/files/patch-libjabber-jconn.c
@@ -0,0 +1,54 @@
+--- libjabber/jconn.c.orig	2011-05-23 01:06:31.000000000 +0400
++++ libjabber/jconn.c	2014-01-21 07:29:07.642848274 +0400
+@@ -824,7 +824,7 @@
+ 		free(hash);
+ 		close(sock);
+ 		close(fd_file);
+-		return;
++		return NULL;
+ 	}
+ 	 
+ 	recv( sock, buff, SEND_BUF, 0 );
+@@ -833,7 +833,7 @@
+ 		free(hash);
+ 		close(sock);
+ 		close(fd_file);
+-		return;
++		return NULL;
+ 	}
+ 	 
+ //socks5 bytestream packet	 
+@@ -851,7 +851,7 @@
+ 		free(hash);
+ 		close(sock);
+ 		close(fd_file);
+-		return;
++		return NULL;
+ 	}
+ 	recv( sock, buff, 47, 0 );
+ 	if( buff[0] != 0x05 || buff[3] != 0x03 )
+@@ -859,7 +859,7 @@
+ 		free(hash);
+ 		close(sock);
+ 		close(fd_file);
+-		return;
++		return NULL;
+ 	}
+ 
+ 
+@@ -889,6 +889,7 @@
+ 
+ 	 
+ #endif
++	return NULL;
+ }
+  
+ 
+@@ -961,5 +962,6 @@
+  
+ 	pthread_exit(0);
+ #endif
+-	 
++
++	return NULL;
+ }
diff --git a/net-im/centerim-devel/files/patch-src-hooks-abstracthook.h b/net-im/centerim-devel/files/patch-src-hooks-abstracthook.h
new file mode 100644
index 000000000000..1aa62b5bfa62
--- /dev/null
+++ b/net-im/centerim-devel/files/patch-src-hooks-abstracthook.h
@@ -0,0 +1,27 @@
+--- src/hooks/abstracthook.h.orig	2011-05-23 01:06:31.000000000 +0400
++++ src/hooks/abstracthook.h	2014-01-21 08:30:44.206593005 +0400
+@@ -47,11 +47,7 @@
+ };
+ 
+ class abstracthook {
+-    protected:
+-	enum Encoding {
+-	    encUTF, encKOI, encUnknown
+-	};
+-
++	public:
+ 	enum logevent {
+ 	    logConnecting,
+ 	    logLogged,
+@@ -63,6 +59,11 @@
+ 	    logConfMembers
+ 	};
+ 
++    protected:
++	enum Encoding {
++	    encUTF, encKOI, encUnknown
++	};
++
+ 	protocolname proto;
+ 	imstatus manualstatus;
+ 	verticalmenu *searchdest;
diff --git a/net-im/centerim-devel/pkg-plist b/net-im/centerim-devel/pkg-plist
index 532a07c231cc..e92c4b2e9feb 100644
--- a/net-im/centerim-devel/pkg-plist
+++ b/net-im/centerim-devel/pkg-plist
@@ -3,6 +3,8 @@ bin/centerim
 bin/cimconv
 bin/cimextracthistory.pl
 bin/cimformathistory
+man/man1/cimconv.1.gz
+man/man1/centerim.1.gz
 %%DATADIR%%/email.wav
 %%DATADIR%%/msg.wav
 %%DATADIR%%/offline.wav