Date: Thu, 4 Aug 2011 03:24:07 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159481: Update port: irc/bobot++ to 2.2.3 Message-ID: <20110804032407.3c68a9c2.tkato432@yahoo.com> Resent-Message-ID: <201108031840.p73IeXr0077472@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159481
>Category: ports
>Synopsis: Update port: irc/bobot++ to 2.2.3
>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 Aug 03 18:40:33 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.2.3
New file:
files/patch-documentation__bobot++.texinfo
Remove file:
files/patch-source_Parser.C
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/irc/bobot++/Makefile irc/bobot++/Makefile
--- /usr/ports/irc/bobot++/Makefile 2011-08-01 02:50:54.000000000 +0900
+++ irc/bobot++/Makefile 2011-08-02 23:18:23.000000000 +0900
@@ -7,43 +7,56 @@
#
PORTNAME= bobotpp
-PORTVERSION= 2.0.2
-PORTREVISION= 5
+PORTVERSION= 2.2.3
CATEGORIES= irc
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= bobotpp
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= An IRC bot written in C++
+OPTIONS= GUILE "Use Guile scripts" on
+
+LICENSE= GPLv2 GPLv3
+LICENSE_COMB= dual
+
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
+
+INFO= bobot++
+PORTDOCS= *
+PORTEXAMPLES= *
+PLIST_FILES= bin/${PORTNAME}
+
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.include <bsd.port.pre.mk>
.if defined(WITHOUT_GUILE)
CONFIGURE_ARGS+= --disable-scripting
.else
LIB_DEPENDS+= guile.21:${PORTSDIR}/lang/guile
CONFIGURE_ARGS+= --enable-scripting
+PLIST_FILES+= share/guile/site/bobotpp/bot.scm \
+ %%DATADIR%%/scripts/bobot-utils.scm
+PLIST_DIRS+= %%DATADIR%%/scripts \
+ %%DATADIR%% \
+ share/guile/site/bobotpp
+PLIST_DIRSTRY+= share/guile/site
.endif
-.if defined(WITH_TELNET)
-CONFIGURE_ARGS+= --enable-telnetserver
-.else
-CONFIGURE_ARGS+= --disable-telnetserver
-.endif
-
-post-extract:
- @${FIND} ${WRKSRC}/scripts -name "*~" -delete
+post-patch:
+ @${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|std::snprintf|snprintf|g' ${WRKSRC}/source/Bot.C
-.if !defined(NOPORTDOCS)
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${CP} ${WRKSRC}/doc/* ${DOCSDIR}
+ @(cd ${WRKSRC}/documentation && ${INSTALL_DATA} *.html ${DOCSDIR})
+.endif
+.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${EXAMPLESDIR}
- ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
- @${MKDIR} ${DATADIR}
- ${CP} -R ${WRKSRC}/scripts ${DATADIR}
+ @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/irc/bobot++/distinfo irc/bobot++/distinfo
--- /usr/ports/irc/bobot++/distinfo 2010-11-23 19:16:44.000000000 +0900
+++ irc/bobot++/distinfo 2011-03-21 11:54:27.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (bobotpp-2.0.2.tar.gz) = 60a21ef0486870aabdd63b79bc21ae3e4a55c2064c973e5ed84dbb64eacb6801
-SIZE (bobotpp-2.0.2.tar.gz) = 154007
+SHA256 (bobotpp-2.2.3.tar.gz) = b45e84529b4417d31686e355951e0d4ceb7f0bb470f5c6498adb530f50a6d908
+SIZE (bobotpp-2.2.3.tar.gz) = 301675
diff -urN /usr/ports/irc/bobot++/files/patch-documentation__bobot++.texinfo irc/bobot++/files/patch-documentation__bobot++.texinfo
--- /usr/ports/irc/bobot++/files/patch-documentation__bobot++.texinfo 1970-01-01 09:00:00.000000000 +0900
+++ irc/bobot++/files/patch-documentation__bobot++.texinfo 2011-03-21 13:03:34.000000000 +0900
@@ -0,0 +1,12 @@
+--- documentation/bobot++.texinfo.orig 2008-11-13 09:51:42.000000000 +0900
++++ documentation/bobot++.texinfo 2011-03-21 12:50:48.000000000 +0900
+@@ -1,6 +1,9 @@
+ \input texinfo @c -*- texinfo -*-
+ @c %**start of header
+ @setfilename bobot++.info
++@direntry
++* Bobot++: (bobot++). A Schemeable IRC Bot.
++@end direntry
+ @settitle Bobot++: A Schemeable IRC Bot
+ @setchapternewpage on
+ @c %**end of header
diff -urN /usr/ports/irc/bobot++/files/patch-source_Parser.C irc/bobot++/files/patch-source_Parser.C
--- /usr/ports/irc/bobot++/files/patch-source_Parser.C 2008-03-02 08:35:46.000000000 +0900
+++ irc/bobot++/files/patch-source_Parser.C 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- source/Parser.C.orig 2008-03-01 18:34:26.000000000 -0500
-+++ source/Parser.C 2008-03-01 18:34:45.000000000 -0500
-@@ -991,8 +991,8 @@ Parser::parseScriptFunction(ServerConnec
- wd.func = scmFunc;
- wd.args = args_list;
-
-- gh_catch(SCM_BOOL_T, (scm_catch_body_t) scm_apply_wrapper,
-- (void *)&wd, (scm_catch_handler_t) Interp::ErrorHandler,
-+ gh_catch(SCM_BOOL_T, (scm_t_catch_body) scm_apply_wrapper,
-+ (void *)&wd, (scm_t_catch_handler) Interp::ErrorHandler,
- 0);
- }
- #endif
diff -urN /usr/ports/irc/bobot++/pkg-plist irc/bobot++/pkg-plist
--- /usr/ports/irc/bobot++/pkg-plist 2003-05-02 17:04:44.000000000 +0900
+++ irc/bobot++/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,28 +0,0 @@
-bin/bobotpp
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.log
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.help
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.init
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.shit
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.users
-%%PORTDOCS%%%%EXAMPLESDIR%%/bot.autoexec
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%%%DATADIR%%/scripts/bobot-utils.scm
-%%PORTDOCS%%%%DATADIR%%/scripts/boulet
-%%PORTDOCS%%%%DATADIR%%/scripts/country
-%%PORTDOCS%%%%DATADIR%%/scripts/eval
-%%PORTDOCS%%%%DATADIR%%/scripts/hello
-%%PORTDOCS%%%%DATADIR%%/scripts/scheme_add_user
-%%PORTDOCS%%%%DATADIR%%/scripts/scripts.load
-%%PORTDOCS%%%%DATADIR%%/scripts/stupid_stuff/insert_saying.scm
-%%PORTDOCS%%%%DATADIR%%/scripts/stupid_stuff/sayings
-%%PORTDOCS%%%%DATADIR%%/scripts/stupid_stuff/sayings.sh
-%%PORTDOCS%%%%DATADIR%%/scripts/stupid_stuff/stupid_stuff
-%%PORTDOCS%%%%DATADIR%%/scripts/tamere
-%%PORTDOCS%%%%DATADIR%%/scripts/uname
-%%PORTDOCS%%%%DATADIR%%/scripts/uptime
-%%PORTDOCS%%@dirrm %%DATADIR%%/scripts/stupid_stuff
-%%PORTDOCS%%@dirrm %%DATADIR%%/scripts
-%%PORTDOCS%%@dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110804032407.3c68a9c2.tkato432>