pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/anope chat/anope: Update to 2.0.6



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1f10e5ec358
branches:  trunk
changeset: 391346:c1f10e5ec358
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Feb 05 19:10:50 2019 +0000

description:
chat/anope: Update to 2.0.6

[10 years of updates, no changelog. Based on work in pkgsrc-wip.]

diffstat:

 chat/anope/DESCR                               |    8 +-
 chat/anope/Makefile                            |  166 ++++++++++-------
 chat/anope/PLIST                               |  230 +++++++++++++-----------
 chat/anope/distinfo                            |   19 +-
 chat/anope/files/anope.sh                      |   32 ++-
 chat/anope/options.mk                          |   51 ++++-
 chat/anope/patches/patch-aa                    |   50 -----
 chat/anope/patches/patch-ab                    |   40 ----
 chat/anope/patches/patch-ac                    |   13 -
 chat/anope/patches/patch-ad                    |   13 -
 chat/anope/patches/patch-ae                    |   13 -
 chat/anope/patches/patch-af                    |   37 ----
 chat/anope/patches/patch-configure             |   17 -
 chat/anope/patches/patch-data_example.conf     |  110 +++++++++++
 chat/anope/patches/patch-src_tools_anopesmtp.c |   29 ---
 15 files changed, 399 insertions(+), 429 deletions(-)

diffs (truncated from 1010 to 300 lines):

diff -r 8adebf0036a2 -r c1f10e5ec358 chat/anope/DESCR
--- a/chat/anope/DESCR  Tue Feb 05 18:58:20 2019 +0000
+++ b/chat/anope/DESCR  Tue Feb 05 19:10:50 2019 +0000
@@ -1,3 +1,5 @@
-Anope is a set of Services for IRC networks that allows users to
-manage their nicks and channels in a secure and efficient way, and
-administrators to manage their network with powerful tools.
+Anope is an open source set of IRC Services. It is highly modular,
+with a vast number of configurable parameters, and is the most used
+IRC services package. There are also many modules on the modsite
+to add additional features. It supports many modern IRCds, including
+InspIRCd, UnrealIRCd, and ircd-hybrid.
diff -r 8adebf0036a2 -r c1f10e5ec358 chat/anope/Makefile
--- a/chat/anope/Makefile       Tue Feb 05 18:58:20 2019 +0000
+++ b/chat/anope/Makefile       Tue Feb 05 19:10:50 2019 +0000
@@ -1,88 +1,110 @@
-# $NetBSD: Makefile,v 1.21 2018/08/22 09:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/02/05 19:10:50 nia Exp $
 
-DISTNAME=      anope-1.7.21
-PKGREVISION=   9
+PKGNAME=       anope-2.0.6
+DISTNAME=      ${PKGNAME}-source
 CATEGORIES=    chat
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=anope/}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.anope.org/
-COMMENT=       Set of Services for IRC networks
-
-PKG_DESTDIR_SUPPORT=   destdir
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=anope/}
+GITHUB_PROJECT=        anope
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
 
-GNU_CONFIGURE= YES
-PTHREAD_OPTS+= require
-USE_TOOLS+=    gmake perl:run
-ANOPE_USER=    anope
-ANOPE_GROUP=   anope
-RCD_SCRIPTS=   anope
-FILES_SUBST+=  ANOPE_USER=${ANOPE_USER}
-FILES_SUBST+=  ANOPE_GROUP=${ANOPE_GROUP}
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://www.anope.org/
+COMMENT=       Modular set of IRC services
+LICENSE=       gnu-gpl-v2
+
+USE_LANGUAGES= c c++
+USE_CMAKE=     yes
 
