Date: Wed, 22 Jan 2014 08:37:02 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: frank@altpeter.de Subject: ports/185981: [PATCH] net-im/centerim-devel: fix build on 10.x, staging Message-ID: <20140122043702.D2E0221A85@hades.panopticon> Resent-Message-ID: <201401220440.s0M4e0NT024093@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185981
>Category: ports
>Synopsis: [PATCH] net-im/centerim-devel: fix build on 10.x, staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 22 04:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix build on 10.x
- Support staging
- Use new LIB_DEPENDS syntax
- Convert USE_GMAKE to USES
- Use new OPTIONS features
Port maintainer (frank@altpeter.de) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- centerim-devel-4.22.10.11_2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 340679)
+++ Makefile (working copy)
@@ -14,7 +14,7 @@
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 @@
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 @@
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>
+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
+MLJ_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_WITH= ssl gpgme
-.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
-
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>
Index: files/patch-libjabber-jconn.c
===================================================================
--- files/patch-libjabber-jconn.c (revision 0)
+++ files/patch-libjabber-jconn.c (working copy)
@@ -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;
+ }
Property changes on: files/patch-libjabber-jconn.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src-hooks-abstracthook.h
===================================================================
--- files/patch-src-hooks-abstracthook.h (revision 0)
+++ files/patch-src-hooks-abstracthook.h (working copy)
@@ -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;
Property changes on: files/patch-src-hooks-abstracthook.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 340679)
+++ pkg-plist (working copy)
@@ -3,6 +3,8 @@
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
--- centerim-devel-4.22.10.11_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140122043702.D2E0221A85>