diff options
author | jmmv <jmmv> | 2004-11-28 10:35:45 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-11-28 10:35:45 +0000 |
commit | cba53e125bf9933b4505132e9c0bbffbfb83b56e (patch) | |
tree | 53826421c59b5850f56849b99d884e8fd7e84d44 | |
parent | b08fa4bfc1d9f11257a4b65941fe817878fe2015 (diff) | |
download | pkgsrc-cba53e125bf9933b4505132e9c0bbffbfb83b56e.tar.gz |
Changes in the package, coming from a monotone package I started creating
yesterday w/o having checked for this one:
- Beautify DESCR.
- Take maintainership.
- Handle monotone.info properly.
- Mark the package as C/C++.
- Use boost's toolset.mk to get the compiler name.
- Simplify patches by using CPPFLAGS.
- Add missing dependencies.
While here, update to 0.15:
- overhauled the internal representation of changes. see README.changesets
for details.
- fixed bugs in merkle trie synchronization code.
- fixed echoing and progress UI bugs (helps when using in emacs).
- upgraded cryptopp to 5.2.1.
- fixed bug 8715, diff hunk coordinate reporting.
- added figures, new tutorial to manual.
- improve accuracy of log command.
- several build, configure, and linkage fixes.
- some OSX / PPC portability fixes.
-rw-r--r-- | devel/monotone/DESCR | 16 | ||||
-rw-r--r-- | devel/monotone/Makefile | 34 | ||||
-rw-r--r-- | devel/monotone/PLIST | 3 | ||||
-rw-r--r-- | devel/monotone/distinfo | 11 | ||||
-rw-r--r-- | devel/monotone/patches/patch-aa | 12 | ||||
-rw-r--r-- | devel/monotone/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/monotone/patches/patch-ac | 13 | ||||
-rw-r--r-- | devel/monotone/patches/patch-ad | 13 |
8 files changed, 39 insertions, 76 deletions
diff --git a/devel/monotone/DESCR b/devel/monotone/DESCR index 39b502c0452..9d4e5c6ddf7 100644 --- a/devel/monotone/DESCR +++ b/devel/monotone/DESCR @@ -1,8 +1,8 @@ -monotone is a free distributed version control system. it provides a simple, -single-file transactional version store, with fully disconnected operation and -an efficient peer-to-peer synchronization protocol. it understands -history-sensitive merging, lightweight branches, integrated code review and -3rd party testing. it uses cryptographic version naming and client-side RSA -certificates. it has good internationalization support, has no external -dependencies, runs on linux, solaris, OSX, and windows, and is licensed under -the GNU GPL. +monotone is a free distributed version control system. It provides a +simple, single-file transactional version store, with fully disconnected +operation and an efficient peer-to-peer synchronization protocol. It +understands history-sensitive merging, lightweight branches, integrated +code review and 3rd party testing. It uses cryptographic version naming +and client-side RSA certificates. It has good internationalization +support, has no external dependencies, runs on NetBSD, Linux, Solaris, +OSX and Windows (among others), and is licensed under the GNU GPL. diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index e0156f86890..3fe3bd3c8bb 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,28 +1,34 @@ -# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:31 tv Exp $ +# $NetBSD: Makefile,v 1.3 2004/11/28 10:35:45 jmmv Exp $ # -DISTNAME= monotone-0.14 -PKGREVISION= 1 -CATEGORIES= devel -MASTER_SITES= http://www.venge.net/monotone/ +DISTNAME= monotone-0.15 +CATEGORIES= devel +MASTER_SITES= http://www.venge.net/monotone/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.venge.net/monotone/ -COMMENT= Distributed revision control system +MAINTAINER= jmmv@NetBSD.org +HOMEPAGE= http://www.venge.net/monotone/ +COMMENT= Free distributed version control system -USE_BUILDLINK3= yes GNU_CONFIGURE= yes +INFO_FILES= monotone.info +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make +USE_LANGUAGES= c c++ +USE_MAKEINFO= yes + CONFIGURE_ARGS+= --with-bundled-lua=no CONFIGURE_ARGS+= --with-bundled-sqlite=no +CONFIGURE_ENV+= BOOST_TOOLSET=${BOOST_TOOLSET} -# XXX need rules for other compilers -BUILD_ENV+= BLIBSF="-gcc" +CPPFLAGS+= -D__unix__ -D__unix -# XXX This pkg doesn't need threads. Just the "configure" -# script is too stupid (it adds -pthread to CFLAGS). +.include "../../converters/libiconv/buildlink3.mk" +.include "../../databases/sqlite/buildlink3.mk" +.include "../../devel/boost/buildlink3.mk" +.include "../../devel/boost/toolset.mk" .include "../../devel/boost-thread/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../lang/lua/buildlink3.mk" -.include "../../databases/sqlite/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST index a82fce243a1..d5720e2dee4 100644 --- a/devel/monotone/PLIST +++ b/devel/monotone/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/11/28 10:35:45 jmmv Exp $ bin/monotone -info/monotone.info man/man1/monotone.1 diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 04260ada64f..117fda6c576 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ +$NetBSD: distinfo,v 1.2 2004/11/28 10:35:45 jmmv Exp $ -SHA1 (monotone-0.14.tar.gz) = e1c05a6e9c2fdc3b3e20cdca67b12a1cdc6364af -Size (monotone-0.14.tar.gz) = 1792738 bytes -SHA1 (patch-aa) = bd7008ca3872ece8177148f1384f155bfe7b85b5 -SHA1 (patch-ab) = 87a17eea880d9ed744996a08e09b94285ba690c7 -SHA1 (patch-ac) = e6f6ab03f4a132d37d1774f72230c7b6ffa9f778 -SHA1 (patch-ad) = ad9f992c4b8ff24083f793e36c5c2b6772087583 +SHA1 (monotone-0.15.tar.gz) = 540c734d168e8b90ae6a5bca700f0d690d5d94d1 +Size (monotone-0.15.tar.gz) = 3170364 bytes +SHA1 (patch-aa) = 7427f8b411cdbb1f2afc007e1e099784d964c381 diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa index 0cea3ff77d0..817e77bda89 100644 --- a/devel/monotone/patches/patch-aa +++ b/devel/monotone/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/28 10:35:45 jmmv Exp $ ---- configure.orig 2004-08-14 14:48:02.000000000 +0200 +--- configure.orig 2004-11-06 19:13:01.000000000 +0100 +++ configure @@ -7964,7 +7964,7 @@ fi # Now check for Boost libraries proper. -LIBS="-lboost_unit_test_framework $OLD_LIBS" -+LIBS="-lboost_unit_test_framework${BLIBSF} $OLD_LIBS" ++LIBS="-lboost_unit_test_framework-$BOOST_TOOLSET $OLD_LIBS" echo "$as_me:$LINENO: checking libboost_unit_test_framework library" >&5 echo $ECHO_N "checking libboost_unit_test_framework library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ LIBS=$OLD_LIBS -LIBS="-lboost_filesystem $LIBS" -+LIBS="-lboost_filesystem${BLIBSF} $LIBS" ++LIBS="-lboost_filesystem-$BOOST_TOOLSET $LIBS" echo "$as_me:$LINENO: checking libboost_filesystem library" >&5 echo $ECHO_N "checking libboost_filesystem library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ conftest$ac_exeext conftest.$ac_ext -LIBS="-lboost_date_time $LIBS" -+LIBS="-lboost_date_time${BLIBSF} $LIBS" ++LIBS="-lboost_date_time-$BOOST_TOOLSET $LIBS" echo "$as_me:$LINENO: checking libboost_date_time library" >&5 echo $ECHO_N "checking libboost_date_time library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF @@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ -LIBS="-lboost_regex $LIBS" -+LIBS="-lboost_regex${BLIBSF} $LIBS" ++LIBS="-lboost_regex-$BOOST_TOOLSET $LIBS" echo "$as_me:$LINENO: checking libboost_regex library" >&5 echo $ECHO_N "checking libboost_regex library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF diff --git a/devel/monotone/patches/patch-ab b/devel/monotone/patches/patch-ab deleted file mode 100644 index b6e08bcc38c..00000000000 --- a/devel/monotone/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ - ---- Makefile.in.orig 2004-08-14 14:45:22.000000000 +0200 -+++ Makefile.in -@@ -843,7 +843,7 @@ unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS - - @STATIC_BOOST_FALSE@monotone_LDADD = lib3rdparty.a libplatform.a $(am__append_6) - @STATIC_BOOST_TRUE@monotone_LDADD = lib3rdparty.a $(BOOSTLIBS) libplatform.a $(am__append_6) --@STATIC_BOOST_FALSE@unit_tests_LDADD = lib3rdparty.a -lboost_unit_test_framework libplatform.a $(am__append_7) -+@STATIC_BOOST_FALSE@unit_tests_LDADD = lib3rdparty.a -lboost_unit_test_framework${BLIBSF} libplatform.a $(am__append_7) - @STATIC_BOOST_TRUE@unit_tests_LDADD = lib3rdparty.a $(BOOSTLIBS) \ - @STATIC_BOOST_TRUE@ @BOOST_LIBDIR@/libboost_unit_test_framework.a\ - @STATIC_BOOST_TRUE@libplatform.a $(am__append_7) diff --git a/devel/monotone/patches/patch-ac b/devel/monotone/patches/patch-ac deleted file mode 100644 index faebdde9ef1..00000000000 --- a/devel/monotone/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ - ---- cryptopp/config.h.orig 2004-08-14 15:13:46.000000000 +0200 -+++ cryptopp/config.h -@@ -194,7 +194,7 @@ NAMESPACE_END - #define CRYPTOPP_WIN32_AVAILABLE - #endif - --#if defined(__unix__) || defined(__MACH__) -+#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) - #define CRYPTOPP_UNIX_AVAILABLE - #endif - diff --git a/devel/monotone/patches/patch-ad b/devel/monotone/patches/patch-ad deleted file mode 100644 index f5439f1ccd0..00000000000 --- a/devel/monotone/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/08/15 14:38:38 drochner Exp $ - ---- main.cc.orig 2004-08-14 15:24:21.000000000 +0200 -+++ main.cc -@@ -42,7 +42,7 @@ - #define MS_STRUCTURED_EXCEPTION_HANDLING - #include <windows.h> - --#elif defined(__unix) -+#elif defined(__unix) || defined(__NetBSD__) - #define UNIX_STYLE_SIGNAL_HANDLING - #include <unistd.h> - #include <csignal> |