-USERGROUP_PHASE=       pre-install
-PKG_USERS_VARS+=       ANOPE_USER
-PKG_GROUPS_VARS+=      ANOPE_GROUP
+CMAKE_ARGS+=   -DPROGRAM_NAME=anope
+
+CMAKE_ARGS+=   -DDISABLE_TOOLS=ON
+
+CMAKE_ARGS+=   -DDB_DIR=anope/data
+CMAKE_ARGS+=   -DCONF_DIR=${PKG_SYSCONFDIR}/anope
+CMAKE_ARGS+=   -DLIB_DIR=lib/anope
+CMAKE_ARGS+=   -DLOCALE_DIR=${PKGLOCALEDIR}/locale
+CMAKE_ARGS+=   -DLOGS_DIR=anope/logs
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_USERS=     ${ANOPE_USER}:${ANOPE_GROUP}
-PKG_HOME.${ANOPE_USER}=                ${PREFIX}/lib/anope
-PKG_GROUPS=    ${ANOPE_GROUP}
-MAKE_ENV+=     RUNGROUP=${ANOPE_GROUP}
-OWN_DIRS_PERMS+=       ${PREFIX}/lib/anope/logs \
-                       ${ANOPE_USER} ${ANOPE_GROUP} 2755
-OWN_DIRS_PERMS+=       ${PREFIX}/lib/anope/modules/runtime \
-                       ${ANOPE_USER} ${ANOPE_GROUP} 2755
+ANOPE_USER?=           anope
+ANOPE_GROUP?=          anope
+PKG_GROUPS=            ${ANOPE_GROUP}
+PKG_USERS=             ${ANOPE_USER}:${ANOPE_GROUP}
+PKG_GROUPS_VARS=       ANOPE_USER
+PKG_USERS_VARS=                ANOPE_GROUP
+
+OWN_DIRS_PERMS+=       ${PREFIX}/anope ${ANOPE_USER} ${ANOPE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${PREFIX}/anope/data ${ANOPE_USER} ${ANOPE_GROUP} 0755
+OWN_DIRS_PERMS+=       ${PREFIX}/anope/logs ${ANOPE_USER} ${ANOPE_GROUP} 0755
+
+FILES_SUBST+=          ANOPE_GROUP=${ANOPE_GROUP:Q}
+FILES_SUBST+=          ANOPE_USER=${ANOPE_USER:Q}
+FILES_SUBST+=          PKGLOCALEDIR=${PKGLOCALEDIR}
 
-CONF_FILES_PERMS+=     ${PREFIX}/share/examples/anope/example.conf \
-                       ${PREFIX}/lib/anope/services.conf \
-                       ${ANOPE_USER} ${ANOPE_GROUP} 0640
+SUBST_CLASSES+=                conf
+SUBST_STAGE.conf=      pre-configure
+SUBST_MESSAGE.conf=    Set variables in configuration file.
+SUBST_FILES.conf+=     data/example.conf
+SUBST_SED.conf+=       -e "s,@PREFIX@,${PREFIX},g"
+SUBST_SED.conf+=       -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
+SUBST_SED.conf+=       -e "s,@PKGLOCALEDIR@,${PKGLOCALEDIR},g"
+
+RCD_SCRIPTS=   anope
+
+EGDIR=         ${PREFIX}/share/examples/anope
+DOCDIR=                ${PREFIX}/share/doc/anope
+
+USE_PKGLOCALEDIR=      yes
 
-CONFIGURE_ARGS+=       --with-permissions=077
-CONFIGURE_ARGS+=       --with-bindir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+=       --with-datadir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+=       --with-rungroup=${ANOPE_GROUP}
+INSTALLATION_DIRS+=    ${EGDIR}
+INSTALLATION_DIRS+=    ${DOCDIR}
+
+CONF_FILES+=   ${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/anope/botserv.conf
+CONF_FILES+=   ${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/anope/chanserv.conf
+CONF_FILES+=   ${EGDIR}/chanstats.conf ${PKG_SYSCONFDIR}/anope/chanstats.conf
+CONF_FILES+=   ${EGDIR}/services.conf ${PKG_SYSCONFDIR}/anope/services.conf
+CONF_FILES+=   ${EGDIR}/global.conf ${PKG_SYSCONFDIR}/anope/global.conf
+CONF_FILES+=   ${EGDIR}/hostserv.conf ${PKG_SYSCONFDIR}/anope/hostserv.conf
+CONF_FILES+=   ${EGDIR}/irc2sql.conf ${PKG_SYSCONFDIR}/anope/irc2sql.conf
+CONF_FILES+=   ${EGDIR}/memoserv.conf ${PKG_SYSCONFDIR}/anope/memoserv.conf
+CONF_FILES+=   ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/anope/modules.conf
+CONF_FILES+=   ${EGDIR}/nickserv.conf ${PKG_SYSCONFDIR}/anope/nickserv.conf
+CONF_FILES+=   ${EGDIR}/operserv.conf ${PKG_SYSCONFDIR}/anope/operserv.conf
 
 .include "options.mk"
 
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     data/example.chk data/example.conf
-SUBST_SED.paths=       -e "s|/home/ircd/services|${PREFIX}/lib/anope|g"
-SUBST_SED.paths+=      -e "s|/usr/local/lib/services|${PREFIX}/lib/anope|g"
-SUBST_SED.paths+=      -e "s|/home/username/services|${PREFIX}/lib/anope|g"
-SUBST_MESSAGE.paths=   Fixing hardcoded paths.
-
-SUBST_CLASSES+=                utils
-SUBST_STAGE.utils=     pre-configure
-SUBST_FILES.utils=     src/Makefile
-SUBST_SED.utils=       -e "s|find|${FIND}|g"
-SUBST_SED.utils+=      -e "s|chgrp|${CHGRP}|g"
-SUBST_SED.utils+=      -e "s|chmod|${CHMOD}|g"
-SUBST_SED.utils+=      -e "s|ln|${LN}|g"
-SUBST_MESSAGE.utils=   Fixing hardcoded utilities.
-
-.include "../../mk/pthread.buildlink3.mk"
-
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LDFLAGS+=  -lexecinfo
-.endif
-
-INSTALLATION_DIRS+=    share/doc/anope share/examples/anope lib/anope/modules
+pre-configure:
+.for srcfile in ${ANOPE_EXTRAS}
+       ${LN} -sf ${WRKSRC}/modules/extra/${srcfile} ${WRKSRC}/modules/${srcfile}
+.endfor
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/anope
-       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/anoperc
-       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listchans
-       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listnicks
-       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/services
-       ${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/modules/*.so
-       ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/anope/languages/*
-       ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope
-       ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/backups
-       ${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/logs
-       ${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/examples/anope
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/botserv.example.conf \
+               ${DESTDIR}${EGDIR}/botserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanserv.example.conf \
+               ${DESTDIR}${EGDIR}/chanserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanstats.example.conf \
+               ${DESTDIR}${EGDIR}/chanstats.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.conf \
+               ${DESTDIR}${EGDIR}/services.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/global.example.conf \
+               ${DESTDIR}${EGDIR}/global.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/hostserv.example.conf \
+               ${DESTDIR}${EGDIR}/hostserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/irc2sql.example.conf \
+               ${DESTDIR}${EGDIR}/irc2sql.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/memoserv.example.conf \
+               ${DESTDIR}${EGDIR}/memoserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/modules.example.conf \
+               ${DESTDIR}${EGDIR}/modules.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/nickserv.example.conf \
+               ${DESTDIR}${EGDIR}/nickserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/operserv.example.conf \
+               ${DESTDIR}${EGDIR}/operserv.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.chk \
+               ${DESTDIR}${DOCDIR}/example.chk
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/stats.standalone.example.conf \
+               ${DESTDIR}${DOCDIR}/stats.standalone.example.conf
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8adebf0036a2 -r c1f10e5ec358 chat/anope/PLIST
--- a/chat/anope/PLIST  Tue Feb 05 18:58:20 2019 +0000
+++ b/chat/anope/PLIST  Tue Feb 05 19:10:50 2019 +0000
@@ -1,88 +1,117 @@
-@comment $NetBSD: PLIST,v 1.7 2018/01/01 22:29:19 rillig Exp $
-lib/anope/anoperc
-lib/anope/languages/cat
-lib/anope/languages/de
-lib/anope/languages/en_us
-lib/anope/languages/es
-lib/anope/languages/fr
-lib/anope/languages/gr
-lib/anope/languages/hun
-lib/anope/languages/it
-lib/anope/languages/nl
-lib/anope/languages/pl
-lib/anope/languages/pt
-lib/anope/languages/ru
-lib/anope/languages/tr
-lib/anope/listchans
-lib/anope/listnicks
+@comment $NetBSD: PLIST,v 1.8 2019/02/05 19:10:50 nia Exp $
+anope/data/modules/webcpanel/templates/default/chanserv/access.html
+anope/data/modules/webcpanel/templates/default/chanserv/akick.html
+anope/data/modules/webcpanel/templates/default/chanserv/chanlist.html
+anope/data/modules/webcpanel/templates/default/chanserv/drop.html
+anope/data/modules/webcpanel/templates/default/chanserv/main.html
+anope/data/modules/webcpanel/templates/default/chanserv/modes.html
+anope/data/modules/webcpanel/templates/default/chanserv/set.html
+anope/data/modules/webcpanel/templates/default/confirm.html
+anope/data/modules/webcpanel/templates/default/cubes.png
+anope/data/modules/webcpanel/templates/default/favicon.ico
+anope/data/modules/webcpanel/templates/default/footer.html
+anope/data/modules/webcpanel/templates/default/header.html
+anope/data/modules/webcpanel/templates/default/hostserv/request.html
+anope/data/modules/webcpanel/templates/default/login.html
+anope/data/modules/webcpanel/templates/default/logo.png
+anope/data/modules/webcpanel/templates/default/memoserv/memos.html
+anope/data/modules/webcpanel/templates/default/nickserv/access.html
+anope/data/modules/webcpanel/templates/default/nickserv/alist.html
+anope/data/modules/webcpanel/templates/default/nickserv/cert.html
+anope/data/modules/webcpanel/templates/default/nickserv/info.html
+anope/data/modules/webcpanel/templates/default/operserv/akill.html
+anope/data/modules/webcpanel/templates/default/register.html
+anope/data/modules/webcpanel/templates/default/style.css
+bin/anope
 lib/anope/modules/bahamut.so
-lib/anope/modules/bs_act.so
+lib/anope/modules/botserv.so
 lib/anope/modules/bs_assign.so
+lib/anope/modules/bs_autoassign.so
 lib/anope/modules/bs_badwords.so
 lib/anope/modules/bs_bot.so
 lib/anope/modules/bs_botlist.so
-lib/anope/modules/bs_fantasy.so
-lib/anope/modules/bs_fantasy_kick.so
-lib/anope/modules/bs_fantasy_kickban.so
-lib/anope/modules/bs_fantasy_owner.so
-lib/anope/modules/bs_fantasy_seen.so
-lib/anope/modules/bs_fantasy_unban.so
-lib/anope/modules/bs_help.so
+lib/anope/modules/bs_control.so
 lib/anope/modules/bs_info.so
 lib/anope/modules/bs_kick.so
-lib/anope/modules/bs_say.so
 lib/anope/modules/bs_set.so
-lib/anope/modules/bs_unassign.so
+lib/anope/modules/chanserv.so
 lib/anope/modules/charybdis.so
 lib/anope/modules/cs_access.so
 lib/anope/modules/cs_akick.so
-lib/anope/modules/cs_appendtopic.so
 lib/anope/modules/cs_ban.so
-lib/anope/modules/cs_clear.so
+lib/anope/modules/cs_clone.so
 lib/anope/modules/cs_drop.so
 lib/anope/modules/cs_enforce.so
-lib/anope/modules/cs_forbid.so
+lib/anope/modules/cs_entrymsg.so
+lib/anope/modules/cs_flags.so
 lib/anope/modules/cs_getkey.so
-lib/anope/modules/cs_getpass.so
-lib/anope/modules/cs_help.so
-lib/anope/modules/cs_identify.so
 lib/anope/modules/cs_info.so
 lib/anope/modules/cs_invite.so
 lib/anope/modules/cs_kick.so
 lib/anope/modules/cs_list.so
-lib/anope/modules/cs_logout.so
-lib/anope/modules/cs_modes.so
+lib/anope/modules/cs_log.so
+lib/anope/modules/cs_mode.so
 lib/anope/modules/cs_register.so
-lib/anope/modules/cs_sendpass.so
+lib/anope/modules/cs_seen.so
 lib/anope/modules/cs_set.so
+lib/anope/modules/cs_set_misc.so
 lib/anope/modules/cs_status.so
+lib/anope/modules/cs_statusupdate.so
 lib/anope/modules/cs_suspend.so
-lib/anope/modules/cs_tban.so
+lib/anope/modules/cs_sync.so



Home | Main Index | Thread Index | Old Index