diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -59,9 +59,11 @@ CUE_DESC?= Embedded CUE sheets support CUPS_DESC?= CUPS printing system support CURL_DESC?= Data transfer support via cURL +CVS_DESC?= CVS version control support CXX_DESC?= C++ language support CYASSL_DESC?= SSL/TLS support via CyaSSL DAGRAB_DESC?= CD ripping support (via dagrab) +DARCS_DESC?= Darcs version control support DATA_DESC?= Install data files DBM_DESC?= dbm database library support DBUS_DESC?= D-Bus IPC system support @@ -117,6 +119,7 @@ GHOSTSCRIPT_DESC?= Ghostscript support GIF_DESC?= GIF image format support GIO_DESC?= Use GIO for file I/O +GIT_DESC?= Git version control support GLADE_DESC?= Glade interface builder support GLUT_DESC?= OpenGL Utility Toolkit support GLX_DESC?= X11 OpenGL rendering support @@ -318,6 +321,7 @@ MATROSKA_DESC?= Matroska container format support MBEDTLS_DESC?= SSL/TLS support via mbed TLS MDNSRESPONDER_DESC?= Zeroconf support via mDNSResponder +MERCURIAL_DESC?= Mercurial version control support METALINK_DESC?= Metalink support MIKMOD_DESC?= MOD audio format support MIXER_DESC?= Audio mixer support @@ -389,6 +393,7 @@ PANGO_DESC?= Pango rendering library support PCRE_DESC?= Use Perl Compatible Regular Expressions PDF_DESC?= PDF document support +PERFORCE_DESC?= Perforce version control support PERL_DESC?= Perl scripting language support PGO_DESC?= Use Profile-Guided Optimization PGSQL_DESC?= PostgreSQL database support @@ -462,9 +467,9 @@ STATIC_DESC?= Build static executables and/or libraries STRIP_DESC?= Strip binaries before installation STROKE_DESC?= Mouse gestures support via libstroke +SUBVERSION_DESC?= Subversion version control support SVG_DESC?= SVG vector image format support SVGALIB_DESC?= SVGA graphics support -SVN_DESC?= Subversion support SWFDEC_DESC?= Flash support via Swfdec SWIG_DESC?= SWIG binding/wrapper support SYBASE_DESC?= Sybase SQL Server support diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -2,6 +2,7 @@ PORTNAME= anjuta PORTVERSION= 3.34.0 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -79,9 +80,8 @@ org.gnome.anjuta.tools.gschema.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= SVN DEVHELP GLADE TERMINAL -OPTIONS_DEFAULT=SVN DEVHELP GLADE TERMINAL -SVN_DESC= Subversion plugin +OPTIONS_DEFINE= DEVHELP GLADE SUBVERSION TERMINAL +OPTIONS_DEFAULT=DEVHELP GLADE SUBVERSION TERMINAL DEVHELP_DESC= Devhelp plugin GLADE_DESC= Build glade plugin TERMINAL_DESC= Build build-in terminal @@ -95,10 +95,10 @@ libpcre2-8.so:devel/pcre2 TERMINAL_VARS= GLIB_SCHEMAS+=org.gnome.anjuta.terminal.gschema.xml -SVN_LIB_DEPENDS= libapr-1.so:devel/apr1 \ +SUBVERSION_LIB_DEPENDS= libapr-1.so:devel/apr1 \ libserf-1.so:www/serf \ libsvn_client-1.so:devel/subversion -SVN_CONFIGURE_ENABLE= plugin-subversion +SUBVERSION_CONFIGURE_ENABLE= plugin-subversion DEVHELP_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -153,7 +153,7 @@ lib/anjuta/anjuta-run-program.plugin lib/anjuta/anjuta-snippets-manager.plugin lib/anjuta/anjuta-starter.plugin -%%SVN%%lib/anjuta/anjuta-subversion.plugin +%%SUBVERSION%%lib/anjuta/anjuta-subversion.plugin %%TERMINAL%%lib/anjuta/anjuta-terminal.plugin lib/anjuta/anjuta-tools.plugin lib/anjuta/dir-project.plugin @@ -191,7 +191,7 @@ lib/anjuta/libanjuta-snippets-manager.so lib/anjuta/libanjuta-sourceview.so lib/anjuta/libanjuta-starter.so -%%SVN%%lib/anjuta/libanjuta-subversion.so +%%SUBVERSION%%lib/anjuta/libanjuta-subversion.so lib/anjuta/libanjuta-symbol-db.so %%TERMINAL%%lib/anjuta/libanjuta-terminal.so lib/anjuta/libanjuta-tools.so @@ -244,7 +244,7 @@ %%DATADIR%%/glade/anjuta-project-wizard.ui %%DATADIR%%/glade/anjuta-quick-open.ui %%DATADIR%%/glade/anjuta-run-program.ui -%%SVN%%%%DATADIR%%/glade/anjuta-subversion.ui +%%SUBVERSION%%%%DATADIR%%/glade/anjuta-subversion.ui %%DATADIR%%/glade/anjuta-symbol-db.ui %%TERMINAL%%%%DATADIR%%/glade/anjuta-terminal-plugin.ui %%DATADIR%%/glade/anjuta-tools.ui @@ -462,7 +462,7 @@ %%DATADIR%%/ui/anjuta-quick-open.xml %%DATADIR%%/ui/anjuta-run-program.xml %%DATADIR%%/ui/anjuta-sourceview.xml -%%SVN%%%%DATADIR%%/ui/anjuta-subversion.xml +%%SUBVERSION%%%%DATADIR%%/ui/anjuta-subversion.xml %%DATADIR%%/ui/anjuta-symbol-db-plugin.xml %%TERMINAL%%%%DATADIR%%/ui/anjuta-terminal-plugin.xml %%DATADIR%%/ui/anjuta-tools.xml @@ -2306,8 +2306,8 @@ share/pixmaps/anjuta/anjuta-step-out-24.png share/pixmaps/anjuta/anjuta-step-over-16.png share/pixmaps/anjuta/anjuta-step-over-24.png -%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin-48.png -%%SVN%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg +%%SUBVERSION%%share/pixmaps/anjuta/anjuta-subversion-plugin-48.png +%%SUBVERSION%%share/pixmaps/anjuta/anjuta-subversion-plugin.svg share/pixmaps/anjuta/anjuta-swap-16.png share/pixmaps/anjuta/anjuta-swap-24.png share/pixmaps/anjuta/anjuta-symbol-db-plugin-16.png diff --git a/devel/git/Makefile b/devel/git/Makefile --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -2,6 +2,7 @@ PORTNAME= git DISTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -67,16 +68,16 @@ CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no -OPTIONS_DEFINE= CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS P4 PCRE2 PERL \ - SEND_EMAIL SUBTREE SVN -OPTIONS_DEFAULT=CONTRIB CURL CVS GITWEB ICONV P4 PCRE2 PERL SEND_EMAIL \ +OPTIONS_DEFINE= CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS PCRE2 PERFORCE PERL \ + SEND_EMAIL SUBTREE SUBVERSION +OPTIONS_DEFAULT=CONTRIB CURL CVS GITWEB ICONV PCRE2 PERFORCE PERL SEND_EMAIL \ SUBTREE .if ${FLAVOR:U} == gui OPTIONS_SLAVE+= GUI .elif ${FLAVOR:U} == lite -OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL +OPTIONS_EXCLUDE= GUI SUBVERSION GITWEB CONTRIB PERFORCE CVS PERL .elif ${FLAVOR:U} == svn -OPTIONS_SLAVE+= SVN +OPTIONS_SLAVE+= SUBVERSION .elif ${FLAVOR:U} == tiny OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} OPTIONS_SLAVE= CURL @@ -93,7 +94,6 @@ CVS_DESC= Enable CVS support GITWEB_DESC= Install gitweb HTMLDOCS_DESC= Install additional documentation -P4_DESC= Enable Perforce support PCRE2_DESC= Use Perl Compatible Regular Expressions (v2) SEND_EMAIL_DESC=Enable the git-send-email(1) script SUBTREE_DESC= Install git-subtree @@ -131,11 +131,11 @@ GUI_MAKE_ARGS= TCL_PATH=${TCLSH} TCLTK_PATH=${WISH} GUI_MAKE_ARGS_OFF= NO_TCLTK=yes -SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey +SUBVERSION_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey .if ${WITH_SUBVERSION_VER:U} == LTS -SVN_RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion +SUBVERSION_RUN_DEPENDS+= p5-subversion-lts>=0:devel/p5-subversion .else -SVN_RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion +SUBVERSION_RUN_DEPENDS+= p5-subversion>=0:devel/p5-subversion .endif SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor\ @@ -150,7 +150,7 @@ ALL_TARGET= all strip .endif -.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB} +.if ${PORT_OPTIONS:MPERFORCE} || ${PORT_OPTIONS:MCONTRIB} USES+= python CONFIGURE_ARGS+= --with-python=${PYTHON_CMD} .else @@ -163,7 +163,7 @@ gitk.1 .endif -.if empty(PORT_OPTIONS:MSVN) +.if empty(PORT_OPTIONS:MSUBVERSION) RMMAN1+= git-svn.1 .endif @@ -201,17 +201,17 @@ s/git-cvsserver//' \ ${WRKSRC}/Makefile -post-patch-SVN-off: +post-patch-SUBVERSION-off: @${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile post-patch-GITWEB-off: @${REINPLACE_CMD} -e '/$$(MAKE) -C gitweb install/d' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/t/lib-gitweb.sh -post-patch-P4-off: +post-patch-PERFORCE-off: @${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB} +.if ${PORT_OPTIONS:MPERFORCE} || ${PORT_OPTIONS:MCONTRIB} post-build: @${FIND} ${WRKSRC} -name "*.bak" -delete .endif @@ -253,7 +253,7 @@ ${RM} ${WRKSRC}/contrib/credential/netrc/test.netrc.gpg ${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib -post-install-P4-on: +post-install-PERFORCE-on: ${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/ post-install-GITWEB-on: diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -1,6 +1,6 @@ bin/git %%CVS%%bin/git-cvsserver -%%P4%%bin/git-p4.py +%%PERFORCE%%bin/git-p4.py bin/git-receive-pack bin/git-shell bin/git-upload-archive @@ -128,7 +128,7 @@ libexec/git-core/git-multi-pack-index libexec/git-core/git-name-rev libexec/git-core/git-notes -%%P4%%libexec/git-core/git-p4 +%%PERFORCE%%libexec/git-core/git-p4 libexec/git-core/git-pack-objects libexec/git-core/git-pack-redundant libexec/git-core/git-pack-refs @@ -180,7 +180,7 @@ libexec/git-core/git-submodule libexec/git-core/git-submodule--helper %%SUBTREE%%libexec/git-core/git-subtree -%%SVN%%libexec/git-core/git-svn +%%SUBVERSION%%libexec/git-core/git-svn libexec/git-core/git-switch libexec/git-core/git-symbolic-ref libexec/git-core/git-tag @@ -358,7 +358,7 @@ man/man1/git-stripspace.1.gz man/man1/git-submodule.1.gz %%SUBTREE%%man/man1/git-subtree.1.gz -%%SVN%%man/man1/git-svn.1.gz +%%SUBVERSION%%man/man1/git-svn.1.gz man/man1/git-switch.1.gz man/man1/git-symbolic-ref.1.gz man/man1/git-tag.1.gz diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -2,6 +2,7 @@ PORTNAME= opam PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- @@ -24,18 +25,15 @@ MAKE_JOBS_UNSAFE= yes ALL_TARGET= lib-ext all -OPTIONS_DEFINE= RSYNC GIT HG DARCS -OPTIONS_DEFAULT= RSYNC GIT +OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC +OPTIONS_DEFAULT= GIT RSYNC NO_OPTIONS_SORT= yes -DARCS_DESC= Remote repository synchronized with darcs -GIT_DESC= Remote repository synchronized with git -HG_DESC= Remote repository synchronized with mercurial RSYNC_DESC= Remote repository synchronized with Rsync DARCS_RUN_DEPENDS= darcs:devel/hs-darcs GIT_RUN_DEPENDS= git:devel/git -HG_RUN_DEPENDS= ${PY_MERCURIAL} +MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} RSYNC_RUN_DEPENDS= rsync:net/rsync post-install: diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile --- a/devel/thunar-vcs-plugin/Makefile +++ b/devel/thunar-vcs-plugin/Makefile @@ -2,7 +2,7 @@ PORTNAME= thunar-vcs-plugin PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel xfce MASTER_SITES= XFCE/thunar-plugins DIST_SUBDIR= xfce4 @@ -22,20 +22,18 @@ INSTALLS_ICONS= yes INSTALL_TARGET= install-strip -OPTIONS_DEFINE= NLS GIT SVN -OPTIONS_DEFAULT= SVN +OPTIONS_DEFINE= GIT NLS SUBVERSION +OPTIONS_DEFAULT= SUBVERSION OPTIONS_SUB= yes -GIT_DESC= Git support - GIT_CONFIGURE_ENABLE= git GIT_RUN_DEPENDS= git:devel/git NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext-runtime -SVN_CONFIGURE_ENABLE= subversion -SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ - libapr-1.so:devel/apr1 +SUBVERSION_CONFIGURE_ENABLE= subversion +SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion \ + libapr-1.so:devel/apr1 .include diff --git a/devel/thunar-vcs-plugin/pkg-plist b/devel/thunar-vcs-plugin/pkg-plist --- a/devel/thunar-vcs-plugin/pkg-plist +++ b/devel/thunar-vcs-plugin/pkg-plist @@ -1,6 +1,6 @@ lib/thunarx-3/thunar-vcs-plugin.so %%GIT%%libexec/tvp-git-helper -%%SVN%%libexec/tvp-svn-helper +%%SUBVERSION%%libexec/tvp-svn-helper share/icons/hicolor/24x24/apps/git.png share/icons/hicolor/24x24/apps/subversion.png share/icons/hicolor/48x48/apps/git.png diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile --- a/devel/viewvc-devel/Makefile +++ b/devel/viewvc-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= viewvc DISTVERSION= 1.3.0-20201006 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -devel @@ -19,10 +20,10 @@ NO_BUILD= yes NO_OPTIONS_SORT= yes -OPTIONS_DEFINE= WEBSRV APMOD SVN -OPTIONS_DEFAULT= WEBSRV APACHE SVN +OPTIONS_DEFINE= APMOD SUBVERSION WEBSRV +OPTIONS_DEFAULT= APACHE SUBVERSION WEBSRV -OPTIONS_SINGLE= WEBSRV APMOD +OPTIONS_SINGLE= APMOD WEBSRV OPTIONS_SINGLE_WEBSRV= APACHE LIGHTTPD OPTIONS_SINGLE_APMOD= MODWSGI @@ -35,7 +36,7 @@ LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} +SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR} diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -3,7 +3,7 @@ PORTNAME= observium PORTVERSION= 0.19.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest @@ -40,8 +40,8 @@ sudo:security/sudo LIB_DEPENDS+= libpng.so:graphics/png -OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SVN WMIC -OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SVN WMIC +OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC +OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC APACHEMOD_DESC= Use PHP with Apache 2.2+ module FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI @@ -55,7 +55,7 @@ NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR} -SVN_RUN_DEPENDS= svn:devel/subversion +SUBVERSION_RUN_DEPENDS= svn:devel/subversion WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client .include diff --git a/net-mgmt/rancid3/Makefile b/net-mgmt/rancid3/Makefile --- a/net-mgmt/rancid3/Makefile +++ b/net-mgmt/rancid3/Makefile @@ -2,7 +2,7 @@ PORTNAME= rancid PORTVERSION= 3.13 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ PKGNAMESUFFIX= 3 @@ -37,21 +37,18 @@ OPTIONS_SINGLE= SCM -OPTIONS_SINGLE_SCM= CVS SVN GIT +OPTIONS_SINGLE_SCM= CVS GIT SUBVERSION OPTIONS_DEFINE= COMWARE OPTIONS_DEFAULT= CVS COMWARE_DESC= Add experimental support for Comware devices -CVS_DESC= Use CVS as the means of version control -SVN_DESC= Use Subversion as the means of version control -GIT_DESC= Use Git as the means of version control CVS_RUN_DEPENDS= cvs:devel/cvs CVS_CONFIGURE_ON= --without-svn -SVN_RUN_DEPENDS= svn:devel/subversion -SVN_CONFIGURE_ON= --with-svn +SUBVERSION_RUN_DEPENDS= svn:devel/subversion +SUBVERSION_CONFIGURE_ON= --with-svn GIT_RUN_DEPENDS= git:devel/git GIT_CONFIGURE_ON= --with-git diff --git a/ports-mgmt/portest/Makefile b/ports-mgmt/portest/Makefile --- a/ports-mgmt/portest/Makefile +++ b/ports-mgmt/portest/Makefile @@ -2,6 +2,7 @@ PORTNAME= portest PORTVERSION= 0.1.9 +PORTREVISION= 1 CATEGORIES= ports-mgmt MAINTAINER= ultima@FreeBSD.org @@ -18,7 +19,6 @@ OPTIONS_DEFINE= GIT PORTLINT PORTTOOLS POUDRIERE -GIT_DESC= Git support GIT_RUN_DEPENDS= git:devel/git PORTLINT_DESC= Portlint support diff --git a/ports-mgmt/portshaker/Makefile b/ports-mgmt/portshaker/Makefile --- a/ports-mgmt/portshaker/Makefile +++ b/ports-mgmt/portshaker/Makefile @@ -3,7 +3,7 @@ PORTNAME?= portshaker PORTVERSION= 1.0.19 DISTVERSIONPREFIX= v -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= ports-mgmt MAINTAINER?= romain@FreeBSD.org @@ -18,20 +18,18 @@ GH_PROJECT= portshaker .if ${PORTNAME} == "portshaker" -OPTIONS_DEFINE= RSYNC SVN GIT HG -OPTIONS_DEFAULT= RSYNC SVN +OPTIONS_DEFINE= GIT MERCURIAL RSYNC SUBVERSION +OPTIONS_DEFAULT= RSYNC SUBVERSION RSYNC_DESC= rsync support -GIT_DESC= git support -HG_DESC= mercurial support RSYNC_RUN_DEPENDS= rsync:net/rsync WITH_SUBVERSION_VER?= 114 .if ${WITH_SUBVERSION_VER} == 114 -SVN_RUN_DEPENDS= svn:devel/subversion +SUBVERSION_RUN_DEPENDS= svn:devel/subversion .elif ${WITH_SUBVERSION_VER} == LTS -SVN_RUN_DEPENDS= svn:devel/subversion-lts +SUBVERSION_RUN_DEPENDS= svn:devel/subversion-lts .endif GIT_RUN_DEPENDS= git:devel/git -HG_RUN_DEPENDS= ${PY_MERCURIAL} +MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} .else OPTIONS_DEFINE= BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG OPTIONS_DEFAULT= BSDSHARP diff --git a/security/hydra/Makefile b/security/hydra/Makefile --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -3,6 +3,7 @@ PORTNAME= hydra DISTVERSIONPREFIX=v DISTVERSION= 9.2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= rm@FreeBSD.org @@ -27,11 +28,11 @@ PLIST_FILES= bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \ man/man1/hydra.1.gz man/man1/pw-inspector.1.gz -OPTIONS_DEFINE= FIREBIRD SSH SVN X11 +OPTIONS_DEFINE= FIREBIRD SSH SUBVERSION X11 OPTIONS_DEFAULT=SSH OPTIONS_EXCLUDE=NLS DOCS FIREBIRD_USES= firebird -SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion +SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion SSH_LIB_DEPENDS= libssh.so.4:security/libssh X11_USES= gettext gnome pkgconfig X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ diff --git a/security/medusa/Makefile b/security/medusa/Makefile --- a/security/medusa/Makefile +++ b/security/medusa/Makefile @@ -2,6 +2,7 @@ PORTNAME= medusa PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.foofus.net/~jmk/tools/ @@ -19,12 +20,12 @@ CONFIGURE_ARGS= --enable-module-ncp=no --enable-module-afp=no CFLAGS+= -fcommon -OPTIONS_DEFINE= SVN PGSQL DOCS +OPTIONS_DEFINE= DOCS PGSQL SUBVERSION OPTIONS_SUB= yes -SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion -SVN_CFLAGS= -I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1 -SVN_CONFIGURE_OFF= --enable-module-svn=no +SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion +SUBVERSION_CFLAGS= -I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1 +SUBVERSION_CONFIGURE_OFF= --enable-module-svn=no PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --enable-module-postgres diff --git a/security/medusa/pkg-plist b/security/medusa/pkg-plist --- a/security/medusa/pkg-plist +++ b/security/medusa/pkg-plist @@ -17,7 +17,7 @@ lib/medusa/modules/smtp.mod lib/medusa/modules/snmp.mod lib/medusa/modules/ssh.mod -%%SVN%%lib/medusa/modules/svn.mod +%%SUBVERSION%%lib/medusa/modules/svn.mod lib/medusa/modules/telnet.mod lib/medusa/modules/vmauthd.mod lib/medusa/modules/vnc.mod diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile --- a/shells/scponly/Makefile +++ b/shells/scponly/Makefile @@ -2,7 +2,7 @@ PORTNAME= scponly PORTVERSION= 4.8.20110526 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= shells security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots DISTNAME= ${PORTNAME}-20110526 @@ -17,8 +17,8 @@ PORTDOCS= BUILDING-JAILS.TXT INSTALL README SECURITY GNU_CONFIGURE= yes -OPTIONS_DEFINE= WILDCARDS GFTP CHROOT RSYNC SCP SVN SVNSERVE UNISON WINSCP \ - DEFAULT_CHDIR DOCS +OPTIONS_DEFINE= CHROOT DEFAULT_CHDIR DOCS GFTP RSYNC SCP SUBVERSION SVNSERVE \ + UNISON WILDCARDS WINSCP OPTIONS_DEFAULT= WILDCARDS DEFAULT_CHDIR_DESC= Chdir(2) by default WILDCARDS_DESC= Wildcards processing @@ -26,7 +26,7 @@ RSYNC_DESC= rsync support CHROOT_DESC= chroot(8) functionality SCP_DESC= vanilla scp support -SVNSERVE_DESC= Suversion support for svn+ssh:// +SVNSERVE_DESC= Subversion support for svn+ssh:// UNISON_DESC= Unisson support WINSCP_DESC= WinSCP support @@ -45,9 +45,9 @@ RSYNC_RUN_DEPENDS= rsync:net/rsync RSYNC_CONFIGURE_ENABLE= rsync-compat SCP_CONFIGURE_ENABLE= scp-compat -SVN_CONFIGURE_ENABLE= svn-compat -SVN_BUILD_DEPENDS= svn:devel/subversion -SVN_RUN_DEPENDS= svn:devel/subversion +SUBVERSION_CONFIGURE_ENABLE= svn-compat +SUBVERSION_BUILD_DEPENDS= svn:devel/subversion +SUBVERSION_RUN_DEPENDS= svn:devel/subversion SVNSERVE_BUILD_DEPENDS= svn:devel/subversion SVNSERVE_RUN_DEPENDS= svn:devel/subversion SVNSERVE_CONFIGURE_ENABLE= svnserv-compat diff --git a/www/trac-devel/Makefile b/www/trac-devel/Makefile --- a/www/trac-devel/Makefile +++ b/www/trac-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= trac DISTVERSION= 1.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ ftp://ftp.edgewall.com/pub/trac/ @@ -32,16 +32,14 @@ NO_ARCH= yes -OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN GIT EXAMPLES TEXTILE FCGI -OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE TEXTILE FCGI +OPTIONS_DEFINE= DOCUTILS EXAMPLES FCGI GIT PYGMENTS SUBVERSION TEXTILE TZ +OPTIONS_DEFAULT= DOCUTILS FCGI PYGMENTS SQLITE SUBVERSION TEXTILE TZ OPTIONS_MULTI= DATABASE -OPTIONS_MULTI_DATABASE= PGSQL SQLITE MYSQL +OPTIONS_MULTI_DATABASE= MYSQL PGSQL SQLITE DOCUTILS_DESC= Allow additional text markup PYGMENTS_DESC= Use generic syntax highlighter TEXTILE_DESC= Support for the Textile markup TZ_DESC= Process Time Zones -SVN_DESC= Enable SVN support -GIT_DESC= Enable GIT support FCGI_DESC= Enable FastCGI support DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} @@ -50,7 +48,7 @@ PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} GIT_RUN_DEPENDS= git:devel/git TEXTILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${PY_FLAVOR} FCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR}