From owner-svn-ports-head@FreeBSD.ORG Mon Dec 9 02:43:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57334321; Mon, 9 Dec 2013 02:43:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 401B418FF; Mon, 9 Dec 2013 02:43:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB92hetA072753; Mon, 9 Dec 2013 02:43:40 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB92hbta072736; Mon, 9 Dec 2013 02:43:37 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201312090243.rB92hbta072736@svn.freebsd.org> From: Adam Weinberger Date: Mon, 9 Dec 2013 02:43:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335950 - in head/irc: gruftistats gruftistats/files infobot irssistats irssistats/files lostirc lostirc/files ratbox-respond slirc thales 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.17 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, 09 Dec 2013 02:43:40 -0000 Author: adamw Date: Mon Dec 9 02:43:37 2013 New Revision: 335950 URL: http://svnweb.freebsd.org/changeset/ports/335950 Log: - NOPORTDOCS -> PORT_OPTIONS:MDOCS - Staging - Use OPTIONS where appropriate - Rename old-style patch files Added: head/irc/lostirc/files/patch-src_libirc_DCC.cpp - copied unchanged from r335949, head/irc/lostirc/files/patch-src::libirc::DCC.cpp head/irc/lostirc/files/patch-src_libirc_Parser.cpp - copied unchanged from r335949, head/irc/lostirc/files/patch-src::libirc::Parser.cpp Deleted: head/irc/gruftistats/files/ head/irc/irssistats/files/patch-Makefile head/irc/lostirc/files/patch-src::libirc::DCC.cpp head/irc/lostirc/files/patch-src::libirc::Parser.cpp Modified: head/irc/gruftistats/Makefile head/irc/gruftistats/pkg-plist head/irc/infobot/Makefile head/irc/infobot/pkg-plist head/irc/irssistats/Makefile head/irc/irssistats/pkg-plist head/irc/lostirc/Makefile head/irc/lostirc/pkg-plist head/irc/ratbox-respond/Makefile head/irc/slirc/Makefile head/irc/thales/Makefile head/irc/thales/pkg-plist Modified: head/irc/gruftistats/Makefile ============================================================================== --- head/irc/gruftistats/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/gruftistats/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -11,15 +11,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Produces a web page of statistics and quotes from IRC channel logs GNU_CONFIGURE= YES -USE_GMAKE= YES +USES= gmake -.if defined(NOPORTDOCS) -MAKE_ARGS= NOPORTDOCS=1 -.endif - -MAN1= gruftistats.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e \ 's,strcasestr,strcasestr_x,g' ${WRKSRC}/ircstats.h \ Modified: head/irc/gruftistats/pkg-plist ============================================================================== --- head/irc/gruftistats/pkg-plist Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/gruftistats/pkg-plist Mon Dec 9 02:43:37 2013 (r335950) @@ -1,4 +1,5 @@ bin/gruftistats +man/man1/gruftistats.1.gz %%PORTDOCS%%share/doc/gruftistats/AUTHORS %%PORTDOCS%%share/doc/gruftistats/COPYING %%PORTDOCS%%share/doc/gruftistats/ChangeLog Modified: head/irc/infobot/Makefile ============================================================================== --- head/irc/infobot/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/infobot/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -11,24 +11,27 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Bot written in Perl with a rabid AI USES= perl5 +USE_PERL5= run NO_BUILD= yes -NO_STAGE= yes +post-patch: + -@${RM} ${WRKSRC}/src/*.orig +.for i in config help users + @${RM} ${WRKSRC}/conf/infobot.$i +.endfor + do-install: - ${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${CP} -r ${WRKSRC}/src ${WRKSRC}/extras ${WRKSRC}/files \ - ${WRKSRC}/scripts ${DATADIR}/ - ${RM} ${DATADIR}/src/*.orig -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${DOCSDIR} -.endif - ${MKDIR} ${PREFIX}/etc/infobot - ${INSTALL_DATA} ${WRKSRC}/conf/* ${PREFIX}/etc/infobot + ${WRKSRC}/scripts ${STAGEDIR}${DATADIR}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/REVISIONS ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${ETCDIR} ${SED} -e 's,$$param{\(.\)basedir\(.\)} = .*,$$param{\1basedir\2} = "${DATADIR}";,' \ - -e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${PREFIX}/etc/infobot";,' \ + -e 's,$$param{\(.\)confdir\(.\)} = .*,$$param{\1confdir\2} = "${ETCDIR}";,' \ ${WRKSRC}/infobot > ${WRKDIR}/infobot - ${INSTALL_SCRIPT} ${WRKDIR}/infobot ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/infobot ${STAGEDIR}${PREFIX}/bin .include Modified: head/irc/infobot/pkg-plist ============================================================================== --- head/irc/infobot/pkg-plist Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/infobot/pkg-plist Mon Dec 9 02:43:37 2013 (r335950) @@ -1,18 +1,21 @@ bin/infobot -etc/infobot/infobot-are.txt -etc/infobot/infobot-is.txt -etc/infobot/infobot.channels -@unexec if cmp -s %D/etc/infobot/infobot.config %D/etc/infobot/infobot.config-dist; then rm -f %D/etc/infobot/infobot.config; fi -etc/infobot/infobot.config-dist -etc/infobot/infobot.crontab -@unexec if cmp -s %D/etc/infobot/infobot.help %D/etc/infobot/infobot.help-dist; then rm -f %D/etc/infobot/infobot.help; fi -etc/infobot/infobot.help-dist -@unexec if cmp -s %D/etc/infobot/infobot.users %D/etc/infobot/infobot.users-dist; then rm -f %D/etc/infobot/infobot.users; fi -etc/infobot/infobot.users-dist -etc/infobot/magic8.txt -etc/infobot/sane-are.txt -etc/infobot/sane-ignore.txt -etc/infobot/sane-is.txt +%%ETCDIR%%/infobot-are.txt +%%ETCDIR%%/infobot-is.txt +%%ETCDIR%%/infobot.channels +@unexec if cmp -s %D/%%ETCDIR%%/infobot.config %D/%%ETCDIR%%/infobot.config-dist; then rm -f %D/%%ETCDIR%%/infobot.config; fi +%%ETCDIR%%/infobot.config-dist +@exec if [ ! -f %D/%%ETCDIR%%/infobot.config ]; then cp -p %D/%F %B/infobot.config; fi +%%ETCDIR%%/infobot.crontab +@unexec if cmp -s %D/%%ETCDIR%%/infobot.help %D/%%ETCDIR%%/infobot.help-dist; then rm -f %D/%%ETCDIR%%/infobot.help; fi +%%ETCDIR%%/infobot.help-dist +@exec if [ ! -f %D/%%ETCDIR%%/infobot.help ]; then cp -p %D/%F %B/infobot.help; fi +@unexec if cmp -s %D/%%ETCDIR%%/infobot.users %D/%%ETCDIR%%/infobot.users-dist; then rm -f %D/%%ETCDIR%%/infobot.users; fi +%%ETCDIR%%/infobot.users-dist +@exec if [ ! -f %D/%%ETCDIR%%/infobot.users ]; then cp -p %D/%F %B/infobot.users; fi +%%ETCDIR%%/magic8.txt +%%ETCDIR%%/sane-are.txt +%%ETCDIR%%/sane-ignore.txt +%%ETCDIR%%/sane-is.txt %%DATADIR%%/extras/ANSI.pl %%DATADIR%%/extras/Aviation.pl %%DATADIR%%/extras/DNS.pl @@ -77,6 +80,6 @@ etc/infobot/sane-is.txt @dirrm %%DATADIR%%/extras @dirrm %%DATADIR%%/files @dirrm %%DATADIR%%/scripts -@dirrmtry etc/infobot -@dirrmtry share/infobot/src -@dirrmtry share/infobot +@dirrmtry %%DATADIR%%/src +@dirrmtry %%DATADIR%% +@dirrmtry %%ETCDIR%% Modified: head/irc/irssistats/Makefile ============================================================================== --- head/irc/irssistats/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/irssistats/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -9,19 +9,20 @@ MASTER_SITES= http://royale.zerezo.com/i MAINTAINER= ports@FreeBSD.org COMMENT= Generate IRC statistics based on irssi logs -MAKE_ARGS+= DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" EXAMPLESDIR="${EXAMPLESDIR}" PREFIX="${PREFIX}" \ - CC="${CC}" CFLAGS="${CFLAGS}" +LICENSE= GPLv2 -MAN1= irssistats.1 ALL_TARGET= irssistats -INSTALL_TARGET= install -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c + ${REINPLACE_CMD} -e 's|/etc/irssistats.conf|${PREFIX}/etc/irssistats.conf|g' ${WRKSRC}/irssistats.c + ${REINPLACE_CMD} -e 's/gcc/$$(CC)/g' ${WRKSRC}/Makefile -.if defined(NOPORTDOCS) -MAKE_ARGS+= NOPORTDOCS="${NOPORTDOCS}" -.endif +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/sample.* ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Modified: head/irc/irssistats/pkg-plist ============================================================================== --- head/irc/irssistats/pkg-plist Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/irssistats/pkg-plist Mon Dec 9 02:43:37 2013 (r335950) @@ -1,5 +1,5 @@ bin/irssistats -%%PORTDOCS%%%%DOCSDIR%%/COPYING +man/man1/irssistats.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%DATADIR%%/biseau.css %%DATADIR%%/biseau_corner1.gif @@ -40,9 +40,9 @@ bin/irssistats %%DATADIR%%/vm.png %%DATADIR%%/zeduel.css %%DATADIR%%/zerezo.css -%%EXAMPLESDIR%%/sample.configfile -%%EXAMPLESDIR%%/sample.nickfile -%%EXAMPLESDIR%%/sample.photofile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.configfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.nickfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.photofile @dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/irc/lostirc/Makefile ============================================================================== --- head/irc/lostirc/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/lostirc/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -13,25 +13,20 @@ COMMENT= A simple and minimal IRC client LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 -USES= pathfix pkgconfig +USES= pathfix pkgconfig gettext USE_GNOME= gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-kde -MAN1= lostirc.1 - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS ChangeLog TODO README INSTALL - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Copied: head/irc/lostirc/files/patch-src_libirc_DCC.cpp (from r335949, head/irc/lostirc/files/patch-src::libirc::DCC.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/lostirc/files/patch-src_libirc_DCC.cpp Mon Dec 9 02:43:37 2013 (r335950, copy of r335949, head/irc/lostirc/files/patch-src::libirc::DCC.cpp) @@ -0,0 +1,17 @@ +--- src/libirc/DCC.cpp.ori Sat Feb 7 17:25:51 2004 ++++ src/libirc/DCC.cpp Sat Feb 7 17:27:32 2004 +@@ -16,12 +16,13 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + ++#include ++ + #ifndef WIN32 + #include + #include + #include + #else +-#include + #include + #define stat _stat + #endif Copied: head/irc/lostirc/files/patch-src_libirc_Parser.cpp (from r335949, head/irc/lostirc/files/patch-src::libirc::Parser.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/lostirc/files/patch-src_libirc_Parser.cpp Mon Dec 9 02:43:37 2013 (r335950, copy of r335949, head/irc/lostirc/files/patch-src::libirc::Parser.cpp) @@ -0,0 +1,11 @@ +--- src/libirc/Parser.cpp.orig Sat May 31 09:25:44 2003 ++++ src/libirc/Parser.cpp Mon Jul 7 00:37:53 2003 +@@ -681,7 +681,7 @@ + ss >> time; + + long date = std::atol(time.c_str()); +- time = std::ctime(&date); ++ time = std::ctime((const time_t *)&date); + + Channel *c = _conn->findChannel(chan); + assert(c); Modified: head/irc/lostirc/pkg-plist ============================================================================== --- head/irc/lostirc/pkg-plist Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/lostirc/pkg-plist Mon Dec 9 02:43:37 2013 (r335950) @@ -1,4 +1,5 @@ bin/lostirc +man/man1/lostirc.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL Modified: head/irc/ratbox-respond/Makefile ============================================================================== --- head/irc/ratbox-respond/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/ratbox-respond/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -3,6 +3,7 @@ PORTNAME= ratbox-respond PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= irc sysutils MASTER_SITES= http://respond.ratbox.org/download/ EXTRACT_SUFX= .tgz @@ -16,24 +17,16 @@ BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} USE_OPENSSL= yes GNU_CONFIGURE= yes -SUB_FILES= pkg-message - -PORTDOCS= * +PORTDOCS= challenge.txt PORTEXAMPLES= * PLIST_FILES= bin/ratbox-respond bin/makekeypair -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/makekeypair ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} challenge.txt ${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR}/client-scripts - ${INSTALL_DATA} ${WRKSRC}/client-scripts/* ${EXAMPLESDIR}/client-scripts -.endif - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/makekeypair ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/challenge.txt ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/client-scripts/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/irc/slirc/Makefile ============================================================================== --- head/irc/slirc/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/slirc/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -46,8 +46,9 @@ NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE}," ${WRKSRC}/Makefile ${WRKSRC}/scripts/init.sl +.include post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${PREFIX}/share/doc/slirc .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/slirc/ Modified: head/irc/thales/Makefile ============================================================================== --- head/irc/thales/Makefile Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/thales/Makefile Mon Dec 9 02:43:37 2013 (r335950) @@ -16,59 +16,53 @@ USE_GMAKE= yes USE_MYSQL= yes USE_RC_SUBR= thales +OPTIONS_DEFINE= MODES +OPTIONS_RADIO= IRCD +OPTIONS_RADIO_IRCD= HYBRID IRCDRU UNREAL +OPTIONS_DEFAULT=MODES UNREAL +MODES_DESC= Support modes in the database +HYBRID_DESC= Build for ircd-hybrid +IRCDRU_DESC= Build for ircd-ru +UNREAL_DESC= Build for unreal ircd + +HYBRID_RUN_DEPENDS= ${LOCALBASE}/bin/ircd:${PORTSDIR}/irc/ircd-hybrid +IRCDRU_RUN_DEPENDS= ${LOCALBASE}/sbin/ircd:${PORTSDIR}/irc/ircd-ru +UNREAL_RUN_DEPENDS= ${LOCALBASE}/libexec/ircd:${PORTSDIR}/irc/unreal + # Currently, not all supported IRCDs are handled here, only the ones # I could find corresponding RUN_DEPENDS in our Ports Collection. -.if defined(WITH_IRCD) && ${WITH_IRCD} == hybrid -RUN_DEPENDS= ${LOCALBASE}/bin/ircd:${PORTSDIR}/irc/ircd-hybrid +.include +.if ${PORT_OPTIONS:MHYBRID} +_IRCD= hybrid IS_INTERACTIVE= yes -.elif defined(WITH_IRCD) && ${WITH_IRCD} == ircdru -RUN_DEPENDS= ${LOCALBASE}/sbin/ircd:${PORTSDIR}/irc/ircd-ru +.elif ${PORT_OPTIONS:MIRCDRU} +_IRCD= ircdru IS_INTERACTIVE= yes .else -WITH_IRCD= unreal -RUN_DEPENDS= ${LOCALBASE}/libexec/ircd:${PORTSDIR}/irc/unreal +_IRCD= unreal .endif # ``Assign with expansion'' is needed here, otherwise we cannot override # WITH_IRCD value supplied as make(1) argument (which can be bogus). -CONFIGURE_ARGS:= --with-ircd=${WITH_IRCD} \ +CONFIGURE_ARGS:= --with-ircd=${_IRCD} \ --prefix=${PREFIX}/sbin/thales \ --with-mysql=${LOCALBASE} \ --with-mysql-libraries=${LOCALBASE}/lib/mysql -.if defined(WITHOUT_MODES) -CONFIGURE_ARGS+= --enable-no-modes -.endif - -pre-everything:: .SILENT - ${ECHO_CMD} "" - ${ECHO_CMD} "You may specify the IRCD which thales is compiled for" - ${ECHO_CMD} "" - ${ECHO_CMD} " WITH_IRCD=foo" - ${ECHO_CMD} "" - ${ECHO_CMD} "The default value is \"unreal\". Other possible values are:" - ${ECHO_CMD} " bahamut, hybrid, ircdru, unreal, ultimate28, ultimate30" - ${ECHO_CMD} "" - ${ECHO_CMD} "Additinal tunables:" - ${ECHO_CMD} "" - ${ECHO_CMD} " WITHOUT_MODES Disable modes in the database (default: on)" - ${ECHO_CMD} "" +MODES_CONFIGURE_OFF= --enable-no-modes post-patch: .SILENT ${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -rf {} \; ${REINPLACE_CMD} -e 's,thales.conf,${PREFIX}/etc/&,' \ ${WRKSRC}/src/conf.h -NO_STAGE= yes do-install: - @${MKDIR} ${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${PREFIX}/sbin - ${INSTALL_DATA} ${WRKSRC}/data/thales.conf.default ${PREFIX}/etc - ${INSTALL_DATA} ${WRKSRC}/data/*.sql ${DATADIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${EXAMPLESDIR} ${DATADIR}/tools - ${CP} -r ${WRKSRC}/examples/* ${EXAMPLESDIR} - ${CP} -r ${WRKSRC}/tools/* ${DATADIR}/tools -.endif + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/thales ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/data/thales.conf.default ${STAGEDIR}${PREFIX}/etc + ${INSTALL_DATA} ${WRKSRC}/data/*.sql ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/tools + ${CP} -r ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} + ${CP} -r ${WRKSRC}/tools/* ${STAGEDIR}${DATADIR}/tools .include Modified: head/irc/thales/pkg-plist ============================================================================== --- head/irc/thales/pkg-plist Mon Dec 9 01:28:41 2013 (r335949) +++ head/irc/thales/pkg-plist Mon Dec 9 02:43:37 2013 (r335950) @@ -6,92 +6,92 @@ etc/thales.conf.default %%DATADIR%%/mysql-ultimate28.sql %%DATADIR%%/mysql-ultimate30.sql %%DATADIR%%/mysql-unreal.sql -%%PORTDOCS%%%%EXAMPLESDIR%%/MRTG/thalesinfo.pl -%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/img/online.gif -%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/img/offline.gif -%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/nickinfo.php -%%PORTDOCS%%%%EXAMPLESDIR%%/nickinfo/README -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/README -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/compteur_js.php -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/deb.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/0.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/1.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/2.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/3.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/4.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/5.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/6.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/7.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/8.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/9.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/1/visites.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/deb.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/0.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/1.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/2.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/3.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/4.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/5.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/6.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/7.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/8.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/9.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/2/visites.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/deb.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/0.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/1.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/2.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/3.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/4.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/5.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/6.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/7.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/8.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/9.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/3/visites.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/deb.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/0.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/1.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/2.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/3.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/4.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/5.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/6.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/7.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/8.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/9.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/4/visites.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/deb.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/0.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/1.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/2.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/3.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/4.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/5.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/6.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/7.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/8.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/9.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/counter/pictures/5/visites.PNG -%%PORTDOCS%%%%EXAMPLESDIR%%/whois/whois.html -%%PORTDOCS%%%%EXAMPLESDIR%%/whois/dowhois.php -%%PORTDOCS%%%%EXAMPLESDIR%%/README -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/README -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/mysql.ini.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/users_tc.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chans_tc.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/servers_tc.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chans_max.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/users_max.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/counters/chan_po.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/server_on.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/user_ison.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/user_status.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/status/chan_topic.php -%%PORTDOCS%%%%EXAMPLESDIR%%/memphistools/common.php -%%PORTDOCS%%%%EXAMPLESDIR%%/clones/clones.php -%%PORTDOCS%%%%EXAMPLESDIR%%/recycledcounter/README -%%PORTDOCS%%%%EXAMPLESDIR%%/recycledcounter/recycpt.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MRTG/thalesinfo.pl +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/img/online.gif +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/img/offline.gif +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/nickinfo.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nickinfo/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/compteur_js.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/deb.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/0.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/1.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/2.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/3.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/4.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/5.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/6.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/7.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/8.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/9.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/1/visites.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/deb.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/0.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/1.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/2.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/3.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/4.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/5.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/6.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/7.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/8.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/9.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/2/visites.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/deb.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/0.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/1.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/2.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/3.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/4.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/5.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/6.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/7.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/8.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/9.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/3/visites.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/deb.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/0.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/1.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/2.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/3.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/4.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/5.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/6.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/7.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/8.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/9.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/4/visites.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/deb.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/0.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/1.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/2.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/3.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/4.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/5.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/6.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/7.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/8.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/9.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/counter/pictures/5/visites.PNG +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whois/whois.html +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whois/dowhois.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/mysql.ini.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/users_tc.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chans_tc.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/servers_tc.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chans_max.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/users_max.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/counters/chan_po.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/server_on.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/user_ison.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/user_status.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/status/chan_topic.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memphistools/common.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clones/clones.php +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recycledcounter/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recycledcounter/recycpt.php %%PORTDOCS%%%%DATADIR%%/tools/crontab/cron.sh %%PORTDOCS%%%%DATADIR%%/tools/README %%PORTDOCS%%%%DATADIR%%/tools/logfilter/README @@ -101,23 +101,23 @@ etc/thales.conf.default %%PORTDOCS%%%%DATADIR%%/tools/testbed/killall.sh %%PORTDOCS%%%%DATADIR%%/tools/testbed/compileall.sh %%PORTDOCS%%%%DATADIR%%/tools/testbed/chgCacheTime.sh -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/recycledcounter -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/clones -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools/status -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools/counters -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/memphistools -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/whois -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/5 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/4 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/3 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/2 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures/1 -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter/pictures -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/counter -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nickinfo/img -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/nickinfo -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/MRTG -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/recycledcounter +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clones +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/status +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools/counters +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/memphistools +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/whois +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/5 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/4 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/3 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/2 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures/1 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter/pictures +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/counter +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo/img +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nickinfo +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/MRTG +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DATADIR%%/tools/testbed %%PORTDOCS%%@dirrm %%DATADIR%%/tools/logfilter %%PORTDOCS%%@dirrm %%DATADIR%%/tools/crontab