Index: head/databases/p5-Bucardo/Makefile =================================================================== --- head/databases/p5-Bucardo/Makefile (revision 547178) +++ head/databases/p5-Bucardo/Makefile (revision 547179) @@ -1,36 +1,37 @@ # $FreeBSD$ PORTNAME= Bucardo PORTVERSION= 5.6.0 CATEGORIES= databases perl5 -MASTER_SITES= http://bucardo.org/downloads/ LOCAL/mat/${PORTNAME} +MASTER_SITES= http://bucardo.org/downloads/ \ + LOCAL/mat/${PORTNAME} PKGNAMEPREFIX= p5- MAINTAINER= mat@FreeBSD.org COMMENT= Asynchronous PostgreSQL replication system LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-DBI>=1.51:databases/p5-DBI \ +RUN_DEPENDS= p5-boolean>=0:devel/p5-boolean \ p5-DBD-Pg>=2.0:databases/p5-DBD-Pg \ - p5-Encode-Locale>=0:converters/p5-Encode-Locale \ - p5-boolean>=0:devel/p5-boolean \ - p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe + p5-DBI>=1.51:databases/p5-DBI \ + p5-DBIx-Safe>=1.2.4:databases/p5-DBIx-Safe \ + p5-Encode-Locale>=0:converters/p5-Encode-Locale -USES= perl5 +USES= perl5 USE_PERL5= configure USE_RC_SUBR= bucardo post-patch: @${REINPLACE_CMD} 's/INSTALL_BASE/DESTDIR/;s/bucardo.1pm/bucardo.1/' \ ${WRKSRC}/Makefile.PL @${REINPLACE_CMD} 's=/usr/local=${PREFIX}=' ${WRKSRC}/Makefile.PL \ ${WRKSRC}/bucardo post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${DATADIR} .include Index: head/devel/gitolite/Makefile =================================================================== --- head/devel/gitolite/Makefile (revision 547178) +++ head/devel/gitolite/Makefile (revision 547179) @@ -1,69 +1,70 @@ # $FreeBSD$ PORTNAME= gitolite -DISTVERSIONPREFIX=v +DISTVERSIONPREFIX= v DISTVERSION= 3.6.12 PORTEPOCH= 1 CATEGORIES= devel MAINTAINER= mat@FreeBSD.org COMMENT= Access control layer on top of git LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= git>=0:devel/git \ p5-JSON>=0:converters/p5-JSON USES= cpe perl5 shebangfix +CPE_VENDOR= sitaram_chamarty USE_GITHUB= yes GH_ACCOUNT= sitaramc +SHEBANG_REGEX= .* +bash_CMD= /bin/sh + CONFLICTS= gitolite-[^3]* -CPE_VENDOR= sitaram_chamarty NO_ARCH= yes -SHEBANG_REGEX= .* -bash_CMD= /bin/sh - SUB_FILES= pkg-message -OPTIONS_DEFINE= GITUSER DOCS CONTRIB +OPTIONS_DEFINE= CONTRIB DOCS GITUSER OPTIONS_DEFAULT= CONTRIB -OPTIONS_SUB= yes +OPTIONS_SUB= yes CONTRIB_DESC= Install additionnal contrib files GITUSER_DESC= Create git user as gitolite provider -GITUSER_VARS= USERS=git GROUPS=git +GITUSER_VARS= GROUPS=git \ + USERS=git post-patch: @${REINPLACE_CMD} -e 's,#!/usr/bin/perl,#!${PERL},' \ ${WRKSRC}/src/lib/Gitolite/Hooks/*.pm do-build: echo "${GH_TAGNAME}" > ${WRKSRC}/src/VERSION ${MKDIR} ${WRKSRC}/lib ${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/ ${RMDIR} ${WRKSRC}/src/lib ${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/ ${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/ ${FIND} ${WRKSRC} '(' -name '*.bak' -o -name '*.orig' ')' -delete do-install: (cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite) (cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/) ${RLN} ${STAGEDIR}${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} - do-install-CONTRIB-on: @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/share/vim (cd ${WRKSRC}/contrib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${MV} ${STAGEDIR}${DATADIR}/vim ${STAGEDIR}${PREFIX}/share/vim/vimfiles + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR} .include Index: head/mail/bulk_mailer/Makefile =================================================================== --- head/mail/bulk_mailer/Makefile (revision 547178) +++ head/mail/bulk_mailer/Makefile (revision 547179) @@ -1,30 +1,33 @@ # Created by: dlowe # $FreeBSD$ PORTNAME= bulk_mailer PORTVERSION= 1.13 PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.cs.utk.edu/pub/moore/bulk_mailer/ \ LOCAL/mat/${PORTNAME} MAINTAINER= mat@FreeBSD.org COMMENT= Speeds delivery to mailing lists by sorting & batching addresses -GNU_CONFIGURE= YES -OPTIONS_DEFINE= DOCS LICENSE= GPLv3 +GNU_CONFIGURE= YES + ALL_TARGET= bulk_mailer -PLIST_FILES= bin/bulk_mailer man/man1/bulk_mailer.1.gz +PLIST_FILES= bin/bulk_mailer \ + man/man1/bulk_mailer.1.gz PORTDOCS= * + +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${STAGEDIR}${PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.README ${STAGEDIR}${DOCSDIR}/README ${INSTALL_DATA} ${WRKSRC}/bulk_mailer.ps ${STAGEDIR}${DOCSDIR} .include Index: head/mail/policyd2/Makefile =================================================================== --- head/mail/policyd2/Makefile (revision 547178) +++ head/mail/policyd2/Makefile (revision 547179) @@ -1,87 +1,89 @@ # Created by: Chifeng QU # $FreeBSD$ PORTNAME= policyd2 PORTVERSION= 2.0.14 PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://download.policyd.org/v${PORTVERSION}/ DISTNAME= cluebringer-v${PORTVERSION} MAINTAINER= mat@FreeBSD.org COMMENT= Policyd v2 is a multi-platform policy server for popular MTAs LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= p5-Net-Server>=0:net/p5-Net-Server \ - gsed:textproc/gsed \ - p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ +RUN_DEPENDS= gsed:textproc/gsed \ + p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \ p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \ - p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap + p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ + p5-Net-Server>=0:net/p5-Net-Server USES= perl5 shebangfix tar:xz -NO_BUILD= yes USE_RC_SUBR= policyd2 -bash_CMD= /bin/sh SHEBANG_FILES= cbpadmin \ cbpolicyd \ database/convert-tsql \ database/whitelists/parse* +bash_CMD= /bin/sh WWWDIR= ${PREFIX}/www/policyd + +NO_BUILD= yes + PORTDOCS= AUTHORS ChangeLog INSTALL TODO WISHLIST -OPTIONS_DEFINE= MYSQL PGSQL SQLITE WEBUI DOCS -OPTIONS_DEFAULT=MYSQL WEBUI -MYSQL_DESC= Add a dependency on DBD::mysql -PGSQL_DESC= Add a dependency on DBD::Pg -SQLITE_DESC= Add a dependency on DBD:SQLite -WEBUI_DESC= Add a dependency on the corresponding PHP pdo driver +OPTIONS_DEFINE= DOCS MYSQL PGSQL SQLITE WEBUI +OPTIONS_DEFAULT= MYSQL WEBUI +MYSQL_DESC= Add a dependency on DBD::mysql +PGSQL_DESC= Add a dependency on DBD::Pg +SQLITE_DESC= Add a dependency on DBD:SQLite +WEBUI_DESC= Add a dependency on the corresponding PHP pdo driver MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql -SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg +SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite .include .if ${PORT_OPTIONS:MWEBUI} . if ${PORT_OPTIONS:MMYSQL} USES+= php USE_PHP= pdo_mysql . endif . if ${PORT_OPTIONS:MSQLITE} USES+= php USE_PHP= pdo_sqlite . endif . if ${PORT_OPTIONS:MPGSQL} USES+= php USE_PHP= pdo_pgsql . endif .endif post-patch: @${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/cbpadmin \ ${WRKSRC}/cbpolicyd @${REINPLACE_CMD} 's|sed|gsed|' ${WRKSRC}/database/convert-tsql \ ${WRKSRC}/database/whitelists/parse-checkhelo-whitelist \ ${WRKSRC}/database/whitelists/parse-greylisting-whitelist do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} \ ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp \ ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/cbpadmin ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/cbpolicyd ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/cluebringer.conf \ ${STAGEDIR}${PREFIX}/etc/cluebringer.conf.sample (cd ${WRKSRC}/webui && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) ${MV} ${STAGEDIR}${WWWDIR}/includes/config.php \ ${STAGEDIR}${WWWDIR}/includes/config.php.sample (cd ${WRKSRC}/cbp && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/cbp) (cd ${WRKSRC} && ${COPYTREE_SHARE} contrib ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} database ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Index: head/net/rubygem-epp-client-afnic/Makefile =================================================================== --- head/net/rubygem-epp-client-afnic/Makefile (revision 547178) +++ head/net/rubygem-epp-client-afnic/Makefile (revision 547179) @@ -1,22 +1,21 @@ # $FreeBSD$ PORTNAME= epp-client-afnic PORTVERSION= 0.15.2 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mat@FreeBSD.org COMMENT= AFNIC EPP client library LICENSE= MIT RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ - rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \ rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \ rubygem-epp-client-rgp=${PORTVERSION}:net/rubygem-epp-client-rgp \ rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \ + rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri -USE_RUBY= yes USES= gem .include Index: head/net/rubygem-epp-client-base/Makefile =================================================================== --- head/net/rubygem-epp-client-base/Makefile (revision 547178) +++ head/net/rubygem-epp-client-base/Makefile (revision 547179) @@ -1,19 +1,18 @@ # $FreeBSD$ PORTNAME= epp-client-base PORTVERSION= 0.15.2 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mat@FreeBSD.org COMMENT= Extensible EPP client library LICENSE= MIT RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri -USE_RUBY= yes USES= gem .include Index: head/net/rubygem-epp-client-rgp/Makefile =================================================================== --- head/net/rubygem-epp-client-rgp/Makefile (revision 547178) +++ head/net/rubygem-epp-client-rgp/Makefile (revision 547179) @@ -1,19 +1,18 @@ # $FreeBSD$ PORTNAME= epp-client-rgp PORTVERSION= 0.15.2 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mat@FreeBSD.org COMMENT= RGP EPP client library LICENSE= MIT RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri -USE_RUBY= yes USES= gem .include Index: head/net/rubygem-epp-client-secdns/Makefile =================================================================== --- head/net/rubygem-epp-client-secdns/Makefile (revision 547178) +++ head/net/rubygem-epp-client-secdns/Makefile (revision 547179) @@ -1,19 +1,18 @@ # $FreeBSD$ PORTNAME= epp-client-secdns PORTVERSION= 0.15.2 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mat@FreeBSD.org COMMENT= SecDNS EPP client library LICENSE= MIT RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri -USE_RUBY= yes USES= gem .include Index: head/net/rubygem-epp-client-smallregistry/Makefile =================================================================== --- head/net/rubygem-epp-client-smallregistry/Makefile (revision 547178) +++ head/net/rubygem-epp-client-smallregistry/Makefile (revision 547179) @@ -1,21 +1,20 @@ # $FreeBSD$ PORTNAME= epp-client-smallregistry PORTVERSION= 0.15.2 CATEGORIES= net rubygems MASTER_SITES= RG MAINTAINER= mat@FreeBSD.org COMMENT= Smallregistry EPP client library LICENSE= MIT RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ - rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \ rubygem-epp-client-base=${PORTVERSION}:net/rubygem-epp-client-base \ rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \ + rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri -USE_RUBY= yes USES= gem .include Index: head/net/vtun/Makefile =================================================================== --- head/net/vtun/Makefile (revision 547178) +++ head/net/vtun/Makefile (revision 547179) @@ -1,56 +1,59 @@ # Created by: Kevin Lo # $FreeBSD$ PORTNAME= vtun PORTVERSION= 3.0.4 PORTREVISION= 8 CATEGORIES= net -MASTER_SITES= SF LOCAL/mat/vtun +MASTER_SITES= SF \ + LOCAL/mat/vtun MAINTAINER= mat@FreeBSD.org COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping LICENSE= GPLv2 LIB_DEPENDS= liblzo2.so:archivers/lzo2 USES= autoreconf localbase ssl USE_RC_SUBR= vtunclient vtund GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ - --with-ssl-headers=${OPENSSLINC} \ - --with-ssl-lib=${OPENSSLLIB} \ --with-lzo-headers=${LOCALBASE}/include/lzo \ - --with-lzo-lib=${LOCALBASE}/lib + --with-lzo-lib=${LOCALBASE}/lib \ + --with-ssl-headers=${OPENSSLINC} \ + --with-ssl-lib=${OPENSSLLIB} CONFIGURE_ENV= YACC=${YACC} -CFLAGS+= -ansi -Wno-pointer-sign - ALL_TARGET= vtund -DOCS= ChangeLog Credits FAQ README README.LZO README.Setup \ +CFLAGS+= -ansi -Wno-pointer-sign + +PORTDOCS= ChangeLog Credits FAQ README README.LZO README.Setup \ README.Shaper TODO OPTIONS_DEFINE= DOCS # Extended mode patches, obtained from # http://home.jp.FreeBSD.org/~simokawa/vtun-v6.html # are now dynamically enabled using the -e option. post-patch: ${REINPLACE_CMD} \ -e 's|$$\(SSL_HDR_DIR\)|$$\1 $$\1/openssl|g' \ -e 's|$$\(BLOWFISH_HDR_DIR\)|$$\1 $$SSL_HDR_DIR/openssl|g' \ ${WRKSRC}/configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund ${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for doc in ${DOCS} + ${RLN} ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1 + +post-install-DOCS-on: +.for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor - ${RLN} ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1 .include Index: head/net/vtun/pkg-plist =================================================================== --- head/net/vtun/pkg-plist (revision 547178) +++ head/net/vtun/pkg-plist (revision 547179) @@ -1,17 +1,9 @@ @sample etc/vtund.conf.sample sbin/vtund man/man5/vtund.conf.5.gz man/man8/vtund.8.gz man/man8/vtun.8.gz man/man1/vtun.1.gz -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/Credits -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.LZO -%%PORTDOCS%%%%DOCSDIR%%/README.Setup -%%PORTDOCS%%%%DOCSDIR%%/README.Shaper -%%PORTDOCS%%%%DOCSDIR%%/TODO @dir /var/log/vtund @dir /var/lock/vtund @dir /var/lock Index: head/net-mgmt/lg/Makefile =================================================================== --- head/net-mgmt/lg/Makefile (revision 547178) +++ head/net-mgmt/lg/Makefile (revision 547179) @@ -1,38 +1,40 @@ # $FreeBSD$ PORTNAME= lg PORTVERSION= 1.9.s20140622 PORTREVISION= 1 -MASTER_SITES= LOCAL/mat/lg GH CATEGORIES= net-mgmt perl5 +MASTER_SITES= LOCAL/mat/lg \ + GH MAINTAINER= mat@FreeBSD.org COMMENT= Looking Glass written in Perl as a CGI script LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= DOCS +USES= perl5 shebangfix USE_GITHUB= yes GH_ACCOUNT= Cougar GH_TAGNAME= 0d53e4b -USES= perl5 shebangfix -SHEBANG_FILES= lg.cgi makeaslist.pl makedb.pl USE_PERL5= run +SHEBANG_FILES= lg.cgi makeaslist.pl makedb.pl -NO_BUILD= yes NO_ARCH= yes +NO_BUILD= yes + +OPTIONS_DEFINE= DOCS do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/lg.cgi ${STAGEDIR}${WWWDIR} cd ${WRKSRC} && ${INSTALL_DATA} lg.conf favicon.ico ${STAGEDIR}${WWWDIR} ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_SCRIPT} makeaslist.pl makedb.pl ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} as.txt communities.txt ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} CHANGELOG COPYING README ${STAGEDIR}${DOCSDIR} .include Index: head/security/py-acme-tiny/Makefile =================================================================== --- head/security/py-acme-tiny/Makefile (revision 547178) +++ head/security/py-acme-tiny/Makefile (revision 547179) @@ -1,37 +1,38 @@ # $FreeBSD$ PORTNAME= acme-tiny DISTVERSION= 4.1.0 CATEGORIES= security python MAINTAINER= mat@FreeBSD.org COMMENT= Tiny script to issue and renew TLS certs from Let's Encrypt LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= python shebangfix ssl -SHEBANG_FILES= acme_tiny.py USE_GITHUB= yes GH_ACCOUNT= diafygi -NO_BUILD= yes +SHEBANG_FILES= acme_tiny.py NO_ARCH= yes +NO_BUILD= yes PLIST_FILES= bin/acme_tiny +PORTDOCS= README.md + OPTIONS_DEFINE= DOCS DOCS_SUB_FILES= pkg-message -PORTDOCS= README.md do-install: ${INSTALL_SCRIPT} ${WRKSRC}/acme_tiny.py ${STAGEDIR}${PREFIX}/bin/acme_tiny do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/munin-common/Makefile =================================================================== --- head/sysutils/munin-common/Makefile (revision 547178) +++ head/sysutils/munin-common/Makefile (revision 547179) @@ -1,28 +1,28 @@ # Created by: Sean Rees # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -common MAINTAINER= mat@FreeBSD.org COMMENT= Common components between a munin node and server BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay RUN_DEPENDS= p5-Net-SSLeay>=0:security/p5-Net-SSLeay -USES= gmake perl5 cpe +USES= cpe gmake perl5 .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= build-common INSTALL_TARGET= install-common NO_ARCH= yes post-install: ${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR} ${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR} .include Index: head/sysutils/munin-contrib/Makefile =================================================================== --- head/sysutils/munin-contrib/Makefile (revision 547178) +++ head/sysutils/munin-contrib/Makefile (revision 547179) @@ -1,46 +1,48 @@ # $FreeBSD$ PORTNAME= contrib DISTVERSION= git.2019-06-28 PORTREVISION= 1 CATEGORIES= sysutils PKGNAMEPREFIX= munin- MAINTAINER= mat@FreeBSD.org COMMENT= Contributed plugins and other for munin LICENSE= GPLv2 RUN_DEPENDS= munin-node>=0:sysutils/munin-node -USES= shebangfix uniquefiles:dirs python:env -SHEBANG_REGEX= ./(${EXAMPLES_DIRS:ts|})/.* -SHEBANG_LANG= python3 expect gawk zsh -ruby_OLD_CMD= /opt/csw/bin/ruby -zsh_CMD= ${LOCALBASE}/bin/zsh -python3_CMD= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT} +USES= python:env shebangfix uniquefiles:dirs + USE_GITHUB= yes GH_ACCOUNT= munin-monitoring GH_TAGNAME= 33270dd GH_TUPLE= shuque:bind9stats:a920ded:bind9stats -NO_BUILD= yes -NO_ARCH= yes +SHEBANG_REGEX= ./(${EXAMPLES_DIRS:ts|})/.* +SHEBANG_LANG= expect gawk python3 zsh +python3_CMD= ${LOCALBASE}/bin/python${PYTHON3_DEFAULT} +zsh_CMD= ${LOCALBASE}/bin/zsh +ruby_OLD_CMD= /opt/csw/bin/ruby # Most of the installed files are scripts, so give them a "correct" mode. BINMODE= 755 + +NO_ARCH= yes +NO_BUILD= yes SUB_FILES= pkg-message EXAMPLES_DIRS= plugins samples templates tools post-extract: @${MV} ${WRKSRC_bind9stats}/bind9stats.py ${WRKSRC}/plugins/bind9stats do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${COPYTREE_BIN} ${EXAMPLES_DIRS:Q} ${STAGEDIR}${EXAMPLESDIR} @cd ${STAGEDIR}${PREFIX} && ${FIND} -f * '(' -type f -o -type l ')' >> ${TMPPLIST} .include Index: head/sysutils/munin-master/Makefile =================================================================== --- head/sysutils/munin-master/Makefile (revision 547178) +++ head/sysutils/munin-master/Makefile (revision 547179) @@ -1,61 +1,63 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -master MAINTAINER= mat@FreeBSD.org COMMENT= Collector part of Munin -BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ - munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ - rrdtool>=0:databases/rrdtool \ +BUILD_DEPENDS= munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ p5-CGI>=0:www/p5-CGI \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \ p5-HTML-Template>=0:www/p5-HTML-Template \ p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ + p5-Module-Build>=0:devel/p5-Module-Build \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay \ - p5-Params-Validate>=0:devel/p5-Params-Validate + p5-Params-Validate>=0:devel/p5-Params-Validate \ + rrdtool>=0:databases/rrdtool RUN_DEPENDS= munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ - rrdtool>=0:databases/rrdtool \ - p5-CGI>=0:www/p5-CGI \ p5-CGI-Fast>=0:www/p5-CGI-Fast \ + p5-CGI>=0:www/p5-CGI \ + p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ + p5-FCGI>=0:www/p5-FCGI \ p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \ p5-HTML-Template>=0:www/p5-HTML-Template \ p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay \ p5-Params-Validate>=0:devel/p5-Params-Validate \ p5-URI>=0:net/p5-URI \ - p5-Date-Manip>=0:devel/p5-Date-Manip \ - p5-FCGI>=0:www/p5-FCGI + rrdtool>=0:databases/rrdtool -USES= gmake perl5 cpe +USES= cpe gmake perl5 .include "${.CURDIR}/../munin-common/munin.mk" ALL_TARGET= infiles build-master build-man INSTALL_TARGET= install-master-prime + NO_ARCH= yes -SUB_FILES= pkg-message -PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} - PORTSCOUT= ignore:1 + +SUB_FILES= pkg-message +PLIST_SUB+= WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} post-install: (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) (cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done) ${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-master.newsyslog .include Index: head/sysutils/munin-node/Makefile =================================================================== --- head/sysutils/munin-node/Makefile (revision 547178) +++ head/sysutils/munin-node/Makefile (revision 547179) @@ -1,96 +1,102 @@ # Created by: Lupe Christoph # $FreeBSD$ PORTNAME= munin PORTVERSION= ${MUNIN_VERSION} CATEGORIES= sysutils perl5 MASTER_SITES= ${MUNIN_SITES} PKGNAMESUFFIX= -node MAINTAINER= mat@FreeBSD.org COMMENT= Node-specific part of Munin -BUILD_DEPENDS= p5-Module-Build>=0:devel/p5-Module-Build \ - p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ - p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ +BUILD_DEPENDS= bash:shells/bash \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ - p5-Net-Server>=0:net/p5-Net-Server \ - bash:shells/bash -RUN_DEPENDS= p5-Cache-Cache>=0:devel/p5-Cache-Cache \ p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ + p5-Module-Build>=0:devel/p5-Module-Build \ + p5-Net-Server>=0:net/p5-Net-Server +RUN_DEPENDS= bash:shells/bash \ munin-common>=${MUNIN_VERSION}:sysutils/munin-common \ - p5-Net-Server>=0:net/p5-Net-Server \ + p5-Cache-Cache>=0:devel/p5-Cache-Cache \ + p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \ + p5-libwww>=0:www/p5-libwww \ p5-List-MoreUtils>0:lang/p5-List-MoreUtils \ + p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ - p5-libwww>=0:www/p5-libwww \ - bash:shells/bash + p5-Net-Server>=0:net/p5-Net-Server -USES= gmake perl5 shebangfix cpe -REINPLACE_ARGS= -i "" +USES= cpe gmake perl5 shebangfix +USE_RC_SUBR= munin-asyncd munin-node + SHEBANG_FILES= node/bin/munindoc node/sbin/munin-node \ - node/sbin/munin-run node/sbin/munin-node-configure + node/sbin/munin-node-configure node/sbin/munin-run .include "${.CURDIR}/../munin-common/munin.mk" -ALL_TARGET= build-node build-plugins build/node/_bin/munin-async build/node/_bin/munin-asyncd +ALL_TARGET= build-node build-plugins build/node/_bin/munin-async \ + build/node/_bin/munin-asyncd INSTALL_TARGET= install-node-prime install-async-prime install-plugins-prime +REINPLACE_ARGS= -i "" NO_ARCH= yes -OPTIONS_DEFINE= SNMP PERL PYTHON JAVA -OPTIONS_DEFAULT= SNMP PERL PYTHON -OPTIONS_SUB= yes -SNMP_DESC= Include SNMP plugins -PERL_DESC= Include all Perl modules (adds dependencies) +PORTSCOUT= ignore:1 + +SUB_FILES= pkg-message plugins.conf + +OPTIONS_DEFINE= JAVA PERL PYTHON SNMP +OPTIONS_DEFAULT= PERL PYTHON SNMP +OPTIONS_SUB= yes + JAVA_DESC= Include JAVA plugins +PERL_DESC= Include all Perl modules (adds dependencies) PYTHON_DESC= Include Python plugins +SNMP_DESC= Include SNMP plugins -SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP -SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP -PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ - p5-Net-DNS>=0:dns/p5-Net-DNS \ - p5-Net-IP>=0:net-mgmt/p5-Net-IP \ - p5-XML-Parser>=0:textproc/p5-XML-Parser \ - p5-XML-LibXML>=0:textproc/p5-XML-LibXML -PYTHON_USES= python -JAVA_USE= java=yes +JAVA_USE= JAVA=yes JAVA_INSTALL_TARGET= install-plugins-java -JAVA_BUILD= yes -JAVA_RUN= yes +JAVA_VARS= JAVA_BUILD=yes \ + JAVA_RUN=yes -SUB_FILES= pkg-message plugins.conf -USE_RC_SUBR= munin-asyncd munin-node +PERL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg \ + p5-Net-DNS>=0:dns/p5-Net-DNS \ + p5-Net-IP>=0:net-mgmt/p5-Net-IP \ + p5-XML-LibXML>=0:textproc/p5-XML-LibXML \ + p5-XML-Parser>=0:textproc/p5-XML-Parser -PORTSCOUT= ignore:1 +PYTHON_USES= python + +SNMP_BUILD_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP +SNMP_RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/node/sbin/munin-node \ ${WRKSRC}/node/sbin/munin-node-configure \ ${WRKSRC}/node/sbin/munin-run @${REINPLACE_CMD} \ -e 's|^\(BASH[[:space:]]*:=\).*|\1 ${bash_CMD}|' \ -e 's|^\(JAVARUN[[:space:]]*:=\).*|\1 ${java_CMD}|' \ -e 's|^\(PERL[[:space:]]*:=\).*|\1 ${perl_CMD}|' \ -e 's|^\(PYTHON[[:space:]]*:=\).*|\1 ${python_CMD}|' \ -e 's|^\(RUBY[[:space:]]*:=\).*|\1 ${ruby_CMD}|' \ ${WRKSRC}/Makefile.config @${FIND} ${WRKSRC}/node/sbin -type f -name "*.orig" -delete post-install: ${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state ${STAGEDIR}${SPOOLDIR}/async ${INSTALL_SCRIPT} ${.CURDIR}/plugins/* ${STAGEDIR}${DATADIR}/plugins/ ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \ ${STAGEDIR}${ETCDIR}/munin-node.conf.sample ${INSTALL_DATA} ${WRKDIR}/plugins.conf \ ${STAGEDIR}${ETCDIR}/plugins.conf.sample (cd ${WRKSRC}/node/blib/bindoc; \ ${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \ ) (cd ${WRKSRC}/build/doc; \ ${INSTALL_MAN} munin-node.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \ ${INSTALL_MAN} munin.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \ ) ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/munin-node.newsyslog .include Index: head/sysutils/tmux/Makefile =================================================================== --- head/sysutils/tmux/Makefile (revision 547178) +++ head/sysutils/tmux/Makefile (revision 547179) @@ -1,69 +1,69 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= tmux PORTVERSION= 3.1b CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= mat@FreeBSD.org COMMENT= Terminal Multiplexer LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING USES= ncurses pkgconfig USE_GITHUB= nodefault GH_TUPLE= imomaliev:tmux-bash-completion:ef56d3e:bash GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-utempter \ --sysconfdir=${PREFIX}/etc CONFLICTS_INSTALL= tmux23 PLIST_FILES= bin/tmux \ etc/bash_completion.d/tmux \ man/man1/tmux.1.gz PORTDOCS= CHANGES README PORTEXAMPLES= * OPTIONS_DEFINE= BACKSPACE DOCS EXAMPLES LIBEVENT_STATIC UTF8PROC BACKSPACE_DESC= Build with tty/keys patch LIBEVENT_STATIC_DESC= Build with static libevent UTF8PROC_DESC= Build with utf8proc support BACKSPACE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tty-keys.c LIBEVENT_STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:devel/libevent LIBEVENT_STATIC_LIB_DEPENDS_OFF= libevent.so:devel/libevent LIBEVENT_STATIC_VARS= LESTATIC=${LOCALBASE}/lib/libevent.a -UTF8PROC_CONFIGURE_ENABLE= utf8proc UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc +UTF8PROC_CONFIGURE_ENABLE= utf8proc post-patch: @${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES \ ${WRKSRC}/tmux.h post-configure-LIBEVENT_STATIC-on: ${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \ ${WRKSRC}/${MAKEFILE} post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKSRC_bash}/completions/tmux ${STAGEDIR}${PREFIX}/etc/bash_completion.d/tmux post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/example* ${STAGEDIR}${EXAMPLESDIR} .include Index: head/textproc/ydiff/Makefile =================================================================== --- head/textproc/ydiff/Makefile (revision 547178) +++ head/textproc/ydiff/Makefile (revision 547179) @@ -1,33 +1,33 @@ # Created by: eivind # $FreeBSD$ PORTNAME= ydiff DISTVERSION= 1.2 PORTEPOCH= 1 -MASTER_SITES= LOCAL/mat/ydiff CATEGORIES= textproc +MASTER_SITES= LOCAL/mat/ydiff MAINTAINER= mat@FreeBSD.org COMMENT= Diff readability enhancer for color terminals LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= python -USE_PYTHON= distutils autoplist concurrent noflavors USE_GITHUB= GH_ACCOUNT= ymattw +USE_PYTHON= autoplist concurrent distutils noflavors NO_ARCH= yes PORTDOCS= CHANGES.rst README.rst OPTIONS_DEFINE= DOCS post-install-DOCS-on: ${INSTALL} -d ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .include