pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel Move ArX2 to ArX, to make directory name match P...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ed8437d7265
branches:  trunk
changeset: 533510:5ed8437d7265
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 20 20:47:00 2007 +0000

description:
Move ArX2 to ArX, to make directory name match PKGNAME.

diffstat:

 devel/ArX/DESCR                        |   4 +++
 devel/ArX/Makefile                     |  44 ++++++++++++++++++++++++++++++++++
 devel/ArX/PLIST                        |  10 +++++++
 devel/ArX/distinfo                     |  10 +++++++
 devel/ArX/patches/patch-aa             |  13 ++++++++++
 devel/ArX/patches/patch-ab             |  13 ++++++++++
 devel/ArX/patches/patch-ac             |  39 ++++++++++++++++++++++++++++++
 devel/ArX/patches/patch-ad             |  13 ++++++++++
 devel/ArX/patches/patch-ae             |  15 +++++++++++
 devel/ArX2/DESCR                       |   4 ---
 devel/ArX2/Makefile                    |  44 ----------------------------------
 devel/ArX2/PLIST                       |  10 -------
 devel/ArX2/distinfo                    |  10 -------
 devel/ArX2/patches/patch-aa            |  13 ----------
 devel/ArX2/patches/patch-ab            |  13 ----------
 devel/ArX2/patches/patch-ac            |  39 ------------------------------
 devel/ArX2/patches/patch-ad            |  13 ----------
 devel/ArX2/patches/patch-threewaymerge |  15 -----------
 18 files changed, 161 insertions(+), 161 deletions(-)

diffs (truncated from 394 to 300 lines):

diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/DESCR   Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,4 @@
+ArX is a revision control system: a program that lets programmers
+archive a history of changes made to the software they maintain and
+that, more importantly, helps programmers to coordinate, synchronize,
+and combine multiple lines of development for a single project.
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/Makefile        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.17 2007/09/20 20:47:01 wiz Exp $
+#
+
+DISTNAME=      ArX-2.2.4
+PKGREVISION=   7
+CATEGORIES=    devel scm
+MASTER_SITES=  http://savannah.nongnu.org/download/arx/
+
+MAINTAINER=    recht%NetBSD.org@localhost
+HOMEPAGE=      http://www.nongnu.org/arx/
+COMMENT=       Distributed revision control system
+
+BUILD_DEPENDS+=        scons-[0-9]*:../../devel/scons
+DEPENDS+=      patch-[0-9]*:../../devel/patch
+DEPENDS+=      diffutils-[0-9]*:../../devel/diffutils
+DEPENDS+=      gtar-base-[0-9]*:../../archivers/gtar-base
+
+BUILD_DEFS+=   GNU_PROGRAM_PREFIX
+
+USE_TOOLS+=            pkg-config
+USE_LANGUAGES=         c c++
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       ARXDIFF=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
+CONFIGURE_ARGS+=       ARXPATCH=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
+CONFIGURE_ARGS+=       ARXTAR=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}tar
+CONFIGURE_ARGS+=       ARXPKGCONFIG=${PKG_CONFIG:Q}
+# XXX Python is needed for build only; this is handled by devel/scons
+CONFIGURE_ARGS+=       ARXPYTHON=${TRUE:Q}
+
+INSTALLATION_DIRS=     bin
+
+do-build:
+       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       cd ${WRKSRC}                                                    \
+       && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
+
+do-install:
+       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
+       cd ${WRKSRC}                                                    \
+       && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install
+
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/PLIST   Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.3 2007/09/20 20:47:01 wiz Exp $
+bin/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 -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/distinfo        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.6 2007/09/20 20:47:01 wiz Exp $
+
+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
+SHA1 (patch-ab) = 42045fdfc5b731da1fb41271a2f39f980f898588
+SHA1 (patch-ac) = 315e7921421af2ed559c131e125a248568211e66
+SHA1 (patch-ad) = c4b3609cb2d3a9f8e21bb32b9825888387be041b
+SHA1 (patch-ae) = 854ef7137a066672616ceda234a3f99fba23eddd
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/patches/patch-aa        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2007/09/20 20:47:02 wiz Exp $
+
+--- SConstruct.in.orig 2005-07-27 00:25:59.000000000 +0200
++++ SConstruct.in      2005-07-27 00:26:19.000000000 +0200
+@@ -23,7 +23,7 @@
+ import os
+ import sys
+ 
+-env=Environment(CXX='@CXX@',LINK='@CXX@',CPPPATH='#/src')
++env=Environment(CXX='@CXX@',LINK='@CXX@',CPPPATH='#/src',ENV={'PATH':os.environ['PATH']})
+ 
+ cxxflags='@CXXFLAGS@'
+ if len(cxxflags)!=0:
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/patches/patch-ab        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2007/09/20 20:47:03 wiz Exp $
+
+--- src/arx/libarx/sha256/sha2.cpp.orig        2006-01-30 19:44:39.000000000 +0000
++++ src/arx/libarx/sha256/sha2.cpp
+@@ -96,7 +96,7 @@ extern "C"
+ 
+ /*  PLATFORM SPECIFIC INCLUDES */
+ 
+-#if defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined(__NetBSD__)
++#if defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined(__NetBSD__) || defined(__DragonFly__)
+ #  include <sys/endian.h>
+ #elif (defined( BSD ) && ( BSD >= 199103 )) || defined(__APPLE__) || defined(__CYGWIN__)
+ #  include <machine/endian.h>
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/patches/patch-ac        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.1 2007/09/20 20:47:03 wiz Exp $
+
+--- src/boost/boost/config/platform/bsd.hpp.orig       2005-01-03 23:55:25.000000000 +0000
++++ src/boost/boost/config/platform/bsd.hpp
+@@ -9,7 +9,7 @@
+ 
+ //  generic BSD config options:
+ 
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #error "This platform is not BSD"
+ #endif
+ 
+@@ -21,6 +21,10 @@
+ #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__)
+ #endif
+ 
++#if defined(__DragonFly__)
++#define _REENTRANT 1
++#endif
++
+ //
+ // is this the correct version check?
+ // FreeBSD has <nl_types.h> but does not
+@@ -41,7 +45,14 @@
+ //
+ // No wide character support in the BSD header files:
+ //
++#if !((defined(__FreeBSD__) && (__FreeBSD__ >= 5))) && !defined(__DragonFly__)
+ #define BOOST_NO_CWCHAR
++#endif
++
++#ifdef __DragonFly__
++#define WCHAR_MIN INT_MIN
++#define WCHAR_MAX INT_MAX
++#endif
+ 
+ //
+ // The BSD <ctype.h> has macros only, no functions:
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/patches/patch-ad        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/09/20 20:47:04 wiz Exp $
+
+--- src/boost/boost/config/select_platform_config.hpp.orig     2007-06-30 15:50:08.000000000 +0000
++++ src/boost/boost/config/select_platform_config.hpp
+@@ -17,7 +17,7 @@
+ // linux:
+ #  define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp"
+ 
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ // BSD:
+ #  define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp"
+ 
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX/patches/patch-ae        Thu Sep 20 20:47:00 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2007/09/20 20:47:04 wiz Exp $
+
+For some weird reason, g++ 3.3.3 complains about a syntax error here.
+
+--- src/arx/libarx/merge_branches/three_way_merge.cpp.orig     2005-11-17 20:06:21.000000000 +0100
++++ src/arx/libarx/merge_branches/three_way_merge.cpp  2006-04-11 15:07:43.000000000 +0200
+@@ -143,7 +143,7 @@ Conflicts three_way_merge(const Parsed_N
+                                make_pair(ancestor_temp.string(),
+                                          sibling_temp.string())));
+ 
+-                  path merge_path(path(getenv("HOME"))/".arx/merge3");
++                  path merge_path = (path(getenv("HOME"))/".arx/merge3");
+                   if(fs::exists(merge_path))
+                     {
+                       Spawn s;
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/DESCR
--- a/devel/ArX2/DESCR  Thu Sep 20 20:03:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-ArX is a revision control system: a program that lets programmers
-archive a history of changes made to the software they maintain and
-that, more importantly, helps programmers to coordinate, synchronize,
-and combine multiple lines of development for a single project.
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/Makefile
--- a/devel/ArX2/Makefile       Thu Sep 20 20:03:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2007/09/19 23:13:14 wiz Exp $
-#
-
-DISTNAME=      ArX-2.2.4
-PKGREVISION=   7
-CATEGORIES=    devel scm
-MASTER_SITES=  http://savannah.nongnu.org/download/arx/
-
-MAINTAINER=    recht%NetBSD.org@localhost
-HOMEPAGE=      http://www.nongnu.org/arx/
-COMMENT=       Distributed revision control system
-
-BUILD_DEPENDS+=        scons-[0-9]*:../../devel/scons
-DEPENDS+=      patch-[0-9]*:../../devel/patch
-DEPENDS+=      diffutils-[0-9]*:../../devel/diffutils
-DEPENDS+=      gtar-base-[0-9]*:../../archivers/gtar-base
-
-BUILD_DEFS+=   GNU_PROGRAM_PREFIX
-
-USE_TOOLS+=            pkg-config
-USE_LANGUAGES=         c c++
-USE_PKGLOCALEDIR=      yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       ARXDIFF=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
-CONFIGURE_ARGS+=       ARXPATCH=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+=       ARXTAR=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}tar
-CONFIGURE_ARGS+=       ARXPKGCONFIG=${PKG_CONFIG:Q}
-# XXX Python is needed for build only; this is handled by devel/scons
-CONFIGURE_ARGS+=       ARXPYTHON=${TRUE:Q}
-
-INSTALLATION_DIRS=     bin
-
-do-build:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
-       cd ${WRKSRC}                                                    \
-       && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
-
-do-install:
-       ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}                       \
-       cd ${WRKSRC}                                                    \
-       && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install
-
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/PLIST
--- a/devel/ArX2/PLIST  Thu Sep 20 20:03:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/27 16:06:04 recht Exp $
-bin/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 -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/distinfo
--- a/devel/ArX2/distinfo       Thu Sep 20 20:03:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.9 2007/06/30 17:17:33 joerg Exp $
-
-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
-SHA1 (patch-ab) = 42045fdfc5b731da1fb41271a2f39f980f898588
-SHA1 (patch-ac) = 315e7921421af2ed559c131e125a248568211e66
-SHA1 (patch-ad) = c4b3609cb2d3a9f8e21bb32b9825888387be041b
-SHA1 (patch-threewaymerge) = 854ef7137a066672616ceda234a3f99fba23eddd
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/patches/patch-aa
--- a/devel/ArX2/patches/patch-aa       Thu Sep 20 20:03:41 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/07/26 22:35:54 recht Exp $
-
---- SConstruct.in.orig 2005-07-27 00:25:59.000000000 +0200
-+++ SConstruct.in      2005-07-27 00:26:19.000000000 +0200
-@@ -23,7 +23,7 @@
- import os
- import sys
- 
--env=Environment(CXX='@CXX@',LINK='@CXX@',CPPPATH='#/src')
-+env=Environment(CXX='@CXX@',LINK='@CXX@',CPPPATH='#/src',ENV={'PATH':os.environ['PATH']})
- 
- cxxflags='@CXXFLAGS@'
- if len(cxxflags)!=0:
diff -r e8dc74b00c8f -r 5ed8437d7265 devel/ArX2/patches/patch-ab
--- a/devel/ArX2/patches/patch-ab       Thu Sep 20 20:03:41 2007 +0000



Home | Main Index | Thread Index | Old Index