summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/monotone/Makefile12
-rw-r--r--devel/monotone/PLIST6
-rw-r--r--devel/monotone/distinfo11
-rw-r--r--devel/monotone/patches/patch-aa73
-rw-r--r--devel/monotone/patches/patch-ab12
5 files changed, 39 insertions, 75 deletions
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 9d46c4166f1..08105937dce 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2007/10/07 16:31:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2007/10/26 14:08:24 jmmv Exp $
#
-DISTNAME= monotone-0.36
-PKGREVISION= 3
+DISTNAME= monotone-0.37
CATEGORIES= devel scm
-MASTER_SITES= http://monotone.ca/downloads/0.36/
+MASTER_SITES= http://monotone.ca/downloads/0.37/
MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://monotone.ca/
@@ -18,7 +17,7 @@ USE_TOOLS+= gmake makeinfo
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-CONFIGURE_ARGS+= BOOST_SUFFIX=-mt
+CONFIGURE_ARGS+= --with-system-pcre
PKG_OPTIONS_VAR= PKG_OPTIONS.monotone
PKG_SUPPORTED_OPTIONS= inet6
@@ -43,7 +42,8 @@ post-install:
${DESTDIR}${PREFIX}/share/doc/monotone
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST
index b030c557a2a..13c9ed42159 100644
--- a/devel/monotone/PLIST
+++ b/devel/monotone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/10/05 22:41:36 bjs Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/10/26 14:08:24 jmmv Exp $
bin/mtn
info/monotone.info
share/doc/monotone/figures/branch-heads.png
@@ -28,6 +28,7 @@ share/locale/it/LC_MESSAGES/monotone.mo
share/locale/ja/LC_MESSAGES/monotone.mo
share/locale/pt_BR/LC_MESSAGES/monotone.mo
share/locale/sv/LC_MESSAGES/monotone.mo
+share/monotone/contrib/Monotone.pm
share/monotone/contrib/README
share/monotone/contrib/ciabot_monotone.py
share/monotone/contrib/ciabot_monotone_hookversion.py
@@ -35,6 +36,7 @@ share/monotone/contrib/color-logs.conf
share/monotone/contrib/color-logs.sh
share/monotone/contrib/colorize
share/monotone/contrib/edit_comment_from_changelog.lua
+share/monotone/contrib/extra-commands.lua
share/monotone/contrib/get_passphrase_from_file.lua
share/monotone/contrib/get_stdio.pl
share/monotone/contrib/monoprof.sh
@@ -42,6 +44,7 @@ share/monotone/contrib/monotone-buildbot-notification.lua
share/monotone/contrib/monotone-cluster-push.lua
share/monotone/contrib/monotone-cvs-ignore.lua
share/monotone/contrib/monotone-log-of-pulled-revs-hook.lua
+share/monotone/contrib/monotone-mail-notify.lua
share/monotone/contrib/monotone-mirror.lua
share/monotone/contrib/monotone-nav.el
share/monotone/contrib/monotone-notify-hookversion.lua
@@ -51,7 +54,6 @@ share/monotone/contrib/monotone.bash_completion
share/monotone/contrib/monotone.el
share/monotone/contrib/monotone.zsh_completion
share/monotone/contrib/mtbrowse.sh
-share/monotone/contrib/usher.cc
@dirrm share/monotone/contrib
@dirrm share/monotone
@dirrm share/doc/monotone/figures
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 6f2728506c1..defb297d549 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.32 2007/08/13 12:09:47 jmmv Exp $
+$NetBSD: distinfo,v 1.33 2007/10/26 14:08:25 jmmv Exp $
-SHA1 (monotone-0.36.tar.gz) = d6f5ae91dc8045624dfc0dfbca00d60fea569ac3
-RMD160 (monotone-0.36.tar.gz) = 1e542073aa0f528e04653a66693a219b71f905fd
-Size (monotone-0.36.tar.gz) = 4836460 bytes
-SHA1 (patch-aa) = 924257e6350c8be25820fa4744b8bdaade1f62ae
+SHA1 (monotone-0.37.tar.gz) = 7d53bd67f7539342fcc15cceb0c2f4b31ba07647
+RMD160 (monotone-0.37.tar.gz) = 52185416cec790035017d1f1e5f061995c323032
+Size (monotone-0.37.tar.gz) = 5259352 bytes
+SHA1 (patch-aa) = e615e249b8c534c3259c48343957e1e704eeda13
+SHA1 (patch-ab) = e5b3038a7bb1c444adb5ee47e348c236dd2bb006
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
index b3e3ee213a8..c8297c2f7b9 100644
--- a/devel/monotone/patches/patch-aa
+++ b/devel/monotone/patches/patch-aa
@@ -1,64 +1,13 @@
-$NetBSD: patch-aa,v 1.15 2007/08/13 12:09:47 jmmv Exp $
+$NetBSD: patch-aa,v 1.16 2007/10/26 14:08:25 jmmv Exp $
---- configure.orig 2007-08-03 08:15:48.000000000 +0200
+--- configure.orig 2007-10-26 10:31:46.000000000 +0200
+++ configure
-@@ -9208,11 +9208,11 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
- echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
- case $ac_cv_sizeof_short in
-- (2) mtn_s16_type='short'
-+ 2) mtn_s16_type='short'
- mtn_u16_type='unsigned short' ;;
-- (4) mtn_s32_type='short'
-+ 4) mtn_s32_type='short'
- mtn_u32_type='unsigned short' ;;
-- (8) mtn_s64_type='short'
-+ 8) mtn_s64_type='short'
- mtn_u64_type='unsigned short' ;;
- esac
-
-@@ -9548,11 +9548,11 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
- case $ac_cv_sizeof_long in
-- (2) mtn_s16_type='long'
-+ 2) mtn_s16_type='long'
- mtn_u16_type='unsigned long' ;;
-- (4) mtn_s32_type='long'
-+ 4) mtn_s32_type='long'
- mtn_u32_type='unsigned long' ;;
-- (8) mtn_s64_type='long'
-+ 8) mtn_s64_type='long'
- mtn_u64_type='unsigned long' ;;
- esac
-
-@@ -9888,11 +9888,11 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
- echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
- case $ac_cv_sizeof_int in
-- (2) mtn_s16_type='int'
-+ 2) mtn_s16_type='int'
- mtn_u16_type='unsigned int' ;;
-- (4) mtn_s32_type='int'
-+ 4) mtn_s32_type='int'
- mtn_u32_type='unsigned int' ;;
-- (8) mtn_s64_type='int'
-+ 8) mtn_s64_type='int'
- mtn_u64_type='unsigned int' ;;
- esac
-
-@@ -10243,11 +10243,11 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
- case $ac_cv_sizeof_long_long in
-- (2) mtn_s16_type='long long'
-+ 2) mtn_s16_type='long long'
- mtn_u16_type='unsigned long long' ;;
-- (4) mtn_s32_type='long long'
-+ 4) mtn_s32_type='long long'
- mtn_u32_type='unsigned long long' ;;
-- (8) mtn_s64_type='long long'
-+ 8) mtn_s64_type='long long'
- mtn_u64_type='unsigned long long' ;;
- esac
- if test "$mtn_s64_type" = unknown
+@@ -12100,7 +12102,7 @@ echo $ECHO_N "checking for PCRE using pc
+ # automatically.
+ PCRE_LIBS="`pcre-config --libs | \
+ sed -e 's:-L */usr/lib/*::' -e 's:-R */usr/lib/*::' \
+- -e 's:-L */lib/*:: -e 's:-R */lib/*::'`"
++ -e 's:-L */lib/*::' -e 's:-R */lib/*::'`"
+ found_libpcre=yes
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
diff --git a/devel/monotone/patches/patch-ab b/devel/monotone/patches/patch-ab
new file mode 100644
index 00000000000..4ea59efa063
--- /dev/null
+++ b/devel/monotone/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.7 2007/10/26 14:08:25 jmmv Exp $
+
+--- pcrewrap.cc.orig 2007-10-26 00:40:22.000000000 +0200
++++ pcrewrap.cc
+@@ -15,7 +15,6 @@
+ // This dirty trick is necessary to prevent the 'pcre' typedef defined by
+ // pcre.h from colliding with namespace pcre.
+ #define pcre pcre_t
+-#include "pcre_config.h"
+ #include "pcre.h"
+ #undef pcre
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-08 23:55:24 +0000