diff options
| author | recht <recht> | 2005-12-27 16:06:04 +0000 |
|---|---|---|
| committer | recht <recht> | 2005-12-27 16:06:04 +0000 |
| commit | 0c44e900050b2c3b94aa223524eb13e1ba49e99d (patch) | |
| tree | 11e5eb4da4f526404079c84f25a3445a36ac5d6e | |
| parent | 0ec156668fbff8bb76318c4e59244704a0829530 (diff) | |
| download | pkgsrc-0c44e900050b2c3b94aa223524eb13e1ba49e99d.tar.gz | |
update to 2.2.4
ArX-2.2.4 2005-Nov-16
"merge" now uses a three-way merge by default, with support for
external merge tools. "merge" also now takes the --update option
instead of using heuristics.
"merge", "dopatch", and "replay" now record when there are conflicts
in the tree, and "commit" will refuse to act unless they are cleaned
up with "resolve".
The --silent, --quiet, --default-output, --report, and --verbose
options have been replaced with -v and -q options.
ArX is now much more clever when dealing with renames.
"commit" and "tag" now support --author and --date options.
The patch queue manager has been updated.
Some bugs when working across filesystems have been fixed.
| -rw-r--r-- | devel/ArX2/Makefile | 15 | ||||
| -rw-r--r-- | devel/ArX2/PLIST | 17 | ||||
| -rw-r--r-- | devel/ArX2/distinfo | 8 |
3 files changed, 17 insertions, 23 deletions
diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile index 21d53ff234b..3df78987335 100644 --- a/devel/ArX2/Makefile +++ b/devel/ArX2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/27 16:06:04 recht Exp $ # -DISTNAME= ArX-2.2.3 +DISTNAME= ArX-2.2.4 CATEGORIES= devel MASTER_SITES= http://savannah.nongnu.org/download/arx/ @@ -25,10 +25,6 @@ CONFIGURE_ARGS+= ARXPKGCONFIG=${PKG_CONFIG:Q} # XXX Python is needed for build only; this is handled by devel/scons CONFIGURE_ARGS+= ARXPYTHON=${TRUE:Q} -IMG_FILES= ArX001.png ArX002.png ArX003.png ArX004.png -DOC_FILES= ArX.html ArX.pdf ${IMG_FILES} -DOCDIR= ${PREFIX}/share/doc/ArX - INSTALLATION_DIRS= bin do-build: @@ -36,11 +32,8 @@ do-build: ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/build/arx/arx ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${DOCDIR} -.for f in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR} -.endfor + ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} && \ + ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ArX2/PLIST b/devel/ArX2/PLIST index 52a60dfd9b6..c93609ed784 100644 --- a/devel/ArX2/PLIST +++ b/devel/ArX2/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/19 17:39:40 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/12/27 16:06:04 recht Exp $ bin/arx -share/doc/ArX/ArX.html -share/doc/ArX/ArX.pdf -share/doc/ArX/ArX001.png -share/doc/ArX/ArX002.png -share/doc/ArX/ArX003.png -share/doc/ArX/ArX004.png -@dirrm share/doc/ArX +man/man1/arx.1 +share/doc/arx/ArX.html +share/doc/arx/ArX.pdf +share/doc/arx/ArX001.png +share/doc/arx/ArX002.png +share/doc/arx/ArX003.png +share/doc/arx/ArX004.png +@dirrm share/doc/arx diff --git a/devel/ArX2/distinfo b/devel/ArX2/distinfo index 12fcda849e4..de30acad332 100644 --- a/devel/ArX2/distinfo +++ b/devel/ArX2/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/07/26 22:35:54 recht Exp $ +$NetBSD: distinfo,v 1.6 2005/12/27 16:06:04 recht Exp $ -SHA1 (ArX-2.2.3.tar.gz) = e10c8c699c3768bef1d6dc3345f3fd42e851962e -RMD160 (ArX-2.2.3.tar.gz) = 87dbcc607fbdb64a2658d8a4454a577731d43a14 -Size (ArX-2.2.3.tar.gz) = 13402310 bytes +SHA1 (ArX-2.2.4.tar.gz) = a575e005cfa2d80a6faced52b0128e9b7ff208df +RMD160 (ArX-2.2.4.tar.gz) = 28bcab15b42bd116e736df7b4552ed00c34659ae +Size (ArX-2.2.4.tar.gz) = 13561129 bytes SHA1 (patch-aa) = dbd26f2c93ee76655a5f024dd5319e0b462bc797 |