Page MenuHomeFreeBSD
Files F161283961

D17459.id60046.diff
No OneTemporary
Actions

D17459.id60046.diff
View Options

Index: Mk/bsd.options.desc.mk
===================================================================
--- Mk/bsd.options.desc.mk
+++ Mk/bsd.options.desc.mk
@@ -38,6 +38,7 @@
AUDIOFILE_DESC?= SGI audio file format support
AVAHI_DESC?= Zeroconf support via Avahi
BASH_DESC?= Install programmable completions for Bash
+BAZAAR_DESC?= Bazaar version control support
BDB_DESC?= Berkeley DB support
BDB1_DESC?= Berkeley DB 1.85 support
BITTORRENT_DESC?= BitTorrent file sharing support
@@ -60,9 +61,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
@@ -118,6 +121,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
@@ -151,6 +155,7 @@
H323_DESC?= H.323 codec support
HAL_DESC?= HAL (Hardware Abstraction Layer) support
HDF5_DESC?= HDF-5 data format support
+MERCURIAL_DESC?= Mercurial version control support
HPACK_DESC?= Header Compression for HTTP/2.0 support
HTTP2_DESC?= HTTP protocol version 2.0 support
HTTPD_DESC?= httpd output streaming support
@@ -388,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
@@ -423,6 +429,7 @@
REDIS_DESC?= Redis key-value store database support
REGEX_DESC?= Regular expression support
RESIN3_DESC?= Resin 3.x support
+RSYNC_DESC?= Rsync support
RTMP_DESC?= RTMP protocol support via librtmp
RTMPDUMP_DESC?= RTMP protocol support via rtmpdump
RTSP_DESC?= Real Time Streaming Protocol (RTSP) support
@@ -463,7 +470,7 @@
STROKE_DESC?= Mouse gestures support via libstroke
SVG_DESC?= SVG vector image format support
SVGALIB_DESC?= SVGA graphics support
-SVN_DESC?= Subversion support
+SUBVERSION_DESC?= Subversion version control support
SWFDEC_DESC?= Flash support via Swfdec
SWIG_DESC?= SWIG binding/wrapper support
SYBASE_DESC?= Sybase SQL Server support
Index: deskutils/zim/Makefile
===================================================================
--- deskutils/zim/Makefile
+++ deskutils/zim/Makefile
@@ -3,6 +3,7 @@
PORTNAME= zim
DISTVERSION= 0.71.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= https://www.zim-wiki.org/downloads/
@@ -25,21 +26,18 @@
INSTALLS_ICONS= yes
NO_ARCH= yes
-OPTIONS_DEFINE= BZR DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
+OPTIONS_DEFINE= BAZAAR DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
MERCURIAL SCROT
DITAA_DESC= Diagram editor support
DITAA_RUN_DEPENDS= ditaa:graphics/ditaa
-BZR_DESC= Version control for notebooks using bzr
-BZR_RUN_DEPENDS= bzr:devel/bzr
-GIT_DESC= Version control for notebooks using git
+BAZAAR_RUN_DEPENDS= bzr:devel/bzr
GIT_RUN_DEPENDS= git:devel/git
GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot
GNUR_DESC= Support of plot editor based on GNU R
GNUR_RUN_DEPENDS= R:math/R
GRAPHVIZ_RUN_DEPENDS= fdp:graphics/graphviz
LATEX_USE= tex=latex:run
-MERCURIAL_DESC= Version control for notebooks using hg
MERCURIAL_RUN_DEPENDS= hg:devel/mercurial
SCROT_DESC= Screenshot taking and inserting support
SCROT_RUN_DEPENDS= scrot:graphics/scrot
Index: devel/anjuta/Makefile
===================================================================
--- devel/anjuta/Makefile
+++ devel/anjuta/Makefile
@@ -3,7 +3,7 @@
PORTNAME= anjuta
PORTVERSION= 3.28.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -77,9 +77,8 @@
org.gnome.anjuta.tools.gschema.xml
OPTIONS_SUB= yes
-OPTIONS_DEFINE= SVN DEVHELP VALA GLADE TERMINAL
-OPTIONS_DEFAULT=SVN DEVHELP VALA GLADE TERMINAL
-SVN_DESC= Subversion plugin
+OPTIONS_DEFINE= SUBVERSION DEVHELP VALA GLADE TERMINAL
+OPTIONS_DEFAULT=SUBVERSION DEVHELP VALA GLADE TERMINAL
DEVHELP_DESC= Devhelp plugin
VALA_DESC= Vala support
GLADE_DESC= Build glade plugin
@@ -94,10 +93,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 \
Index: devel/anjuta/pkg-plist
===================================================================
--- devel/anjuta/pkg-plist
+++ 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
%%VALA%%lib/anjuta/anjuta-vala.plugin
@@ -193,7 +193,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
@@ -246,7 +246,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
@@ -465,7 +465,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
@@ -2283,8 +2283,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
Index: devel/bzrtools/Makefile
===================================================================
--- devel/bzrtools/Makefile
+++ devel/bzrtools/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bzrtools
PORTVERSION= 2.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://launchpad.net/bzrtools/stable/${PORTVERSION}/+download/
@@ -16,7 +16,6 @@
OPTIONS_DEFINE= GRAPHVIZ RSYNC
GRAPHVIZ_DESC= graphviz for graph-ancestry
-RSYNC_DESC= rsync for rspush
WRKSRC= ${WRKDIR}/bzrtools
USES= python:2.7
Index: devel/cvs2svn/Makefile
===================================================================
--- devel/cvs2svn/Makefile
+++ devel/cvs2svn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cvs2svn
PORTVERSION= 2.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://cvs2svn.tigris.org/files/documents/1462/49543/ \
LOCAL/ohauer
@@ -27,10 +27,6 @@
OPTIONS_MULTI= SCM
OPTIONS_MULTI_SCM= SUBVERSION GIT BAZAAR
OPTIONS_DEFAULT= SUBVERSION
-
-SUBVERSION_DESC= Build with subversion support
-GIT_DESC= Build with git support
-BAZAAR_DESC= Build with Bazaar support
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS
SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
Index: devel/git/Makefile
===================================================================
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -3,6 +3,7 @@
PORTNAME= git
DISTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -52,17 +53,15 @@
OPTIONS_RADIO= PCRE_VERSION
OPTIONS_RADIO_PCRE_VERSION= PCRE PCRE2
-OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
+OPTIONS_DEFINE= GUI SUBVERSION GITWEB CONTRIB PERFORCE CVS HTMLDOCS PERL ICONV CURL \
SEND_EMAIL NLS SUBTREE
-OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
+OPTIONS_DEFAULT= CONTRIB PERFORCE CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
SUBTREE
OPTIONS_SUB= yes
GITWEB_DESC= Install gitweb
CONTRIB_DESC= Install contributed scripts
-P4_DESC= Enable Perforce support
PCRE2_DESC= Use Perl Compatible Regular Expressions (v2)
-CVS_DESC= Enable CVS support
HTMLDOCS_DESC= Install additional documentation
SEND_EMAIL_DESC=Enable the git-send-email(1) script
SUBTREE_DESC= Install git-subtree
@@ -109,7 +108,7 @@
# to have git use devel/subversion18 it will be brought in through
# devel/p5-subversion if you set WITH_SUBVERSION_VER=18. Otherwise
# devel/subversion will be brought in.
-SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+SUBVERSION_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-subversion>=0:devel/p5-subversion
SUBTREE_BUILD_DEPENDS= xmlto:textproc/xmlto \
@@ -125,7 +124,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
@@ -138,7 +137,7 @@
gitk.1
.endif
-.if empty(PORT_OPTIONS:MSVN)
+.if empty(PORT_OPTIONS:MSUBVERSION)
RMMAN1+= git-svn.1
.endif
@@ -176,19 +175,19 @@
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/gitweb-lib.sh
-post-patch-P4-off:
+post-patch-PERFORCE-off:
@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
${WRKSRC}/contrib/subtree/git-subtree.sh
-.if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
+.if ${PORT_OPTIONS:MPERFORCE} || ${PORT_OPTIONS:MCONTRIB}
post-build:
@${FIND} ${WRKSRC} -name "*.bak" -delete
.endif
@@ -237,7 +236,7 @@
${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \
${STAGEDIR}${PREFIX}/etc/bash_completion.d/
-post-install-P4-on:
+post-install-PERFORCE-on:
${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${STAGEDIR}${PREFIX}/bin/
post-install-GITWEB-on:
Index: devel/git/pkg-plist
===================================================================
--- devel/git/pkg-plist
+++ 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
@@ -124,7 +124,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
@@ -178,7 +178,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-symbolic-ref
libexec/git-core/git-tag
libexec/git-core/git-unpack-file
@@ -355,7 +355,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-symbolic-ref.1.gz
man/man1/git-tag.1.gz
man/man1/git-unpack-file.1.gz
Index: devel/ocaml-opam/Makefile
===================================================================
--- devel/ocaml-opam/Makefile
+++ devel/ocaml-opam/Makefile
@@ -3,6 +3,7 @@
PORTNAME= opam
PORTVERSION= 2.0.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ocaml-
@@ -24,17 +25,12 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-checks
-OPTIONS_DEFINE= RSYNC GIT HG DARCS
+OPTIONS_DEFINE= RSYNC GIT MERCURIAL DARCS
OPTIONS_DEFAULT= RSYNC GIT
-RSYNC_DESC= Remote repository synchronized with Rsync
-GIT_DESC= Remote repository synchronized with git
-HG_DESC= Remote repository synchronized with mercurial
-DARCS_DESC= Remote repository synchronized with darcs
-
RSYNC_RUN_DEPENDS= rsync:net/rsync
GIT_RUN_DEPENDS= git:devel/git
-HG_RUN_DEPENDS= hg:devel/mercurial
+MERCURIAL_RUN_DEPENDS= hg:devel/mercurial
DARCS_RUN_DEPENDS= darcs:devel/hs-darcs
MAKE_JOBS_UNSAFE= yes
Index: devel/p5-SVN-Notify-Mirror/Makefile
===================================================================
--- devel/p5-SVN-Notify-Mirror/Makefile
+++ devel/p5-SVN-Notify-Mirror/Makefile
@@ -3,7 +3,7 @@
PORTNAME= SVN-Notify-Mirror
PORTVERSION= 0.040
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel perl5
MASTER_SITES= CPAN
@@ -26,7 +26,6 @@
CONFIG_DESC= Enable YAML syntax for post-commit hook
SSH_DESC= Enable SSH for remote working copy update
-RSYNC_DESC= Enable rsync for remote working copy update
CONFIG_BUILD_DEPENDS= p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
CONFIG_RUN_DEPENDS= p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
Index: devel/thunar-vcs-plugin/Makefile
===================================================================
--- devel/thunar-vcs-plugin/Makefile
+++ devel/thunar-vcs-plugin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunar-vcs-plugin
PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel xfce
MASTER_SITES= XFCE/thunar-plugins
DIST_SUBDIR= xfce4
@@ -27,19 +27,17 @@
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= NLS GIT SVN
-OPTIONS_DEFAULT= SVN
+OPTIONS_DEFINE= NLS GIT 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
+SUBVERSION_CONFIGURE_ENABLE= subversion
+SUBVERSION_LIB_DEPENDS= libsvn_client-1.so:devel/subversion
.include <bsd.port.mk>
Index: devel/thunar-vcs-plugin/pkg-plist
===================================================================
--- devel/thunar-vcs-plugin/pkg-plist
+++ devel/thunar-vcs-plugin/pkg-plist
@@ -1,6 +1,6 @@
lib/thunarx-2/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
Index: devel/tig/Makefile
===================================================================
--- devel/tig/Makefile
+++ devel/tig/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tig
PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= https://github.com/jonas/tig/releases/download/${DISTNAME}/
@@ -27,8 +27,6 @@
man/man7/tigmanual.7.gz
OPTIONS_DEFINE= GIT
-
-GIT_DESC= Install devel/git as runtime dependency
GIT_RUN_DEPENDS= git:devel/git
GIT_VARS_OFF= PKGMESSAGE="${.CURDIR}/pkg-message-git"
Index: devel/viewvc/Makefile
===================================================================
--- devel/viewvc/Makefile
+++ devel/viewvc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= viewvc
DISTVERSION= 1.1.27
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= ohauer@FreeBSD.org
@@ -17,8 +17,8 @@
NO_BUILD= yes
NO_OPTIONS_SORT= yes
-OPTIONS_DEFINE= WEBSRV APMOD SVN MYSQL
-OPTIONS_DEFAULT= WEBSRV APACHE SVN
+OPTIONS_DEFINE= WEBSRV APMOD SUBVERSION MYSQL
+OPTIONS_DEFAULT= WEBSRV APACHE SUBVERSIOIN
OPTIONS_SINGLE= WEBSRV APMOD
OPTIONS_SINGLE_WEBSRV= APACHE LIGHTTPD
@@ -39,12 +39,12 @@
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS
-SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19
-SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR}
+SUBVERSIOIN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion19>=0:devel/py-subversion@${PY_FLAVOR}
.else
# default version
-SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
+SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
.endif
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR}
Index: net-mgmt/observium/Makefile
===================================================================
--- net-mgmt/observium/Makefile
+++ net-mgmt/observium/Makefile
@@ -4,7 +4,7 @@
PORTNAME= observium
PORTVERSION= 0.18.9.1
-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 SUBVERSIOIN 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
@@ -56,7 +56,7 @@
NMAP_RUN_DEPENDS= nmap:security/nmap
PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR}
PYPOLLER_VARS= PY_MYSQL=:2.7
-SVN_RUN_DEPENDS= svn:devel/subversion
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion
WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client
.include <bsd.port.options.mk>
Index: net-mgmt/rancid3/Makefile
===================================================================
--- net-mgmt/rancid3/Makefile
+++ net-mgmt/rancid3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rancid
PORTVERSION= 3.9
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/
PKGNAMESUFFIX= 3
@@ -34,11 +34,10 @@
NEWERCONFIG_FILE2= etc/lg.conf
NEWCONFIG_FILES= rancid.conf lg.conf
-OPTIONS_DEFINE= COMWARE SVN
+OPTIONS_DEFINE= COMWARE SUBVERSION
OPTIONS_DEFAULT=
COMWARE_DESC= Add experimental support for Comware devices
-SVN_DESC= Use Subversion instead of CVS
.include <bsd.port.options.mk>
@@ -48,7 +47,7 @@
PLIST_SUB+= COMWARE="@comment "
.endif
-.if ${PORT_OPTIONS:MSVN}
+.if ${PORT_OPTIONS:MSUBVERSION}
CONFIGURE_ARGS+= --with-svn
BUILD_DEPENDS+= svn:devel/subversion
.else
Index: net/prosearch/Makefile
===================================================================
--- net/prosearch/Makefile
+++ net/prosearch/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prosearch
PORTVERSION= 0.19.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= net www
MASTER_SITES= http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
@@ -28,7 +28,6 @@
OPTIONS_DEFAULT= CRAWLER SAMBA APACHE DB MYSQL
CRAWLER_DESC= With crawler (nmap, p5-libwww)
SAMBA_DESC= crawler with SAMBA (file://)
-RSYNC_DESC= crawler with RSYNC
APACHE_DESC= With web server apache2.2+
MOD_PERL2_DESC= With MOD_PERL2
MOD_FASTCGI_DESC= With MOD_FASTCGI
Index: ports-mgmt/portest/Makefile
===================================================================
--- ports-mgmt/portest/Makefile
+++ ports-mgmt/portest/Makefile
@@ -3,6 +3,7 @@
PORTNAME= portest
PORTVERSION= 0.1.9
+PORTREVISION= 1
CATEGORIES= ports-mgmt
MAINTAINER= ultima@FreeBSD.org
@@ -19,7 +20,6 @@
OPTIONS_DEFINE= GIT PORTLINT PORTTOOLS POUDRIERE
-GIT_DESC= Git support
GIT_RUN_DEPENDS= git:devel/git
PORTLINT_DESC= Portlint support
Index: ports-mgmt/portshaker/Makefile
===================================================================
--- ports-mgmt/portshaker/Makefile
+++ ports-mgmt/portshaker/Makefile
@@ -4,7 +4,7 @@
PORTNAME?= portshaker
PORTVERSION= 1.0.17
DISTVERSIONPREFIX= v
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= ports-mgmt
MAINTAINER?= romain@FreeBSD.org
@@ -19,15 +19,12 @@
GH_PROJECT= portshaker
.if ${PORTNAME} == "portshaker"
-OPTIONS_DEFINE= RSYNC SVN GIT HG
-OPTIONS_DEFAULT= RSYNC SVN
-RSYNC_DESC= rsync support
-GIT_DESC= git support
-HG_DESC= mercurial support
+OPTIONS_DEFINE= RSYNC SUBVERSION GIT MERCURIAL
+OPTIONS_DEFAULT= RSYNC SUBVERSION
RSYNC_RUN_DEPENDS= rsync:net/rsync
-SVN_RUN_DEPENDS= svn:devel/subversion${WITH_SUBVERSION_VER}
+SUBVERSION_RUN_DEPENDS= svn:devel/subversion${WITH_SUBVERSION_VER}
GIT_RUN_DEPENDS= git:devel/git
-HG_RUN_DEPENDS= hg:devel/mercurial
+MERCURIAL_RUN_DEPENDS= hg:devel/mercurial
.else
OPTIONS_DEFINE= BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
OPTIONS_DEFAULT= BSDSHARP
Index: security/hydra/Makefile
===================================================================
--- security/hydra/Makefile
+++ security/hydra/Makefile
@@ -4,6 +4,7 @@
PORTNAME= hydra
DISTVERSIONPREFIX=v
DISTVERSION= 8.9.1
+PORTREVISION= 0
CATEGORIES= security
MAINTAINER= rm@FreeBSD.org
@@ -28,11 +29,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 \
Index: security/medusa/Makefile
===================================================================
--- security/medusa/Makefile
+++ security/medusa/Makefile
@@ -3,6 +3,7 @@
PORTNAME= medusa
PORTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.foofus.net/~jmk/tools/
@@ -19,12 +20,12 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-module-ncp=no --enable-module-afp=no
-OPTIONS_DEFINE= SVN PGSQL DOCS
+OPTIONS_DEFINE= SUBVERSION PGSQL DOCS
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
Index: security/medusa/pkg-plist
===================================================================
--- security/medusa/pkg-plist
+++ 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
Index: shells/scponly/Makefile
===================================================================
--- shells/scponly/Makefile
+++ shells/scponly/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scponly
PORTVERSION= 4.8.20110526
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= shells security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-snapshots
DISTNAME= ${PORTNAME}-20110526
@@ -18,13 +18,12 @@
PORTDOCS= BUILDING-JAILS.TXT INSTALL README SECURITY
GNU_CONFIGURE= yes
-OPTIONS_DEFINE= WILDCARDS GFTP CHROOT RSYNC SCP SVN SVNSERVE UNISON WINSCP \
+OPTIONS_DEFINE= WILDCARDS GFTP CHROOT RSYNC SCP SUBVERSION SVNSERVE UNISON WINSCP \
DEFAULT_CHDIR DOCS
OPTIONS_DEFAULT= WILDCARDS
DEFAULT_CHDIR_DESC= Chdir(2) by default
WILDCARDS_DESC= Wildcards processing
GFTP_DESC= gftp support
-RSYNC_DESC= rsync support
CHROOT_DESC= chroot(8) functionality
SCP_DESC= vanilla scp support
SVNSERVE_DESC= Suversion support for svn+ssh://
@@ -46,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
Index: sysutils/password-store/Makefile
===================================================================
--- sysutils/password-store/Makefile
+++ sysutils/password-store/Makefile
@@ -2,7 +2,7 @@
PORTNAME= password-store
PORTVERSION= 1.7.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://git.zx2c4.com/${PORTNAME}/snapshot/
@@ -26,7 +26,6 @@
OPTIONS_DEFAULT= CONTRIB XCLIP
OPTIONS_SUB= yes
-GIT_DESC= Enable git storage
XCLIP_DESC= Enable xclip feature
CONTRIB_DESC= Include shell completions, import scripts, related projects
QRENCODE_DESC= Enable QR code support
Index: sysutils/zxfer/Makefile
===================================================================
--- sysutils/zxfer/Makefile
+++ sysutils/zxfer/Makefile
@@ -4,6 +4,7 @@
PORTNAME= zxfer
PORTVERSION= 1.1.7
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= ports@scaleengine.com
@@ -18,7 +19,6 @@
OPTIONS_DEFINE= RSYNC
-RSYNC_DESC= Enable RSYNC Support
RSYNC_RUN_DEPENDS= rsync:net/rsync
.include <bsd.port.options.mk>
Index: textproc/docproj/Makefile
===================================================================
--- textproc/docproj/Makefile
+++ textproc/docproj/Makefile
@@ -3,7 +3,7 @@
PORTNAME= docproj
PORTVERSION= 2.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc
MAINTAINER= doceng@FreeBSD.org
@@ -26,13 +26,13 @@
USES= ghostscript:run metaport perl5
USE_PERL5= run
-OPTIONS_DEFINE= CJK DBLATEX FOP GROFF IGOR JING SVN TRANSLATOR
-OPTIONS_DEFAULT= CJK IGOR TRANSLATOR
+OPTIONS_DEFINE= CJK DBLATEX FOP GROFF IGOR JING SUBVERSION TRANSLATOR
+OPTIONS_DEFAULT= CJK IGOR TRANSLATOR
.if !exists(/usr/bin/groff)
OPTIONS_DEFAULT+= GROFF
.endif
.if !exists(/usr/bin/svnlite) && !exists(/usr/bin/svn)
-OPTIONS_DEFAULT+= SVN
+OPTIONS_DEFAULT+= SUBVERSION
.endif
CJK_DESC= CJK support
@@ -49,8 +49,7 @@
IGOR_RUN_DEPENDS= igor:textproc/igor
JING_DESC= Jing for advanced RELAX NG validation
JING_RUN_DEPENDS= jing:textproc/jing
-SVN_DESC= Subversion support from ports
-SVN_RUN_DEPENDS= ${LOCALBASE}/bin/svn:devel/subversion
+SUBVERSION_RUN_DEPENDS= ${LOCALBASE}/bin/svn:devel/subversion
TRANSLATOR_DESC= Tools for translators
TRANSLATOR_RUN_DEPENDS= itstool:textproc/itstool22 \
msgcat:devel/gettext-tools
Index: www/moinmoincli/Makefile
===================================================================
--- www/moinmoincli/Makefile
+++ www/moinmoincli/Makefile
@@ -2,6 +2,7 @@
PORTNAME= moinmoincli
DISTVERSION= 4.5.4
+PORTREVISION= 1
CATEGORIES= www docs
MAINTAINER= 0mp@FreeBSD.org
@@ -21,7 +22,6 @@
OPTIONS_DEFINE= GIT
OPTIONS_DEFAULT= GIT
-GIT_DESC= Install git to use git-diff(1) instead of diff(1) for colored output
GIT_RUN_DEPENDS= git:devel/git
.include <bsd.port.mk>
Index: www/py-kallithea/Makefile
===================================================================
--- www/py-kallithea/Makefile
+++ www/py-kallithea/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kallithea
PORTVERSION= 0.4.0
+PORTREVISION= 1
CATEGORIES= www devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -50,7 +51,6 @@
SUB_FILES= pkg-message
OPTIONS_DEFINE= GIT LDAP
-GIT_DESC= Git repositories support
GIT_RUN_DEPENDS= git:devel/git
LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${PY_FLAVOR}
Index: www/py-rhodecode/Makefile
===================================================================
--- www/py-rhodecode/Makefile
+++ www/py-rhodecode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rhodecode
PORTVERSION= 1.7.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -46,8 +46,6 @@
OPTIONS_DEFINE= LDAP GIT
OPTIONS_DEFAULT= GIT
-
-GIT_DESC= GIT support
LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap@${PY_FLAVOR}
GIT_RUN_DEPENDS= git:devel/git
Index: www/trac-devel/Makefile
===================================================================
--- www/trac-devel/Makefile
+++ www/trac-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= trac
DISTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= www devel python
MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \
ftp://ftp.edgewall.com/pub/trac/
@@ -37,8 +38,8 @@
NO_ARCH= yes
-OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN EXAMPLES
-OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE
+OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SUBVERSION EXAMPLES
+OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SUBVERSION SQLITE
OPTIONS_RADIO= DATABASE
OPTIONS_RADIO_DATABASE= PGSQL SQLITE
DOCUTILS_DESC= Allow additional text markup
@@ -50,7 +51,7 @@
TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${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}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
Index: www/trac/Makefile
===================================================================
--- www/trac/Makefile
+++ www/trac/Makefile
@@ -3,6 +3,7 @@
PORTNAME= trac
PORTVERSION= 1.2.3
+PORTREVISION= 1
CATEGORIES= www devel python
MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \
ftp://ftp.edgewall.com/pub/trac/
@@ -37,8 +38,8 @@
NO_ARCH= yes
-OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN EXAMPLES
-OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE
+OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SUBVERSION EXAMPLES
+OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SUBVERSION SQLITE
OPTIONS_RADIO= DATABASE
OPTIONS_RADIO_DATABASE= PGSQL SQLITE
DOCUTILS_DESC= Allow additional text markup
@@ -50,7 +51,7 @@
TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${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}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 3, 10:41 AM (14 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34620568
Default Alt Text
D17459.id60046.diff (31 KB)

Event Timeline