Index: branches/2017Q1/archivers/zip/Makefile =================================================================== --- branches/2017Q1/archivers/zip/Makefile (revision 431510) +++ branches/2017Q1/archivers/zip/Makefile (revision 431511) @@ -1,38 +1,38 @@ # Created by: Andrey Chernov # $FreeBSD$ PORTNAME= zip PORTVERSION= 3.0 PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Create/update ZIP files compatible with PKZIP # License is BSD-based, but not identical, so install with documentation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= DOCS MAKEFILE= unix/Makefile ALL_TARGET= generic PLIST_FILES= bin/zip bin/zipcloak bin/zipnote bin/zipsplit \ man/man1/zip.1.gz man/man1/zipcloak.1.gz \ man/man1/zipnote.1.gz man/man1/zipsplit.1.gz PORTDOCS= * do-install: .for p in ${PLIST_FILES:Mbin*:T} ${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README* TODO WHATSNEW WHERE ${STAGEDIR}${DOCSDIR} .include Index: branches/2017Q1/astro/xearth/Makefile =================================================================== --- branches/2017Q1/astro/xearth/Makefile (revision 431510) +++ branches/2017Q1/astro/xearth/Makefile (revision 431511) @@ -1,29 +1,29 @@ # Created by: Piero Serini # $FreeBSD$ PORTNAME= xearth PORTVERSION= 1.2 CATEGORIES= astro geography MASTER_SITES= LOCAL/madpilot/xearth -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Set the root window to the image of earth USE_XORG= x11 xext sm ice xt USES= tar:xz PLIST_FILES= bin/xearth \ man/man1/xearth.1.gz \ lib/X11/xearth/freebsd.committers.markers \ lib/X11/xearth/freebsd.ftp.markers PLIST_DIRS= lib/X11/xearth do-install: @${INSTALL_PROGRAM} ${WRKSRC}/xearth ${STAGEDIR}${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/xearth.man ${STAGEDIR}${MANPREFIX}/man/man1/xearth.1 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xearth # Copy the list of FreeBSD sites & committers locations .for marker in freebsd.committers.markers freebsd.ftp.markers @${INSTALL_DATA} ${FILESDIR}/${marker} ${STAGEDIR}${PREFIX}/lib/X11/xearth .endfor .include Index: branches/2017Q1/devel/t1lib/Makefile =================================================================== --- branches/2017Q1/devel/t1lib/Makefile (revision 431510) +++ branches/2017Q1/devel/t1lib/Makefile (revision 431511) @@ -1,43 +1,43 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= t1lib PORTVERSION= 5.1.2 PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SUNSITE/libs/graphics/ -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Type 1 font rasterization library for Unix/X11 LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/LGPL USES= cpe gmake libtool GNU_CONFIGURE= yes ALL_TARGET= without_doc USE_LDCONFIG= yes OPTIONS_DEFINE= X11 DOCS OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes X11_USE= XORG=xaw X11_CONFIGURE_WITH= x # Build fails with: # gmake[2]: Entering directory '/wrkdirs/usr/ports/devel/t1lib/work/t1lib-5.1.2/lib' # gmake[2]: *** pselect jobs pipe: Bad file descriptor. Stop. # gmake[2]: *** Waiting for unfinished jobs.... MAKE_JOBS_UNSAFE= YES post-patch: @${REINPLACE_CMD} -e \ '/ALLSUBDIRS/s|$$(DOCSUBDIRS)||g' ${WRKSRC}/Makefile.in post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/t1lib_doc.pdf ${STAGEDIR}${DOCSDIR} .include Index: branches/2017Q1/mail/dovecot2-pigeonhole/Makefile =================================================================== --- branches/2017Q1/mail/dovecot2-pigeonhole/Makefile (revision 431510) +++ branches/2017Q1/mail/dovecot2-pigeonhole/Makefile (revision 431511) @@ -1,66 +1,66 @@ # Created by: Nils Vogels # $FreeBSD$ PORTNAME= dovecot-pigeonhole PORTVERSION= 0.4.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Sieve plugin for the Dovecot 'deliver' LDA and LMTP LICENSE= LGPL21 BUILD_DEPENDS= dovecot2>=2.2.26.0:mail/dovecot2 RUN_DEPENDS= dovecot2>=2.2.26.0:mail/dovecot2 DOVECOTVERSION= 2.2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ --without-dovecot-install-dirs \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip USES= compiler:c11 libtool ssl USE_LDCONFIG= ${PREFIX}/lib/dovecot OPTIONS_DEFINE= DOCS LDAP MANAGESIEVE OPTIONS_DEFAULT=MANAGESIEVE GSSAPI_NONE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_SUB= yes GSSAPI_DESC= GSSAPI Support (*MUST MATCH* mail/dovecot2) GSSAPI_NONE_DESC= Build without GSSAPI support GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} BUILD_FAIL_MESSAGE= Ensure that ${PORTNAME}'s GSSAPI backend is the same as dovecot2 (make config). MANAGESIEVE_DESC= ManageSieve support MANAGESIEVE_CONFIGURE_WITH= managesieve LDAP_CONFIGURE_WITH= ldap LDAP_CPPFLAGS= -I${LOCALBASE}/include LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* post-patch: @${REINPLACE_CMD} -E '\ s!^(install-data-am:) install-sieve_docDATA!\1!; \ s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \ ${WRKSRC}/doc/Makefile.in .include Index: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c =================================================================== --- branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (nonexistent) +++ branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c (revision 431511) @@ -0,0 +1,87 @@ +--- src/lib-sieve/sieve-result.c.orig 2016-10-20 22:48:08 UTC ++++ src/lib-sieve/sieve-result.c +@@ -928,7 +928,7 @@ static int _sieve_result_implicit_keep + (struct sieve_result *result, bool rollback) + { + const struct sieve_action_exec_env *aenv = &result->action_env; +- struct sieve_result_action *rac; ++ struct sieve_result_action *rac, *kac; + int status = SIEVE_EXEC_OK; + struct sieve_result_side_effect *rsef, *rsef_first = NULL; + void *tr_context = NULL; +@@ -937,38 +937,54 @@ static int _sieve_result_implicit_keep + if ( (aenv->flags & SIEVE_EXECUTE_FLAG_DEFER_KEEP) != 0 ) + return SIEVE_EXEC_OK; + +- if ( rollback ) { ++ if ( rollback ) + act_keep = result->failure_action; +- act_keep.mail = NULL; +- } else { ++ else + act_keep = result->keep_action; +- act_keep.mail = sieve_message_get_mail(aenv->msgctx); +- } ++ act_keep.mail = NULL; + + /* If keep is a non-action, return right away */ + if ( act_keep.def == NULL ) + return SIEVE_EXEC_OK; + +- /* Scan for execution of keep-equal actions */ +- rac = result->first_action; +- while ( rac != NULL ) { +- if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && +- act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && +- rac->action.executed ) +- return SIEVE_EXEC_OK; +- +- rac = rac->next; ++ /* Scan for deferred keep */ ++ kac = result->last_action; ++ while ( kac != NULL && kac->action.executed ) { ++ if ( kac->keep && kac->action.def == NULL ) ++ break; ++ kac = kac->prev; + } + +- /* Apply any implicit side effects if applicable */ +- if ( !rollback && hash_table_is_created(result->action_contexts) ) { +- struct sieve_result_action_context *actctx; ++ if (kac == NULL) { ++ if ( !rollback ) ++ act_keep.mail = sieve_message_get_mail(aenv->msgctx); + +- /* Check for implicit side effects to keep action */ +- actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ /* Scan for execution of keep-equal actions */ ++ rac = result->first_action; ++ while ( rac != NULL ) { ++ if ( rac->action.def == act_keep.def && act_keep.def->equals != NULL && ++ act_keep.def->equals(aenv->scriptenv, NULL, &rac->action) && ++ rac->action.executed ) ++ return SIEVE_EXEC_OK; + +- if ( actctx != NULL && actctx->seffects != NULL ) +- rsef_first = actctx->seffects->first_effect; ++ rac = rac->next; ++ } ++ ++ /* Apply any implicit side effects if applicable */ ++ if ( !rollback && hash_table_is_created(result->action_contexts) ) { ++ struct sieve_result_action_context *actctx; ++ ++ /* Check for implicit side effects to keep action */ ++ actctx = hash_table_lookup(result->action_contexts, act_keep.def); ++ ++ if ( actctx != NULL && actctx->seffects != NULL ) ++ rsef_first = actctx->seffects->first_effect; ++ } ++ } else if ( !rollback ) { ++ act_keep.location = kac->action.location; ++ act_keep.mail = kac->action.mail; ++ if ( kac->seffects != NULL ) ++ rsef_first = kac->seffects->first_effect; + } + + /* Start keep action */ Property changes on: branches/2017Q1/mail/dovecot2-pigeonhole/files/patch-src_lib-sieve_sieve-result.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q1/net-mgmt/iog/Makefile =================================================================== --- branches/2017Q1/net-mgmt/iog/Makefile (revision 431510) +++ branches/2017Q1/net-mgmt/iog/Makefile (revision 431511) @@ -1,29 +1,29 @@ -# Created by: Larry Rosenman +# Created by: Larry Rosenman # $FreeBSD$ PORTNAME= iog PORTVERSION= 1.03 PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://www.dynw.com/iog/ MAINTAINER= ports@FreeBSD.org COMMENT= Graphs Byte Counts for switches/routers/etc NO_BUILD= yes NO_ARCH= yes USES= perl5 shebangfix tar:tgz SHEBANG_FILES= ${PORTNAME} PLIST_SUB= VERSION=${PORTVERSION} USERS= iog IOGDIR= ${PREFIX}/iog/iog-${PORTVERSION} do-install: ${FIND} ${WRKSRC} -name '*.bak' -or -name '*.orig' -delete ${MKDIR} -m 755 ${STAGEDIR}${IOGDIR} ${INSTALL} ${COPY} -m 0600 ${WRKSRC}/iog.cfg ${WRKSRC}/iog.cfg.sample ${CP} -R ${WRKSRC}/* ${STAGEDIR}${IOGDIR} ${LN} -sf ${IOGDIR} ${STAGEDIR}${PREFIX}/iog/iog .include Index: branches/2017Q1/sysutils/lsof/Makefile =================================================================== --- branches/2017Q1/sysutils/lsof/Makefile (revision 431510) +++ branches/2017Q1/sysutils/lsof/Makefile (revision 431511) @@ -1,82 +1,82 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= lsof DISTVERSION= 4.90G PORTEPOCH= 8 CATEGORIES= sysutils MASTER_SITES= http://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \ http://www.lerctr.org/lsof/ \ ftp://ftp.ayamura.org/pub/lsof/ \ ftp://ftp.ayamura.org/pub/lsof/NEW/ \ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/ \ ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/NEW/ \ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/ \ ftp://gd.tuwien.ac.at/utils/admin-tools/lsof/NEW/ \ ftp://ftp.sunet.se/pub/unix/admin/lsof/ \ ftp://ftp.sunet.se/pub/unix/admin/lsof/NEW/ \ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ \ ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/NEW/ \ ftp://ftp.tau.ac.il/pub/unix/admin/ DISTNAME= ${PORTNAME}_${DISTVERSION}${DISTNAME_SUFFIX} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Lists information about open files (similar to fstat(1)) LICENSE=lsof LICENSE_NAME=lsof LICENSE_FILE=${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept #Please leave the below line in for the next clean up. FIXUP_RELEASE= YES .if defined(FIXUP_RELEASE) DISTNAME_SUFFIX=.freebsd .else SRCBALL_NAME= ${DISTNAME:S/_W$//}_src WRKSRC= ${WRKDIR}/${DISTNAME}/${SRCBALL_NAME} .endif HAS_CONFIGURE= yes USES= shebangfix tar:bzip2 SHEBANG_FILES= scripts/sort_res.perl5 .include .if !empty(ARCH:Marm*) && ((${OSVERSION} < 1001505) || (${OSVERSION} > 1100000 && ${OSVERSION} < 1100052)) BROKEN= Not supported on ARM platform below release 10.1 or a more recent current .endif CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS= -n freebsd CONFIGURE_ENV= LSOF_CC="${CC}" FREEBSD_SYS="${SRC_BASE}/sys" .if !exists(${SRC_BASE}/sys/kern/kern_lockf.c) IGNORE= requires kernel sources .endif .if !defined(FIXUP_RELEASE) post-extract: @( cd ${WRKDIR}/${DISTNAME} ; \ EXPMD5=`${SED} -n 's/^[[:blank:]]*\(MD5*=*\)/\1/p' README.${DISTNAME}` ; \ CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \ if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \ ${ECHO} "Expected and calculated MD5 signatures don't agree." ; \ ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ exit 1 ; \ fi ; \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${SRCBALL_NAME}.tar ${EXTRACT_AFTER_ARGS} \ ) @( cd ${WRKSRC} ; ${ECHO_CMD} "y" | ./Inventory || exit 1 ) .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lsof ${STAGEDIR}${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/lsof.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/lsof.8 @${MKDIR} ${STAGEDIR}${PREFIX}/share/lsof ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/share/lsof @${CHMOD} 0444 ${STAGEDIR}${PREFIX}/share/lsof/00* .include Index: branches/2017Q1/textproc/pecl-xdiff/Makefile =================================================================== --- branches/2017Q1/textproc/pecl-xdiff/Makefile (revision 431510) +++ branches/2017Q1/textproc/pecl-xdiff/Makefile (revision 431511) @@ -1,26 +1,26 @@ -# Created by: Larry Rosenman +# Created by: Larry Rosenman # $FreeBSD$ PORTNAME= xdiff PORTVERSION= 1.5.2 PORTREVISION= 1 CATEGORIES= textproc pear MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- DIST_SUBDIR= PECL MAINTAINER= dbaio@bsd.com.br COMMENT= PECL extension to create/apply binary and text patches LICENSE= PHP301 LIB_DEPENDS= libxdiff.so:textproc/libxdiff PORTSCOUT= limit:^1.* USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 LDFLAGS+= -L${LOCALBASE}/lib .include Index: branches/2017Q1/www/joomla3/Makefile =================================================================== --- branches/2017Q1/www/joomla3/Makefile (revision 431510) +++ branches/2017Q1/www/joomla3/Makefile (revision 431511) @@ -1,49 +1,49 @@ # Created by: Francisco Cabrita # $FreeBSD$ PORTNAME= joomla PORTVERSION= 3.6.5 CATEGORIES= www PKGNAMESUFFIX= 3 -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Dynamic web content management system (CMS) LICENSE= GPLv2 GH_PROJECT= ${PORTNAME}-cms NO_ARCH= yes NO_BUILD= yes OPTIONS_DEFINE= MYSQL PGSQL OPTIONS_DEFAULT=MYSQL OPTIONS_SUB= yes PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} USES= php:web shebangfix SHEBANG_FILES= build/indexmaker.php \ libraries/vendor/leafo/lessphp/lessify SUB_FILES= pkg-message USE_GITHUB= yes USE_PHP= gd json mbstring pcre pdf session simplexml xml zip zlib MYSQL_USE= PHP=mysqli PGSQL_USE= PHP=pgsql WWWDIR= ${PREFIX}/www/${PORTNAME}${PORTVERSION:R:R} do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} @(cd ${WRKSRC} && \ ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${WWWDIR}/{} \;) @(cd ${WRKSRC} && \ ${FIND} . \! -type d -and \! \( -name .gitignore -or -name .travis.yml \ -or -name travisci-phpunit.xml -or -name LICENSE.txt \ -or -name README.md \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${WWWDIR}/{} \;) .include Index: branches/2017Q1/x11/xdialog/Makefile =================================================================== --- branches/2017Q1/x11/xdialog/Makefile (revision 431510) +++ branches/2017Q1/x11/xdialog/Makefile (revision 431511) @@ -1,42 +1,42 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= xdialog PORTVERSION= 2.3.1 PORTREVISION= 7 CATEGORIES= x11 MASTER_SITES= http://xdialog.free.fr/ DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION} -MAINTAINER= ler@lerctr.org +MAINTAINER= ler@FreeBSD.org COMMENT= Drop in replacement for the "dialog" or "cdialog" programs LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= localbase tar:bzip2 USE_GNOME= gtk12 GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|m4 lib src|m4 src|g ; \ s|-I../lib||g ; \ s|-L../lib -lgetopt||g ; \ s| install-docDATA||g' @${REINPLACE_CMD} -e 's,Xdialog\\-%%version%%,xdialog,' \ ${WRKSRC}/doc/Xdialog.man post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/samples ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${DOCSDIR}/samples .include Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 431510) +++ branches/2017Q1 (revision 431511) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r431147,431488