cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irc/inspircd: Update to version 3.8.1

Browse Source 
- Apply suggestions from portclippy/portfmt/portlint
- Remove multiple no-op REINPLACE_CMD

https://docs.inspircd.org/3/change-log/#inspircd-381

PR:		252291
Reported by:	Sadie Powell <sadie@witchery.services>
This commit is contained in:
Joseph Mingrone 2021-01-01 04:06:33 +00:00
parent 9ce7420633
commit 58d613a037
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=559799
4 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
irc/inspircd/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= inspircd
DISTVERSIONPREFIX= v
DISTVERSION= 3.7.0
DISTVERSION= 3.8.1
CATEGORIES= irc
MAINTAINER= ports@FreeBSD.org
@ -14,50 +14,46 @@ LICENSE_FILE= ${WRKSRC}/docs/LICENSE.txt
# Configure script is written in perl
USES= compiler:c++11-lang cpe gmake localbase:ldflags perl5
USE_GITHUB= yes
USE_PERL5= build
CPE_VENDOR= inspire_ircd
CPE_PRODUCT= inspircd
USE_GITHUB= yes
USE_PERL5= build
USE_RC_SUBR= ${PORTNAME}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --binary-dir=${PREFIX}/bin \
--config-dir=${ETCDIR} \
--data-dir=${INSPIRCD_DBDIR} \
--log-dir=${INSPIRCD_LOGDIR} \
--data-dir=${_INSPIRCD_DBDIR} \
--disable-auto-extras \
--distribution-label=${OPSYS}-${PORTVERSION} \
--log-dir=${_INSPIRCD_LOGDIR} \
--manual-dir=${MANPREFIX}/man/man1 \
--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
--prefix=${PREFIX}/libexec/${PORTNAME} \
--distribution-label=${OPSYS}-${PORTVERSION} \
--uid=0 --gid=0 \
--disable-auto-extras
--gid=0 \
--uid=0
USE_RC_SUBR= ${PORTNAME}
MAKEFILE= GNUmakefile
SUB_FILES= pkg-message
SUB_LIST= INSPIRCD_DBDIR=${_INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${_INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${_INSPIRCD_RUNDIR} \
INSPIRCD_USER=${USERS} \
PORTNAME=${PORTNAME}
USERS= ircd
GROUPS= ircd
INSPIRCD_UID= 72
INSPIRCD_GID= 72
INSPIRCD_DBDIR?= /var/db/${PORTNAME}
INSPIRCD_LOGDIR?= /var/log/${PORTNAME}
INSPIRCD_RUNDIR?= /var/run/${PORTNAME}
SUB_FILES= pkg-message
SUB_LIST= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
PLIST_SUB= INSPIRCD_DBDIR=${_INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
INSPIRCD_USER=${USERS} \
PORTNAME=${PORTNAME}
PLIST_SUB= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
INSPIRCD_GROUP=${GROUPS} \
INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
INSPIRCD_LOGDIR=${_INSPIRCD_LOGDIR} \
INSPIRCD_RUNDIR=${_INSPIRCD_RUNDIR} \
INSPIRCD_USER=${USERS}
OPTIONS_DEFINE= GNUTLS IPV6 LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX SQLITE SSLREHASH
OPTIONS_DEFINE= GNUTLS IPV6 LDAP MBEDTLS MYSQL OPENSSL PCRE PGSQL POSIX \
SQLITE SSLREHASH
OPTIONS_DEFAULT= OPENSSL POSIX
OPTIONS_SUB= yes
@ -72,53 +68,43 @@ POSIX_DESC= Build m_regex_posix module
SQLITE_DESC= Build m_sqlite3 module
SSLREHASH_DESC= Build m_sslrehashsignal module
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_USES= pkgconfig
GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp
LDAP_USE= OPENLDAP=yes
LDAP_VARS= EXTRAS+=m_ldap.cpp
MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp
MYSQL_USES= mysql
MYSQL_VARS= EXTRAS+=m_mysql.cpp
OPENSSL_USES= pkgconfig ssl
OPENSSL_VARS= EXTRAS+=m_ssl_openssl.cpp
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_USES= pkgconfig
GNUTLS_VARS= EXTRAS+=m_ssl_gnutls.cpp
LDAP_USE= OPENLDAP=yes
LDAP_VARS= EXTRAS+=m_ldap.cpp
MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
MBEDTLS_VARS= EXTRAS+=m_ssl_mbedtls.cpp
MYSQL_USES= mysql
MYSQL_VARS= EXTRAS+=m_mysql.cpp
OPENSSL_USES= pkgconfig ssl
OPENSSL_VARS= EXTRAS+=m_ssl_openssl.cpp
PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
PCRE_VARS= EXTRAS+=m_regex_pcre.cpp
PGSQL_USES= pgsql
PGSQL_VARS= EXTRAS+=m_pgsql.cpp
POSIX_VARS= EXTRAS+=m_regex_posix.cpp
SQLITE_USES= pkgconfig sqlite
SQLITE_VARS= EXTRAS+=m_sqlite3.cpp
PGSQL_USES= pgsql
PGSQL_VARS= EXTRAS+=m_pgsql.cpp
POSIX_VARS= EXTRAS+=m_regex_posix.cpp
SQLITE_USES= pkgconfig sqlite
SQLITE_VARS= EXTRAS+=m_sqlite3.cpp
SSLREHASH_VARS+= EXTRAS+=m_sslrehashsignal.cpp
_INSPIRCD_DBDIR?= /var/db/${PORTNAME}
_INSPIRCD_LOGDIR?= /var/log/${PORTNAME}
_INSPIRCD_RUNDIR?= /var/run/${PORTNAME}
post-patch:
@${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/inspircd.conf.example
@${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/modules.conf.example
pre-configure:
@(cd ${WRKSRC}/src/modules && for m in ${EXTRAS}; do ${RLN} extra/$$m $$m; done)
post-patch:
@${REINPLACE_CMD} -e 's|%%INSPIRCD_USER%%|${USERS}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%INSPIRCD_UID%%|${INSPIRCD_UID}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%INSPIRCD_GROUP%%|${GROUPS}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%INSPIRCD_GID%%|${INSPIRCD_GID}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"${INSPIRCD_RUNDIR}/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp
@${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/inspircd.conf.example
@${REINPLACE_CMD} -e 's|examples/||g' -e 's|\.example||g' ${WRKSRC}/docs/conf/modules.conf.example
@${RM} ${WRKSRC}/make/template/main.mk.orig
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/modules/*.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${STAGEDIR}${INSPIRCD_DBDIR}
@${MKDIR} ${STAGEDIR}${INSPIRCD_LOGDIR}
@${MKDIR} ${STAGEDIR}${INSPIRCD_RUNDIR}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_DBDIR}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_LOGDIR}
@${MKDIR} ${STAGEDIR}${_INSPIRCD_RUNDIR}
.include <bsd.port.mk>

6
irc/inspircd/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1596370724
SHA256 (inspircd-inspircd-v3.7.0_GH0.tar.gz) = e77df17ed7f774fa0927cfce4412c2b6a3e4d5a9a8acab9753685c2aef22ea3b
SIZE (inspircd-inspircd-v3.7.0_GH0.tar.gz) = 855041
TIMESTAMP = 1609467703
SHA256 (inspircd-inspircd-v3.8.1_GH0.tar.gz) = 2068ca42f39b382e1f74b650230e02690ffbca58c4f3aed075a6dd72e381b44b
SIZE (inspircd-inspircd-v3.8.1_GH0.tar.gz) = 850997

11
irc/inspircd/files/patch-make_template_inspircd Normal file
View File

@ -0,0 +1,11 @@
--- make/template/inspircd.orig 2021-01-01 03:25:25 UTC
+++ make/template/inspircd
@@ -426,7 +426,7 @@ sub getpidfile
}
# End of includes / No includes found. Using default.
- $pidfile = $datadir . "/inspircd.pid";
+ $pidfile = "/var/run/inspircd.pid";
}
sub getstatus {

10
irc/inspircd/files/patch-make_template_main.mk
View File

@ -1,6 +1,6 @@
--- make/template/main.mk.orig 2020-07-30 16:23:30 UTC
--- make/template/main.mk.orig 2020-11-20 12:10:47 UTC
+++ make/template/main.mk
@@ -217,40 +217,40 @@ finishmessage: target
@@ -212,41 +212,41 @@ finishmessage: target
@echo "*************************************"
install: target
@ -19,6 +19,7 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BASE)
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
@ -35,6 +36,7 @@
+ -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
+ -$(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
+ -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null
ifeq ($(SYSTEM), darwin)
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null
@ -53,7 +55,7 @@
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null
@ -65,7 +67,7 @@
+ -$(INSTALL) -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+ -$(INSTALL) -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
+ -$(INSTALL) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
+ -$(INSTALL) -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ -$(INSTALL) -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
@echo "* INSTALL COMPLETE! *"